alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Replace labels in fileselect.asm

Browse Source 
Full file name has also been moved to the beginning of the new save
space at $7F6000 in WRAM and $700500 in SRAM
This commit is contained in:
cassidy
2021-12-06 00:48:43 -05:00
parent ae82caca45
commit 7f03cf68e8
1 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
fileselect.asm
View File

@@ -1,9 +1,6 @@
!ValidKeyLoaded = "$7F509E" !ValidKeyLoaded = "$7F509E"
;FS prefix means file_select, since these defines and macros are specific to this screen ;FS prefix means file_select, since these defines and macros are specific to this screen
!FS_INVENTORY_SWAP = "$70038C"
!FS_INVENTORY_SWAP_2 = "$70038E"
!FS_COLOR_BROWN = "$0000" ;(only used for: Shovel, hammer, powder) !FS_COLOR_BROWN = "$0000" ;(only used for: Shovel, hammer, powder)
!FS_COLOR_RED = "$0400" !FS_COLOR_RED = "$0400"
@@ -156,15 +153,15 @@ DrawPlayerFileShared:
JSR FileSelectDrawHudBar JSR FileSelectDrawHudBar
; Bow ; Bow
LDA.l !FS_INVENTORY_SWAP_2 : AND.w #$0040 : BEQ + LDA.l BowTracking : AND.w #$0040 : BEQ +
LDA $700340 : AND.w #$00FF : BEQ ++ LDA SRAMEquipment : AND.w #$00FF : BEQ ++
%fs_drawItem(3,12,FileSelectItems_silver_bow) %fs_drawItem(3,12,FileSelectItems_silver_bow)
BRA .bow_end BRA .bow_end
++ ++
%fs_drawItem(3,12,FileSelectItems_silver_arrow) %fs_drawItem(3,12,FileSelectItems_silver_arrow)
BRA .bow_end BRA .bow_end
+ +
LDA.l $700340 : AND.w #$00FF : BEQ + LDA.l SRAMEquipment : AND.w #$00FF : BEQ +
%fs_drawItem(3,12,FileSelectItems_bow) %fs_drawItem(3,12,FileSelectItems_bow)
BRA .bow_end BRA .bow_end
+ +
@@ -172,15 +169,15 @@ DrawPlayerFileShared:
.bow_end .bow_end
; Boomerang ; Boomerang
LDA.l !FS_INVENTORY_SWAP : AND.w #$00C0 : CMP.w #$00C0 : BNE + LDA.l InventoryTracking : AND.w #$00C0 : CMP.w #$00C0 : BNE +
%fs_drawItem(3,14,FileSelectItems_both_boomerang) %fs_drawItem(3,14,FileSelectItems_both_boomerang)
BRA .boomerang_end BRA .boomerang_end
+ +
LDA.l !FS_INVENTORY_SWAP : AND.w #$0040 : BEQ + LDA.l InventoryTracking : AND.w #$0040 : BEQ +
%fs_drawItem(3,14,FileSelectItems_red_boomerang) %fs_drawItem(3,14,FileSelectItems_red_boomerang)
BRA .boomerang_end BRA .boomerang_end
+ +
LDA.l !FS_INVENTORY_SWAP : AND.w #$0080 : BEQ + LDA.l InventoryTracking : AND.w #$0080 : BEQ +
%fs_drawItem(3,14,FileSelectItems_blue_boomerang) %fs_drawItem(3,14,FileSelectItems_blue_boomerang)
BRA .boomerang_end BRA .boomerang_end
+ +
@@ -188,13 +185,13 @@ DrawPlayerFileShared:
.boomerang_end .boomerang_end
; Hookshot ; Hookshot
%fs_drawItemBasic($700342,3,16,FileSelectItems_hookshot) %fs_drawItemBasic(SRAMEquipment+$02,3,16,FileSelectItems_hookshot)
; Bombs ; Bombs
; %fs_drawItemBasic($700343,3,18,FileSelectItems_bombs) ; %fs_drawItemBasic(SRAMEquipment+$03,3,18,FileSelectItems_bombs)
; Powder ; Powder
LDA.l !FS_INVENTORY_SWAP : AND.w #$0010 : BEQ + LDA.l InventoryTracking : AND.w #$0010 : BEQ +
%fs_drawItem(3,20,FileSelectItems_powder) %fs_drawItem(3,20,FileSelectItems_powder)
BRA ++ BRA ++
+ +
@@ -202,7 +199,7 @@ DrawPlayerFileShared:
++ ++
; Mushroom ; Mushroom
LDA.l !FS_INVENTORY_SWAP : AND.w #$0008 : BEQ + LDA.l InventoryTracking : AND.w #$0008 : BEQ +
%fs_drawItem(3,18,FileSelectItems_mushroom) %fs_drawItem(3,18,FileSelectItems_mushroom)
BRA ++ BRA ++
+ +
@@ -210,7 +207,7 @@ DrawPlayerFileShared:
++ ++
; Flute ; Flute
LDA.l !FS_INVENTORY_SWAP : AND.w #$0003 : BEQ + LDA.l InventoryTracking : AND.w #$0003 : BEQ +
%fs_drawItem(7,16,FileSelectItems_flute) %fs_drawItem(7,16,FileSelectItems_flute)
BRA ++ BRA ++
+ +
@@ -218,7 +215,7 @@ DrawPlayerFileShared:
++ ++
; Shovel ; Shovel
LDA.l !FS_INVENTORY_SWAP : AND.w #$0004 : BEQ + LDA.l InventoryTracking : AND.w #$0004 : BEQ +
%fs_drawItem(9,12,FileSelectItems_shovel) %fs_drawItem(9,12,FileSelectItems_shovel)
BRA ++ BRA ++
+ +
@@ -226,52 +223,52 @@ DrawPlayerFileShared:
++ ++
; Fire Rod ; Fire Rod
%fs_drawItemBasic($700345,5,12,FileSelectItems_fire_rod) %fs_drawItemBasic(SRAMEquipment+$05,5,12,FileSelectItems_fire_rod)
; Ice Rod ; Ice Rod
%fs_drawItemBasic($700346,5,14,FileSelectItems_ice_rod) %fs_drawItemBasic(SRAMEquipment+$06,5,14,FileSelectItems_ice_rod)
; Bombos Medallion ; Bombos Medallion
%fs_drawItemBasic($700347,5,16,FileSelectItems_bombos) %fs_drawItemBasic(SRAMEquipment+$07,5,16,FileSelectItems_bombos)
; Ether Medallion ; Ether Medallion
%fs_drawItemBasic($700348,5,18,FileSelectItems_ether) %fs_drawItemBasic(SRAMEquipment+$08,5,18,FileSelectItems_ether)
; Quake Medallion ; Quake Medallion
%fs_drawItemBasic($700349,5,20,FileSelectItems_quake) %fs_drawItemBasic(SRAMEquipment+$09,5,20,FileSelectItems_quake)
; Lamp ; Lamp
%fs_drawItemBasic($70034A,7,12,FileSelectItems_lamp) %fs_drawItemBasic(SRAMEquipment+$0A,7,12,FileSelectItems_lamp)
; Hammer ; Hammer
%fs_drawItemBasic($70034B,7,14,FileSelectItems_hammer) %fs_drawItemBasic(SRAMEquipment+$0B,7,14,FileSelectItems_hammer)
; Bug Net ; Bug Net
%fs_drawItemBasic($70034D,7,18,FileSelectItems_bugnet) %fs_drawItemBasic(SRAMEquipment+$0D,7,18,FileSelectItems_bugnet)
; Book of Mudora ; Book of Mudora
%fs_drawItemBasic($70034E,7,20,FileSelectItems_book) %fs_drawItemBasic(SRAMEquipment+$0E,7,20,FileSelectItems_book)
; Red Cane ; Red Cane
%fs_drawItemBasic($700350,9,14,FileSelectItems_redcane) %fs_drawItemBasic(SRAMEquipment+$10,9,14,FileSelectItems_redcane)
; Blue Cane ; Blue Cane
%fs_drawItemBasic($700351,9,16,FileSelectItems_bluecane) %fs_drawItemBasic(SRAMEquipment+$11,9,16,FileSelectItems_bluecane)
; Cape ; Cape
%fs_drawItemBasic($700352,9,18,FileSelectItems_cape) %fs_drawItemBasic(SRAMEquipment+$12,9,18,FileSelectItems_cape)
; Mirror ; Mirror
%fs_drawItemBasic($700353,9,20,FileSelectItems_mirror) %fs_drawItemBasic(SRAMEquipment+$13,9,20,FileSelectItems_mirror)
; Bottles ; Bottles
%fs_drawBottle($70035C,3,23) %fs_drawBottle(SRAMEquipment+$1C,3,23)
%fs_drawBottle($70035D,5,23) %fs_drawBottle(SRAMEquipment+$1D,5,23)
%fs_drawBottle($70035E,7,23) %fs_drawBottle(SRAMEquipment+$1E,7,23)
%fs_drawBottle($70035F,9,23) %fs_drawBottle(SRAMEquipment+$1F,9,23)
; Sword ; Sword
LDA.l $700359 : AND.w #$00FF : BNE + LDA.l SRAMEquipment+$19 : AND.w #$00FF : BNE +
%fs_drawItemGray(3,26,FileSelectItems_fighters_sword) %fs_drawItemGray(3,26,FileSelectItems_fighters_sword)
BRA ++ BRA ++
+ : DEC : BNE + + : DEC : BNE +
@@ -292,7 +289,7 @@ DrawPlayerFileShared:
++ ++
; Shield ; Shield
LDA.l $70035A : AND.w #$00FF : BNE + LDA.l SRAMEquipment+$1A : AND.w #$00FF : BNE +
%fs_drawItemGray(5,26,FileSelectItems_fighters_shield) %fs_drawItemGray(5,26,FileSelectItems_fighters_shield)
BRA ++ BRA ++
+ : DEC : BNE + + : DEC : BNE +
@@ -306,7 +303,7 @@ DrawPlayerFileShared:
++ ++
; Mail ; Mail
LDA.l $70035B : AND.w #$00FF : BNE + LDA.l SRAMEquipment+$1B : AND.w #$00FF : BNE +
%fs_drawItem(7,26,FileSelectItems_green_mail) %fs_drawItem(7,26,FileSelectItems_green_mail)
BRA ++ BRA ++
+ : DEC : BNE + + : DEC : BNE +
@@ -317,7 +314,7 @@ DrawPlayerFileShared:
++ ++
; Heart Pieces ; Heart Pieces
LDA.l $70036B : AND.w #$00FF : BNE + LDA.l SRAMEquipment+$2B : AND.w #$00FF : BNE +
%fs_drawItem(9,26,FileSelectItems_heart_piece_0_of_4) %fs_drawItem(9,26,FileSelectItems_heart_piece_0_of_4)
BRA ++ BRA ++
+ : DEC : BNE + + : DEC : BNE +
@@ -330,16 +327,16 @@ DrawPlayerFileShared:
%fs_drawItem(9,26,FileSelectItems_heart_piece_3_of_4) %fs_drawItem(9,26,FileSelectItems_heart_piece_3_of_4)
++ ++
LDA $700448 : AND.w #$00FF LDA SRAMEquipment+$0108 : AND.w #$00FF
JSL.l HexToDec JSL.l HexToDec
LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,26) LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,26)
LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,27) LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,27)
; Boots ; Boots
%fs_drawItemBasic($700355,3,28,FileSelectItems_boots) %fs_drawItemBasic(SRAMEquipment+$15,3,28,FileSelectItems_boots)
; Gloves ; Gloves
LDA.l $700354 : AND.w #$00FF : BNE + LDA.l SRAMEquipment+$14 : AND.w #$00FF : BNE +
%fs_drawItemGray(5,28,FileSelectItems_gloves) %fs_drawItemGray(5,28,FileSelectItems_gloves)
BRA ++ BRA ++
+ : DEC : BNE + + : DEC : BNE +
@@ -350,27 +347,27 @@ DrawPlayerFileShared:
++ ++
; Flippers ; Flippers
%fs_drawItemBasic($700356,7,28,FileSelectItems_flippers) %fs_drawItemBasic(SRAMEquipment+$16,7,28,FileSelectItems_flippers)
; Moon Pearl ; Moon Pearl
%fs_drawItemBasic($700357,9,28,FileSelectItems_pearl) %fs_drawItemBasic(SRAMEquipment+$17,9,28,FileSelectItems_pearl)
; Pendants ; Pendants
LDA $700374 : AND.w #$0004 : BEQ + LDA SRAMEquipment+$34 : AND.w #$0004 : BEQ +
%fs_drawItem(12,12,FileSelectItems_green_pendant) %fs_drawItem(12,12,FileSelectItems_green_pendant)
BRA ++ BRA ++
+ +
%fs_drawItem(12,12,FileSelectItems_no_pendant) %fs_drawItem(12,12,FileSelectItems_no_pendant)
++ ++
LDA $700374 : AND.w #$0002 : BEQ + LDA SRAMEquipment+$34 : AND.w #$0002 : BEQ +
%fs_drawItem(12,14,FileSelectItems_blue_pendant) %fs_drawItem(12,14,FileSelectItems_blue_pendant)
BRA ++ BRA ++
+ +
%fs_drawItem(12,14,FileSelectItems_no_pendant) %fs_drawItem(12,14,FileSelectItems_no_pendant)
++ ++
LDA $700374 : AND.w #$0001 : BEQ + LDA SRAMEquipment+$34 : AND.w #$0001 : BEQ +
%fs_drawItem(12,16,FileSelectItems_red_pendant) %fs_drawItem(12,16,FileSelectItems_red_pendant)
BRA ++ BRA ++
+ +
@@ -378,49 +375,49 @@ DrawPlayerFileShared:
++ ++
; Crystals ; Crystals
LDA $70037A : AND.w #$0002 : BEQ + LDA SRAMEquipment+$3A : AND.w #$0002 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(13,18) ++ : %fs_draw16x8(13,18)
LDA $70037A : AND.w #$0010 : BEQ + LDA SRAMEquipment+$3A : AND.w #$0010 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(12,19) ++ : %fs_draw16x8(12,19)
LDA $70037A : AND.w #$0040 : BEQ + LDA SRAMEquipment+$3A : AND.w #$0040 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(13,20) ++ : %fs_draw16x8(13,20)
LDA $70037A : AND.w #$0020 : BEQ + LDA SRAMEquipment+$3A : AND.w #$0020 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(12,21) ++ : %fs_draw16x8(12,21)
LDA $70037A : AND.w #$0004 : BEQ + LDA SRAMEquipment+$3A : AND.w #$0004 : BEQ +
LDA.w #$0297|!FS_COLOR_RED LDA.w #$0297|!FS_COLOR_RED
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(13,22) ++ : %fs_draw16x8(13,22)
LDA $70037A : AND.w #$0001 : BEQ + LDA SRAMEquipment+$3A : AND.w #$0001 : BEQ +
LDA.w #$0297|!FS_COLOR_RED LDA.w #$0297|!FS_COLOR_RED
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(12,23) ++ : %fs_draw16x8(12,23)
LDA $70037A : AND.w #$0008 : BEQ + LDA SRAMEquipment+$3A : AND.w #$0008 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
@@ -562,7 +559,7 @@ FileSelectItems:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
FileSelectDrawHudBar: FileSelectDrawHudBar:
LDA #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10) LDA #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
LDA $700362 LDA SRAMEquipment+$22
JSL.l HexToDec JSL.l HexToDec
LDA $7F5004 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,9) LDA $7F5004 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,9)
LDA $7F5005 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,10) LDA $7F5005 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,10)
@@ -570,18 +567,18 @@ FileSelectDrawHudBar:
LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12) LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12)
LDA #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14) LDA #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
LDA $700343 : AND.w #$00FF LDA SRAMEquipment+$03 : AND.w #$00FF
JSL.l HexToDec JSL.l HexToDec
LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14) LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14)
LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15) LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15)
LDA.l !FS_INVENTORY_SWAP_2 : AND.w #$0040 : BEQ + LDA.l BowTracking : AND.w #$0040 : BEQ +
LDA #$0299|!FS_COLOR_RED : %fs_draw16x8(0,17) LDA #$0299|!FS_COLOR_RED : %fs_draw16x8(0,17)
BRA ++ BRA ++
+ +
LDA #$0289|!FS_COLOR_BROWN : %fs_draw16x8(0,17) LDA #$0289|!FS_COLOR_BROWN : %fs_draw16x8(0,17)
++ ++
LDA $700377 : AND.w #$00FF LDA SRAMEquipment+$37 : AND.w #$00FF
JSL.l HexToDec JSL.l HexToDec
LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,17) LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,17)
LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,18) LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,18)
@@ -790,16 +787,16 @@ DrawPlayerFile_credits:
; see $6563C for drawing first file name and hearts ; see $6563C for drawing first file name and hearts
REP #$20 ; set 16 bit accumulator REP #$20 ; set 16 bit accumulator
LDA $7003D9 : ORA.w #!FS_COLOR_BW LDA SRAMEquipment+$99 : ORA.w #!FS_COLOR_BW
%fs_draw8x16(3,5) %fs_draw8x16(3,5)
LDA $7003DB : ORA.w #!FS_COLOR_BW LDA SRAMEquipment+$9B : ORA.w #!FS_COLOR_BW
%fs_draw8x16(3,6) %fs_draw8x16(3,6)
LDA $7003DD : ORA.w #!FS_COLOR_BW LDA SRAMEquipment+$9D : ORA.w #!FS_COLOR_BW
%fs_draw8x16(3,7) %fs_draw8x16(3,7)
LDA $7003DF : ORA.w #!FS_COLOR_BW LDA SRAMEquipment+$9F : ORA.w #!FS_COLOR_BW
%fs_draw8x16(3,8) %fs_draw8x16(3,8)
LDA $70036C : AND.w #$00FF : LSR #3 : STA $02 LDA SRAMEquipment+$2C : AND.w #$00FF : LSR #3 : STA $02
%fs_LDY_screenpos(0,20) %fs_LDY_screenpos(0,20)
LDA.w #$028F|!FS_COLOR_RED LDA.w #$028F|!FS_COLOR_RED
LDX.w #$000A LDX.w #$000A