Move zoraking.asm and catfish.asm into npcitems.asm

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

catfish.asm

@@ -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
-;--------------------------------------------------------------------------------

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
+;--------------------------------------------------------------------------------

zoraking.asm

@@ -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
-;--------------------------------------------------------------------------------