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

Move tree kid stuff into hooks.asm

Browse Source
This commit is contained in:
cassidoxa
2022-11-24 21:53:18 -05:00
parent 524a27d680
commit d3cd3a86ca
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LTTP_RND_GeneralBugfixes.asm
View File

@@ -49,7 +49,6 @@ function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<
;================================================================================ ;================================================================================
incsrc hooks.asm incsrc hooks.asm
incsrc treekid.asm
incsrc spriteswap.asm incsrc spriteswap.asm
incsrc hashalphabethooks.asm incsrc hashalphabethooks.asm
incsrc sharedplayerpalettefix.asm incsrc sharedplayerpalettefix.asm

10
hooks.asm
View File

@@ -1375,6 +1375,16 @@ JSL.l CheckHUDSilverArrows
org $1EF060 ; <- F7060 - sprite_shopkeeper.asm:242 (INC $0D80, X) org $1EF060 ; <- F7060 - sprite_shopkeeper.asm:242 (INC $0D80, X)
JSL.l Set300RupeeNPCItem : NOP JSL.l Set300RupeeNPCItem : NOP
;================================================================================
; Tree Kid Fix
;--------------------------------------------------------------------------------
org $06B12B ; <- 3312B - tree status set - 418 - LDA NpcFlagsVanilla : ORA.b #$08 : STA NpcFlagsVanilla
LDA.l NpcFlagsVanilla : AND.b #$F7 : STA.l NpcFlagsVanilla ; unset arboration instead of setting it
;--------------------------------------------------------------------------------
org $06B072 ; <- 33072 - FluteAardvark_InitialStateFromFluteState - 418 : dw FluteAardvark_AlreadyArborated
db #$8B
;================================================================================
;================================================================================ ;================================================================================
; Glitched Mode Fixes ; Glitched Mode Fixes
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

9
treekid.asm
View File

@@ -1,9 +0,0 @@
;================================================================================
; Tree Kid Fix
;--------------------------------------------------------------------------------
org $06B12B ; <- 3312B - tree status set - 418 - LDA NpcFlagsVanilla : ORA.b #$08 : STA NpcFlagsVanilla
LDA.l NpcFlagsVanilla : AND.b #$F7 : STA.l NpcFlagsVanilla ; unset arboration instead of setting it
;--------------------------------------------------------------------------------
org $06B072 ; <- 33072 - FluteAardvark_InitialStateFromFluteState - 418 : dw FluteAardvark_AlreadyArborated
db #$8B
;================================================================================