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

Fix key palettes

Browse Source 
Fix HUD item counter when releasing bee
This commit is contained in:
cassidoxa
2023-08-25 09:48:29 -04:00
parent 1cbcd1d5ff
commit 3f5455b647
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hooks.asm
View File

@@ -1408,19 +1408,15 @@ MVN $A17E
org $8DFB1F : JSL CheckHUDSilverArrows
org $8DFB29 : BRA UpdateHUDBuffer_update_item_check_arrows
;--------------------------------------------------------------------------------
org $8DF1AB
JSR.w RebuildHUD_update
org $8DDFC8
JSR.w RebuildHUD_update
org $8DF1AB : JSR.w RebuildHUD_update
org $8DDFC8 : JSR.w RebuildHUD_update
org $8DDB88 ; Don't rebuild HUD twice on icon refresh
NOP #3 ; Not sure why this is here
;--------------------------------------------------------------------------------
org $87A205
JSL.l RebuildHUD_update_long
org $8AEF62
JSL.l RebuildHUD_update_long
org $87A1CF
JSL.l RebuildHUD_update_long
org $87A205 : JSL.l RebuildHUD_update_long
org $8AEF62 : JSL.l RebuildHUD_update_long
org $87A1CF : JSL.l RebuildHUD_update_long
org $87A235 : JSL.l RebuildHUD_update_long
;--------------------------------------------------------------------------------
org $8DFFE1
RebuildHUD_update_long:

32
itemdatatables.asm
View File

@@ -576,22 +576,22 @@ endmacro
%SpriteProps($9D, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 9D - Big key of Eastern Palace
%SpriteProps($9E, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 9E - Big key of Hyrule Castle
%SpriteProps($9F, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 9F - Big key of Sewers
%SpriteProps($A0, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A0 - Small key of Sewers
%SpriteProps($A1, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A1 - Small key of Hyrule Castle
%SpriteProps($A2, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A2 - Small key of Eastern Palace
%SpriteProps($A3, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A3 - Small key of Desert Palace
%SpriteProps($A4, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A4 - Small key of Agahnim's Tower
%SpriteProps($A5, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A5 - Small key of Swamp Palace
%SpriteProps($A6, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A6 - Small key of Dark Palace
%SpriteProps($A7, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A7 - Small key of Misery Mire
%SpriteProps($A8, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A8 - Small key of Skull Woods
%SpriteProps($A9, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; A9 - Small key of Ice Palace
%SpriteProps($AA, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; AA - Small key of Tower of Hera
%SpriteProps($AB, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; AB - Small key of Thieves' Town
%SpriteProps($AC, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; AC - Small key of Turtle Rock
%SpriteProps($AD, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; AD - Small key of Ganon's Tower
%SpriteProps($AE, 2, 2, $04, $04, $0000) ; AE - Reserved
%SpriteProps($AF, 0, 0, $04, $04, PalettesVanilla_blue_ice+$0E) ; AF - Generic small key
%SpriteProps($A0, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A0 - Small key of Sewers
%SpriteProps($A1, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A1 - Small key of Hyrule Castle
%SpriteProps($A2, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A2 - Small key of Eastern Palace
%SpriteProps($A3, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A3 - Small key of Desert Palace
%SpriteProps($A4, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A4 - Small key of Agahnim's Tower
%SpriteProps($A5, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A5 - Small key of Swamp Palace
%SpriteProps($A6, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A6 - Small key of Dark Palace
%SpriteProps($A7, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A7 - Small key of Misery Mire
%SpriteProps($A8, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A8 - Small key of Skull Woods
%SpriteProps($A9, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; A9 - Small key of Ice Palace
%SpriteProps($AA, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; AA - Small key of Tower of Hera
%SpriteProps($AB, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; AB - Small key of Thieves' Town
%SpriteProps($AC, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; AC - Small key of Turtle Rock
%SpriteProps($AD, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; AD - Small key of Ganon's Tower
%SpriteProps($AE, 2, 2, $02, $02, $0000) ; AE - Reserved
%SpriteProps($AF, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E) ; AF - Generic small key
%SpriteProps($B0, 2, 2, $80, $80, PalettesCustom_crystal) ; B0 - Crystal 6
%SpriteProps($B1, 2, 2, $80, $80, PalettesCustom_crystal) ; B1 - Crystal 1
%SpriteProps($B2, 2, 2, $80, $80, PalettesCustom_crystal) ; B2 - Crystal 5