From 9425b1c3b19483d77eb89dccbfb98767cdeb3067 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Thu, 24 Nov 2022 22:02:55 -0500 Subject: [PATCH] Move zoraking.asm and catfish.asm into npcitems.asm --- LTTP_RND_GeneralBugfixes.asm | 2 -- catfish.asm | 26 ------------------------ npcitems.asm | 38 ++++++++++++++++++++++++++++++++++++ zoraking.asm | 12 ------------ 4 files changed, 38 insertions(+), 40 deletions(-) delete mode 100644 catfish.asm delete mode 100644 zoraking.asm diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 37cf70d..9b94ef2 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -81,8 +81,6 @@ incsrc medallions.asm incsrc inventory.asm incsrc zelda.asm incsrc maidencrystals.asm -incsrc zoraking.asm -incsrc catfish.asm incsrc flute.asm incsrc dungeondrops.asm incsrc halfmagicbat.asm diff --git a/catfish.asm b/catfish.asm deleted file mode 100644 index bedaded..0000000 --- a/catfish.asm +++ /dev/null @@ -1,26 +0,0 @@ -;================================================================================ -; Randomize Catfish -;-------------------------------------------------------------------------------- -LoadCatfishItemGFX: - LDA.l $1DE185 ; location randomizer writes catfish item to - JML PrepDynamicTile -;-------------------------------------------------------------------------------- -DrawThrownItem: - LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish - .zora - LDA.b #$01 : STA.l RedrawFlag - LDA.l $1DE1C3 ; location randomizer writes zora item to - BRA .draw - .catfish - LDA.l $1DE185 ; location randomizer writes catfish item to - .draw - JML DrawDynamicTile -;-------------------------------------------------------------------------------- -MarkThrownItem: - JSL Link_ReceiveItem ; thing we wrote over - LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish - .zora - JML ItemSet_ZoraKing - .catfish - JML ItemSet_Catfish -;-------------------------------------------------------------------------------- diff --git a/npcitems.asm b/npcitems.asm index 8ed60fb..d4c58aa 100644 --- a/npcitems.asm +++ b/npcitems.asm @@ -169,4 +169,42 @@ Set300RupeeNPCItem: .done PLP : PLA RTL + ;================================================================================ +; Randomize Zora King +;-------------------------------------------------------------------------------- +LoadZoraKingItemGFX: + LDA.l $1DE1C3 ; location randomizer writes zora item to + JML.l PrepDynamicTile +;-------------------------------------------------------------------------------- +JumpToSplashItemTarget: + LDA.w SpriteMovement, X + CMP.b #$FF : BNE + : JML.l SplashItem_SpawnSplash : + + CMP.b #$00 : JML.l SplashItem_SpawnOther + +;================================================================================ +; Randomize Catfish +;-------------------------------------------------------------------------------- +LoadCatfishItemGFX: + LDA.l $1DE185 ; location randomizer writes catfish item to + JML PrepDynamicTile +;-------------------------------------------------------------------------------- +DrawThrownItem: + LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish + .zora + LDA.b #$01 : STA.l RedrawFlag + LDA.l $1DE1C3 ; location randomizer writes zora item to + BRA .draw + .catfish + LDA.l $1DE185 ; location randomizer writes catfish item to + .draw + JML DrawDynamicTile +;-------------------------------------------------------------------------------- +MarkThrownItem: + JSL Link_ReceiveItem ; thing we wrote over + LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish + .zora + JML ItemSet_ZoraKing + .catfish + JML ItemSet_Catfish +;-------------------------------------------------------------------------------- diff --git a/zoraking.asm b/zoraking.asm deleted file mode 100644 index e3f44c3..0000000 --- a/zoraking.asm +++ /dev/null @@ -1,12 +0,0 @@ -;================================================================================ -; Randomize Zora King -;-------------------------------------------------------------------------------- -LoadZoraKingItemGFX: - LDA.l $1DE1C3 ; location randomizer writes zora item to - JML.l PrepDynamicTile -;-------------------------------------------------------------------------------- -JumpToSplashItemTarget: - LDA.w SpriteMovement, X - CMP.b #$FF : BNE + : JML.l SplashItem_SpawnSplash : + - CMP.b #$00 : JML.l SplashItem_SpawnOther -;--------------------------------------------------------------------------------