Added bottles logic to select screen
Entries in the table are still needed
This commit is contained in:
@@ -60,6 +60,12 @@ macro fs_drawItemBasic(address,screenrow,screencol,tileAddress)
|
|||||||
JSR DrawItemBasic
|
JSR DrawItemBasic
|
||||||
endmacro
|
endmacro
|
||||||
|
|
||||||
|
macro fs_drawBottle(address,screenrow,screencol)
|
||||||
|
%fs_LDY_screenpos(<screenrow>,<screencol>)
|
||||||
|
LDA.l <address>
|
||||||
|
JSR DrawBottle
|
||||||
|
endmacro
|
||||||
|
|
||||||
DrawItem:
|
DrawItem:
|
||||||
LDA.w $0000,X : STA.w $0000, Y
|
LDA.w $0000,X : STA.w $0000, Y
|
||||||
LDA.w $0002,X : STA.w $0002, Y
|
LDA.w $0002,X : STA.w $0002, Y
|
||||||
@@ -78,6 +84,33 @@ DrawItemBasic:
|
|||||||
+
|
+
|
||||||
JMP DrawItemGray
|
JMP DrawItemGray
|
||||||
|
|
||||||
|
DrawBottle:
|
||||||
|
AND.w #$00FF : BNE +
|
||||||
|
LDX #FileSelectItems_emptyBottle
|
||||||
|
JMP DrawItemGray
|
||||||
|
+ : DEC #2 : BNE +
|
||||||
|
LDX #FileSelectItems_emptyBottle
|
||||||
|
JMP DrawItem
|
||||||
|
+ : DEC : BNE +
|
||||||
|
LDX #FileSelectItems_redPotion
|
||||||
|
JMP DrawItem
|
||||||
|
+ : DEC : BNE +
|
||||||
|
LDX #FileSelectItems_greenPotion
|
||||||
|
JMP DrawItem
|
||||||
|
+ : DEC : BNE +
|
||||||
|
LDX #FileSelectItems_bluePotion
|
||||||
|
JMP DrawItem
|
||||||
|
+ : DEC : BNE +
|
||||||
|
LDX #FileSelectItems_fairyBottle
|
||||||
|
JMP DrawItem
|
||||||
|
+ : DEC : BNE +
|
||||||
|
LDX #FileSelectItems_beeBottle
|
||||||
|
JMP DrawItem
|
||||||
|
+
|
||||||
|
LDX #FileSelectItems_goodBeeBottle
|
||||||
|
JMP DrawItem
|
||||||
|
|
||||||
|
|
||||||
DrawPlayerFile:
|
DrawPlayerFile:
|
||||||
PHX : PHY : PHB
|
PHX : PHY : PHB
|
||||||
|
|
||||||
@@ -183,25 +216,31 @@ DrawPlayerFile:
|
|||||||
; Mirror
|
; Mirror
|
||||||
%fs_drawItemBasic($700353,8,20,FileSelectItems_mirror)
|
%fs_drawItemBasic($700353,8,20,FileSelectItems_mirror)
|
||||||
|
|
||||||
|
; Bottles
|
||||||
|
%fs_drawBottle($70035C,2,24)
|
||||||
|
%fs_drawBottle($70035D,4,24)
|
||||||
|
%fs_drawBottle($70035E,6,24)
|
||||||
|
%fs_drawBottle($70035F,8,24)
|
||||||
|
|
||||||
; Boots
|
; Boots
|
||||||
%fs_drawItemBasic($700355,2,26,FileSelectItems_boots)
|
%fs_drawItemBasic($700355,2,28,FileSelectItems_boots)
|
||||||
|
|
||||||
; Gloves
|
; Gloves
|
||||||
LDA.l $700354 : AND.w #$00FF : BNE +
|
LDA.l $700354 : AND.w #$00FF : BNE +
|
||||||
%fs_drawItemGray(4,26,FileSelectItems_gloves)
|
%fs_drawItemGray(4,28,FileSelectItems_gloves)
|
||||||
BRA ++
|
BRA ++
|
||||||
+ : DEC : BNE +
|
+ : DEC : BNE +
|
||||||
%fs_drawItem(4,26,FileSelectItems_gloves)
|
%fs_drawItem(4,28,FileSelectItems_gloves)
|
||||||
BRA ++
|
BRA ++
|
||||||
+
|
+
|
||||||
%fs_drawItem(4,26,FileSelectItems_mitts)
|
%fs_drawItem(4,28,FileSelectItems_mitts)
|
||||||
++
|
++
|
||||||
|
|
||||||
; Flippers
|
; Flippers
|
||||||
%fs_drawItemBasic($700356,6,26,FileSelectItems_flippers)
|
%fs_drawItemBasic($700356,6,28,FileSelectItems_flippers)
|
||||||
|
|
||||||
; Moon Pearl
|
; Moon Pearl
|
||||||
%fs_drawItemBasic($700357,8,26,FileSelectItems_pearl)
|
%fs_drawItemBasic($700357,8,28,FileSelectItems_pearl)
|
||||||
|
|
||||||
PLB : PLY : PLX
|
PLB : PLY : PLX
|
||||||
LDA.w #$0004 : STA $02 ; thing we wrote over
|
LDA.w #$0004 : STA $02 ; thing we wrote over
|
||||||
@@ -267,6 +306,15 @@ FileSelectItems:
|
|||||||
.powder
|
.powder
|
||||||
dw #$020A|!FS_COLOR_BROWN, #$020B|!FS_COLOR_BROWN, #$021A|!FS_COLOR_BROWN, #$021B|!FS_COLOR_BROWN
|
dw #$020A|!FS_COLOR_BROWN, #$020B|!FS_COLOR_BROWN, #$021A|!FS_COLOR_BROWN, #$021B|!FS_COLOR_BROWN
|
||||||
|
|
||||||
|
.emptyBottle
|
||||||
|
.redPotion
|
||||||
|
.greenPotion
|
||||||
|
.bluePotion
|
||||||
|
.fairyBottle
|
||||||
|
.beeBottle
|
||||||
|
.goodBeeBottle
|
||||||
|
dw #$0240|!FS_COLOR_BW, #$0241|!FS_COLOR_BW, #$0250|!FS_COLOR_BW, #$0251|!FS_COLOR_BW
|
||||||
|
|
||||||
;--------------------------------------------------------------------------------
|
;--------------------------------------------------------------------------------
|
||||||
FileSelectDrawHudBar:
|
FileSelectDrawHudBar:
|
||||||
LDA #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
|
LDA #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
|
||||||
|
|||||||
Reference in New Issue
Block a user