From d3cd3a86ca97785010ec1ba751a59a5ce1beb4b3 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Thu, 24 Nov 2022 21:53:18 -0500 Subject: [PATCH] Move tree kid stuff into hooks.asm --- LTTP_RND_GeneralBugfixes.asm | 1 - hooks.asm | 10 ++++++++++ treekid.asm | 9 --------- 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 treekid.asm diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index c323bc2..37cf70d 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -49,7 +49,6 @@ function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<< ;================================================================================ incsrc hooks.asm -incsrc treekid.asm incsrc spriteswap.asm incsrc hashalphabethooks.asm incsrc sharedplayerpalettefix.asm diff --git a/hooks.asm b/hooks.asm index 14b3568..ed4e7ce 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1375,6 +1375,16 @@ JSL.l CheckHUDSilverArrows org $1EF060 ; <- F7060 - sprite_shopkeeper.asm:242 (INC $0D80, X) 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 ;-------------------------------------------------------------------------------- diff --git a/treekid.asm b/treekid.asm deleted file mode 100644 index 1197bfb..0000000 --- a/treekid.asm +++ /dev/null @@ -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 -;================================================================================