alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: couple nice to haves for mirror scroll & fake boots

Browse Source
This commit is contained in:
aerinon
2024-06-14 17:04:30 -06:00
parent bc7cd584e3
commit 6e327c951f
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fileselect.asm
View File

@@ -299,7 +299,13 @@ DrawPlayerFileShared:
%fs_drawItemBasic(EquipmentSRAM+$12,9,18,FileSelectItems_cape) %fs_drawItemBasic(EquipmentSRAM+$12,9,18,FileSelectItems_cape)
; Mirror ; Mirror
%fs_drawItemBasic(EquipmentSRAM+$13,9,20,FileSelectItems_mirror) LDA.l EquipmentSRAM+$13 : AND.w #$00FF : BEQ +
CMP.w #$0001 : BNE +
%fs_drawItem(9,20,FileSelectItems_mirrorScroll)
BRA ++
+
%fs_drawItemBasic(EquipmentSRAM+$13,9,20,FileSelectItems_mirror)
++
; Bottles ; Bottles
%fs_drawBottle(EquipmentSRAM+$1C,3,23) %fs_drawBottle(EquipmentSRAM+$1C,3,23)
@@ -543,6 +549,8 @@ FileSelectItems:
dw #$0288|!FS_COLOR_RED, #$0289|!FS_COLOR_RED, #$0298|!FS_COLOR_RED, #$0299|!FS_COLOR_RED dw #$0288|!FS_COLOR_RED, #$0289|!FS_COLOR_RED, #$0298|!FS_COLOR_RED, #$0299|!FS_COLOR_RED
.mirror .mirror
dw #$028A|!FS_COLOR_BLUE, #$028B|!FS_COLOR_BLUE, #$029A|!FS_COLOR_BLUE, #$029B|!FS_COLOR_BLUE dw #$028A|!FS_COLOR_BLUE, #$028B|!FS_COLOR_BLUE, #$029A|!FS_COLOR_BLUE, #$029B|!FS_COLOR_BLUE
.mirrorScroll
dw #$02C2|!FS_COLOR_YELLOW, #$02C3|!FS_COLOR_YELLOW, #$02D2|!FS_COLOR_YELLOW, #$02d3|!FS_COLOR_YELLOW
.flippers .flippers
dw #$024E|!FS_COLOR_BLUE, #$024F|!FS_COLOR_BLUE, #$025F|!FS_COLOR_BLUE|!FS_HFLIP, #$025F|!FS_COLOR_BLUE dw #$024E|!FS_COLOR_BLUE, #$024F|!FS_COLOR_BLUE, #$025F|!FS_COLOR_BLUE|!FS_HFLIP, #$025F|!FS_COLOR_BLUE

6
hooks.asm
View File

@@ -750,11 +750,17 @@ org $8DE7B9 ; <- 6E7B9 - equipment.asm : 1548 (LDA.w #$16D0 : STA $00)
JSL DrawGlovesInMenuLocation : NOP JSL DrawGlovesInMenuLocation : NOP
org $8DE7CF ; <- 6E7CF - equipment.asm : 1554 (LDA.w #$16C8 : STA $00) org $8DE7CF ; <- 6E7CF - equipment.asm : 1554 (LDA.w #$16C8 : STA $00)
JSL DrawBootsInMenuLocation : NOP JSL DrawBootsInMenuLocation : NOP
org $8DE7DD
JSL ChangeBootsColorForFakeBoots : NOP
org $8DE7E5 ; <- 6E7E5 - equipment.asm : 1560 (LDA.w #$16D8 : STA $00) org $8DE7E5 ; <- 6E7E5 - equipment.asm : 1560 (LDA.w #$16D8 : STA $00)
JSL DrawFlippersInMenuLocation : NOP JSL DrawFlippersInMenuLocation : NOP
org $8DECEB ; <- 6ECEB - equipment.asm : 1946 (LDA.w #$16E0 : STA $00) org $8DECEB ; <- 6ECEB - equipment.asm : 1946 (LDA.w #$16E0 : STA $00)
JSL DrawMoonPearlInMenuLocation : NOP JSL DrawMoonPearlInMenuLocation : NOP
; Fake boots icon
org $8DF851
dw $2C29, $2C2A, $2C2B, $2C2C
;================================================================================ ;================================================================================
; Zelda S&Q Mirror Fix ; Zelda S&Q Mirror Fix
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

2
inventory.asm
View File

@@ -168,7 +168,7 @@ AddInventory:
LDA.l BootsEquipment : AND.w #$00FF : BNE + LDA.l BootsEquipment : AND.w #$00FF : BNE +
TYA : STA.l PreBootsLocations TYA : STA.l PreBootsLocations
+ +
LDA.l MirrorEquipment : AND.w #$00FF : BNE + LDA.l MirrorEquipment : AND.w #$00FE : BNE + ; FE to ignore mirror scroll
TYA : STA.l PreMirrorLocations TYA : STA.l PreMirrorLocations
+ +
LDA.l FluteEquipment : AND.w #$00FF : BNE + LDA.l FluteEquipment : AND.w #$00FF : BNE +

9
pendantcrystalhud.asm
View File

@@ -165,6 +165,15 @@ DrawBootsInMenuLocation:
LDA.w #$1588 : STA.b Scrap00 LDA.w #$1588 : STA.b Scrap00
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
ChangeBootsColorForFakeBoots:
LDA.l FakeBoots : AND.w #$00FF : BEQ +
LDA.l EquipmentSRAM+$15 : AND.w #$00FF : BNE +
LDA.w #$F851 ; address of ItemMenu_ItemIcons_usused_nothing, which has the fake boots now
BRA ++
+ LDA.w #$F821 ; address of ItemMenu_ItemIcons_boots
++ STA.b Scrap04
RTL
;--------------------------------------------------------------------------------
DrawGlovesInMenuLocation: DrawGlovesInMenuLocation:
LDA.l HUDDungeonItems : BNE + LDA.l HUDDungeonItems : BNE +
LDA.w #$1610 : STA.b Scrap00 LDA.w #$1610 : STA.b Scrap00