move sa2 bosses into sa2 folder

include/sprite.h

@@ -250,7 +250,7 @@ typedef struct {
     /* 0x06 */ u8 variant;
 } TileInfo;
 
-// NOTE: (Only?) used by by src/game/bosses/final_intro.c
+// NOTE: (Only?) used by by src/game/sa2/bosses/final_intro.c
 typedef struct {
     /* 0x00 */ void *tiles;
     /* 0x04 */ AnimId anim;

ldscript.txt

@@ -60,7 +60,7 @@ SECTIONS
         src/game/stage/player_super_sonic.o(.data);
         src/game/stage/ui.o(.data);
         src/game/stage/debug_text_printer.o(.data);
-        src/game/bosses/common.o(.data);
+        src/game/sa2/bosses/common.o(.data);
         src/game/options_screen.o(.data);
         src/game/sa2/special_stage/utils.o(.data);
         src/game/sa2/save.o(.data);
@@ -173,19 +173,19 @@ SECTIONS
         src/game/countdown.o(.text);
         src/game/game_over.o(.text);
 
-        src/game/bosses/final_intro.o(.text);
-        src/game/bosses/explosion_parts.o(.text);
-        src/game/bosses/common.o(.text);
-        src/game/bosses/eggmobile_escape_sequence.o(.text);
-        src/game/bosses/boss_1.o(.text);
-        src/game/bosses/boss_2.o(.text);
-        src/game/bosses/boss_3.o(.text);
-        src/game/bosses/boss_4.o(.text);
-        src/game/bosses/boss_5.o(.text);
-        src/game/bosses/boss_6.o(.text);
-        src/game/bosses/boss_7.o(.text);
-        src/game/bosses/boss_8.o(.text);
-        src/game/bosses/boss_9.o(.text);
+        src/game/sa2/bosses/final_intro.o(.text);
+        src/game/sa2/bosses/explosion_parts.o(.text);
+        src/game/sa2/bosses/common.o(.text);
+        src/game/sa2/bosses/eggmobile_escape_sequence.o(.text);
+        src/game/sa2/bosses/boss_1.o(.text);
+        src/game/sa2/bosses/boss_2.o(.text);
+        src/game/sa2/bosses/boss_3.o(.text);
+        src/game/sa2/bosses/boss_4.o(.text);
+        src/game/sa2/bosses/boss_5.o(.text);
+        src/game/sa2/bosses/boss_6.o(.text);
+        src/game/sa2/bosses/boss_7.o(.text);
+        src/game/sa2/bosses/boss_8.o(.text);
+        src/game/sa2/bosses/boss_9.o(.text);
 
         src/game/enemies/projectiles.o(.text);
         src/game/enemies/mon.o(.text);
@@ -422,17 +422,17 @@ SECTIONS
         src/game/character_select.o(.rodata);
         src/game/course_select.o(.rodata);
         src/game/countdown.o(.rodata);
-        src/game/bosses/final_intro.o(.rodata);
-        src/game/bosses/common.o(.rodata);
-        src/game/bosses/boss_1.o(.rodata);
-        src/game/bosses/boss_2.o(.rodata);
-        src/game/bosses/boss_3.o(.rodata);
-        src/game/bosses/boss_4.o(.rodata);
-        src/game/bosses/boss_5.o(.rodata);
-        src/game/bosses/boss_6.o(.rodata);
-        src/game/bosses/boss_7.o(.rodata);
-        src/game/bosses/boss_8.o(.rodata);
-        src/game/bosses/boss_9.o(.rodata);
+        src/game/sa2/bosses/final_intro.o(.rodata);
+        src/game/sa2/bosses/common.o(.rodata);
+        src/game/sa2/bosses/boss_1.o(.rodata);
+        src/game/sa2/bosses/boss_2.o(.rodata);
+        src/game/sa2/bosses/boss_3.o(.rodata);
+        src/game/sa2/bosses/boss_4.o(.rodata);
+        src/game/sa2/bosses/boss_5.o(.rodata);
+        src/game/sa2/bosses/boss_6.o(.rodata);
+        src/game/sa2/bosses/boss_7.o(.rodata);
+        src/game/sa2/bosses/boss_8.o(.rodata);
+        src/game/sa2/bosses/boss_9.o(.rodata);
         src/game/enemies/kubinaga.o(.rodata);
         src/game/enemies/koura.o(.rodata);
         src/game/enemies/geji_geji.o(.rodata);

src/game/course_select.c

@@ -13,7 +13,7 @@
 #include "task.h"
 #include "malloc_vram.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "game/bosses/final_intro.h"
+#include "game/sa2/bosses/final_intro.h"
 #include "trig.h"
 
 #include "constants/animations.h"

src/game/sa1_sa2_shared/unused_level_select.c

@@ -10,7 +10,7 @@
 #include "game/stage/stage.h"
 
 #if (GAME == GAME_SA2)
-#include "game/bosses/common.h"
+#include "game/sa2/bosses/common.h"
 #include "game/title_screen.h"
 #endif
 

src/game/sa2/bosses/boss_1.c

@@ -11,9 +11,9 @@
 #include "game/player_callbacks.h"
 #include "game/sa2/save.h"
 #include "game/cheese.h"
-#include "game/bosses/boss_1.h"
-#include "game/bosses/common.h"
-#include "game/bosses/eggmobile_escape_sequence.h"
+#include "game/sa2/bosses/boss_1.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/eggmobile_escape_sequence.h"
 #include "game/cutscenes/level_endings.h"
 #include "game/parameters/bosses.h"
 #include "game/stage/boss_results_transition.h"

src/game/sa2/bosses/boss_2.c

@@ -10,8 +10,8 @@
 #include "game/player_callbacks.h"
 #include "game/stage/player.h"
 
-#include "game/bosses/common.h"
-#include "game/bosses/eggmobile_escape_sequence.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/eggmobile_escape_sequence.h"
 #include "game/stage/boss_results_transition.h"
 #include "game/cheese.h"
 

src/game/sa2/bosses/boss_3.c

@@ -5,9 +5,9 @@
 #include "lib/m4a/m4a.h"
 #include "game/sa1_sa2_shared/collision.h"
 #include "game/entity.h"
-#include "game/bosses/common.h"
-#include "game/bosses/boss_3.h"
-#include "game/bosses/eggmobile_escape_sequence.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/boss_3.h"
+#include "game/sa2/bosses/eggmobile_escape_sequence.h"
 #include "game/stage/boss_results_transition.h"
 #include "game/parameters/bosses.h"
 #include "game/player_callbacks.h"

src/game/sa2/bosses/boss_4.c

@@ -14,8 +14,8 @@
 #include "game/stage/terrain_collision.h"
 
 #include "game/entity.h" // Coll_Player_Entity_Intersection
-#include "game/bosses/common.h"
-#include "game/bosses/eggmobile_escape_sequence.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/eggmobile_escape_sequence.h"
 #include "game/parameters/bosses.h"
 
 #include "game/stage/screen_shake.h"
@@ -486,7 +486,7 @@ static void AeroEgg_UpdateBossSpritesOnDefeat(AeroEgg *boss)
 
 // (93.54%) https://decomp.me/scratch/PPILk
 // (97.22%) https://decomp.me/scratch/30p2x
-NONMATCH("asm/non_matching/game/bosses/boss_4__sub_8041D34.inc", void sub_8041D34(AeroEgg *boss))
+NONMATCH("asm/non_matching/game/sa2/bosses/boss_4__sub_8041D34.inc", void sub_8041D34(AeroEgg *boss))
 {
     ExplosionPartsInfo partsInfo;
     AeroEggSub *sub = &boss->sub;

src/game/sa2/bosses/boss_5.c

@@ -7,8 +7,8 @@
 #include "game/sa1_sa2_shared/collision.h"
 
 #include "game/sa2/save.h"
-#include "game/bosses/common.h"
-#include "game/bosses/eggmobile_escape_sequence.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/eggmobile_escape_sequence.h"
 #include "game/stage/boss_results_transition.h"
 
 #include "game/player_callbacks.h"
@@ -1657,7 +1657,7 @@ void sub_80454A4(EggSaucer *boss)
 }
 
 // (98.39%) https://decomp.me/scratch/wnQsf
-NONMATCH("asm/non_matching/game/bosses/boss_5__sub_8045564.inc", void sub_8045564(EggSaucer *boss))
+NONMATCH("asm/non_matching/game/sa2/bosses/boss_5__sub_8045564.inc", void sub_8045564(EggSaucer *boss))
 {
     s32 index;
     s32 new_var = 0xF;

src/game/sa2/bosses/boss_6.c

@@ -8,9 +8,9 @@
 #include "game/globals.h"
 #include "game/sa1_sa2_shared/collision.h"
 
-#include "game/bosses/boss_6.h"
-#include "game/bosses/common.h"
-#include "game/bosses/eggmobile_escape_sequence.h"
+#include "game/sa2/bosses/boss_6.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/eggmobile_escape_sequence.h"
 
 #include "game/stage/boss_results_transition.h"
 #include "game/stage/player.h"

src/game/sa2/bosses/boss_7.c

@@ -8,9 +8,9 @@
 #include "game/stage/boss_results_transition.h"
 #include "game/stage/terrain_collision.h"
 
-#include "game/bosses/boss_7.h"
-#include "game/bosses/common.h"
-#include "game/bosses/eggmobile_escape_sequence.h"
+#include "game/sa2/bosses/boss_7.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/eggmobile_escape_sequence.h"
 
 #include "game/player_callbacks.h"
 
@@ -845,7 +845,7 @@ static void sub_8048BF0(EggFrog *boss)
 
 // https://decomp.me/scratch/aDy46
 // 98.5%, some register hacks get it very close. All instructions match
-NONMATCH("asm/non_matching/game/bosses/boss_7__sub_8048C7C.inc", bool8 sub_8048C7C(EggFrog *boss))
+NONMATCH("asm/non_matching/game/sa2/bosses/boss_7__sub_8048C7C.inc", bool8 sub_8048C7C(EggFrog *boss))
 {
     const u16 **unk60 = (void *)boss->unk60;
     s16 *unk28 = boss->unk28;

src/game/sa2/bosses/boss_8.c

@@ -14,7 +14,7 @@
 #include "game/sa1_sa2_shared/camera.h"
 #include "game/sa1_sa2_shared/collision.h"
 #include "game/sa1_sa2_shared/player.h"
-#include "game/bosses/common.h"
+#include "game/sa2/bosses/common.h"
 #include "game/player_callbacks.h" // UpdateHomingPosition
 #include "game/cheese.h"
 #include "game/stage/camera.h"

src/game/sa2/bosses/boss_9.c

@@ -6,8 +6,8 @@
 #include "trig.h"
 #include "lib/m4a/m4a.h"
 #include "game/math.h"
-#include "game/bosses/common.h"
-#include "game/bosses/boss_9.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/boss_9.h"
 #include "game/stage/player_super_sonic.h"
 #include "game/stage/results.h"
 #include "game/stage/ui.h"

src/game/sa2/bosses/common.c

@@ -6,16 +6,16 @@
 #include "game/globals.h"
 
 #include "game/stage/player.h"
-#include "game/bosses/common.h"
-#include "game/bosses/boss_1.h"
-#include "game/bosses/boss_2.h"
-#include "game/bosses/boss_3.h"
-#include "game/bosses/boss_4.h"
-#include "game/bosses/boss_5.h"
-#include "game/bosses/boss_6.h"
-#include "game/bosses/boss_7.h"
-#include "game/bosses/boss_8.h"
-#include "game/bosses/boss_9.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/boss_1.h"
+#include "game/sa2/bosses/boss_2.h"
+#include "game/sa2/bosses/boss_3.h"
+#include "game/sa2/bosses/boss_4.h"
+#include "game/sa2/bosses/boss_5.h"
+#include "game/sa2/bosses/boss_6.h"
+#include "game/sa2/bosses/boss_7.h"
+#include "game/sa2/bosses/boss_8.h"
+#include "game/sa2/bosses/boss_9.h"
 
 #include "constants/animations.h"
 #include "constants/player_transitions.h"

src/game/sa2/bosses/explosion_parts.c

@@ -4,16 +4,16 @@
 #include "trig.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
-#include "game/bosses/common.h"
-#include "game/bosses/boss_1.h"
-#include "game/bosses/boss_2.h"
-#include "game/bosses/boss_3.h"
-#include "game/bosses/boss_4.h"
-#include "game/bosses/boss_5.h"
-#include "game/bosses/boss_6.h"
-#include "game/bosses/boss_7.h"
-#include "game/bosses/boss_8.h"
-#include "game/bosses/boss_9.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/boss_1.h"
+#include "game/sa2/bosses/boss_2.h"
+#include "game/sa2/bosses/boss_3.h"
+#include "game/sa2/bosses/boss_4.h"
+#include "game/sa2/bosses/boss_5.h"
+#include "game/sa2/bosses/boss_6.h"
+#include "game/sa2/bosses/boss_7.h"
+#include "game/sa2/bosses/boss_8.h"
+#include "game/sa2/bosses/boss_9.h"
 
 #include "constants/animations.h"
 #include "constants/zones.h"

src/game/sa2/bosses/final_intro.c

@@ -7,7 +7,7 @@
 
 #include "game/globals.h"
 
-#include "game/bosses/final_intro.h"
+#include "game/sa2/bosses/final_intro.h"
 
 #include "game/math.h"
 

src/game/stage/camera.c

@@ -2381,8 +2381,8 @@ void StageBgUpdate_ZoneFinalActXX(UNUSED s32 x, UNUSED s32 y)
 
 /************************************ BOSS EXTRA ************************************/
 
-#include "game/bosses/common.h"
-#include "game/bosses/boss_9.h"
+#include "game/sa2/bosses/common.h"
+#include "game/sa2/bosses/boss_9.h"
 
 void StageBgUpdate_ZoneFinalActTA53(UNUSED s32 a, UNUSED s32 b)
 {

src/game/stage/intro.c

@@ -6,7 +6,7 @@
 #include "game/stage/player.h"
 #include "game/cheese.h"
 #include "game/stage/screen_mask.h"
-#include "game/bosses/common.h"
+#include "game/sa2/bosses/common.h"
 #include "game/countdown.h"
 #include "game/boost_effect.h"
 #include "game/multiplayer/mp_player.h"

src/game/stage/player.c

@@ -7,7 +7,7 @@
 #include "game/amy_attack_heart_effect.h"
 #include "game/boost_effect.h"
 #include "game/boost_mode_particles.h" // incl. CreateBoostModeParticles
-#include "game/bosses/common.h"
+#include "game/sa2/bosses/common.h"
 #include "game/cheese.h"
 #include "game/heart_particles_effect.h"
 #include "game/multiplayer/mp_attack_2_effect.h"

src/game/stage/player_super_sonic.c

@@ -7,7 +7,7 @@
 #include "game/stage/camera.h"
 #include "game/stage/player.h"
 
-#include "game/bosses/boss_9.h"
+#include "game/sa2/bosses/boss_9.h"
 #include "game/game_over.h"
 #include "game/stage/player_super_sonic.h"
 #include "game/sa2/save.h"