From 4b4e60929b8e3fa61172a2ea13f0798cad4607ef Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 9 Mar 2024 08:31:21 -0500 Subject: [PATCH] Move Lanmolas to Sprites/Bosses --- Dungeons/dungeons.asm | 8 -------- .../Lanmola.asm => Sprites/Bosses/lanmola.asm | 0 .../Bosses/lanmola_expanded.asm | 18 +++++++++--------- Sprites/all_sprites.asm | 6 ++++++ 4 files changed, 15 insertions(+), 17 deletions(-) rename Dungeons/Lanmola.asm => Sprites/Bosses/lanmola.asm (100%) rename Dungeons/Lanmola_Expanded.asm => Sprites/Bosses/lanmola_expanded.asm (86%) diff --git a/Dungeons/dungeons.asm b/Dungeons/dungeons.asm index a2f44b9..cc359d8 100644 --- a/Dungeons/dungeons.asm +++ b/Dungeons/dungeons.asm @@ -21,11 +21,3 @@ print "End of spike_subtype.asm ", pc incsrc "Dungeons/house_tag.asm" print "End of house_tag.asm ", pc - -incsrc "Dungeons/Lanmola.asm" -print "End of Lanmola.asm ", pc - -incsrc "Dungeons/Lanmola_Expanded.asm" -print "End of Lanmola_Expanded.asm ", pc - - diff --git a/Dungeons/Lanmola.asm b/Sprites/Bosses/lanmola.asm similarity index 100% rename from Dungeons/Lanmola.asm rename to Sprites/Bosses/lanmola.asm diff --git a/Dungeons/Lanmola_Expanded.asm b/Sprites/Bosses/lanmola_expanded.asm similarity index 86% rename from Dungeons/Lanmola_Expanded.asm rename to Sprites/Bosses/lanmola_expanded.asm index 8de90ba..94ae72d 100644 --- a/Dungeons/Lanmola_Expanded.asm +++ b/Sprites/Bosses/lanmola_expanded.asm @@ -22,7 +22,7 @@ Ancilla_SpawnFallingPrize: RTL -; ============================================================================== +; ========================================================= Lanmola_DrawDirtLONG: { @@ -35,7 +35,7 @@ Lanmola_DrawDirtLONG: RTL } -; ============================================================================== +; ========================================================= Lanmola_DrawDirt: { @@ -128,7 +128,7 @@ Lanmola_DrawDirt: RTS } -; ============================================================================== +; ========================================================= Sprite_Lanmola_Init_DataLONG: { @@ -141,7 +141,7 @@ Sprite_Lanmola_Init_DataLONG: RTL } -; ============================================================================== +; ========================================================= Sprite_Lanmola_Init_Data: { @@ -262,7 +262,7 @@ Sprite_Lanmola_Init_Data: ;7EEACA } -; ============================================================================== +; ========================================================= Lanmola_MoveSegment: { @@ -321,7 +321,7 @@ Lanmola_MoveSegment: RTL } -; ============================================================================== +; ========================================================= SetShrapnelTimer: { @@ -332,7 +332,7 @@ SetShrapnelTimer: RTL } -; ============================================================================== +; ========================================================= CheckIfActive: { @@ -349,5 +349,5 @@ CheckIfActive: RTL } -print pc -; ============================================================================== + +; ========================================================= diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm index b088123..ef5c5a9 100644 --- a/Sprites/all_sprites.asm +++ b/Sprites/all_sprites.asm @@ -101,6 +101,12 @@ print "End of arrghus.asm ", pc incsrc "Sprites/Bosses/mothula.asm" print "End of mothula.asm ", pc +incsrc "Sprites/Bosses/lanmola.asm" +print "End of Lanmola.asm ", pc + +incsrc "Sprites/Bosses/lanmola_Expanded.asm" +print "End of Lanmola_Expanded.asm ", pc + incsrc "Sprites/NPCs/bug_net_kid.asm" warnpc $328000 \ No newline at end of file