move special stage into game specific folders

.vscode/settings.json

@@ -124,14 +124,14 @@
     "game/multiboot/collect_rings/results.h": "c",
     "mb_programs.h": "c",
     "sio32_multi_load.h": "c",
-    "game/special_stage/main.h": "c",
-    "game/special_stage/utils.h": "c",
-    "game/special_stage/collectables.h": "c",
-    "game/special_stage/player.h": "c",
-    "game/special_stage/physics.h": "c",
-    "game/special_stage/guard_robo.h": "c",
-    "game/special_stage/data.h": "c",
-    "game/special_stage/tables.h": "c",
+    "game/sa2/special_stage/main.h": "c",
+    "game/sa2/special_stage/utils.h": "c",
+    "game/sa2/special_stage/collectables.h": "c",
+    "game/sa2/special_stage/player.h": "c",
+    "game/sa2/special_stage/physics.h": "c",
+    "game/sa2/special_stage/guard_robo.h": "c",
+    "game/sa2/special_stage/data.h": "c",
+    "game/sa2/special_stage/tables.h": "c",
     "isagbprint.h": "c",
     "types.h": "c",
     "animations.h": "c",

include/game/sa2/special_stage/collectables.h

@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "task.h"
-#include "game/special_stage/main.h"
+#include "game/sa2/special_stage/main.h"
 
 #define MAX_RING_PARTICLES 8
 #define MAX_OBJECTS        323

include/game/sa2/special_stage/guard_robo.h

@@ -4,8 +4,8 @@
 
 #include "global.h"
 #include "task.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/data.h"
 
 struct SpecialStageGuardRobo {
     struct SpecialStage *stage;

include/game/sa2/special_stage/physics.h

@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_PHYSICS_H
 
 #include "global.h"
-#include "game/special_stage/main.h"
+#include "game/sa2/special_stage/main.h"
 
 struct SpecialStagePhysics {
     struct SpecialStage *stage;

include/game/sa2/special_stage/player.h

@@ -2,8 +2,8 @@
 #define GUARD_SPECIAL_STAGE_PLAYER_H
 
 #include "global.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/data.h"
 
 // Player
 struct SpecialStagePlayer {

include/game/sa2/special_stage/ui.h

@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "sprite.h"
-#include "game/special_stage/main.h"
+#include "game/sa2/special_stage/main.h"
 
 struct SpecialStageUI {
     struct SpecialStage *stage;

include/game/sa2/special_stage/utils.h

@@ -2,8 +2,8 @@
 #define GUARD_SPECIAL_STAGE_UTILS_H
 
 #include "global.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/data.h"
 #include "sprite.h"
 
 extern void *gSpecialStageSubMenuVramPointer;

include/game/sa2/special_stage/world.h

@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_WORLD_H
 
 #include "global.h"
-#include "game/special_stage/main.h"
+#include "game/sa2/special_stage/main.h"
 
 struct SpecialStageWorld {
     struct SpecialStage *stage;

ldscript.txt

@@ -62,7 +62,7 @@ SECTIONS
         src/game/stage/debug_text_printer.o(.data);
         src/game/bosses/common.o(.data);
         src/game/options_screen.o(.data);
-        src/game/special_stage/utils.o(.data);
+        src/game/sa2/special_stage/utils.o(.data);
         src/game/sa2/save.o(.data);
         src/game/multiboot/collect_rings/time_display.o(.data);
         src/game/math.o(.data);
@@ -237,14 +237,14 @@ SECTIONS
 
         src/game/options_screen.o(.text);
 
-        src/game/special_stage/main.o(.text);
-        src/game/special_stage/utils.o(.text);
-        src/game/special_stage/player.o(.text);
-        src/game/special_stage/collectables.o(.text);
-        src/game/special_stage/world.o(.text);
-        src/game/special_stage/physics.o(.text);
-        src/game/special_stage/ui.o(.text);
-        src/game/special_stage/guard_robo.o(.text);
+        src/game/sa2/special_stage/main.o(.text);
+        src/game/sa2/special_stage/utils.o(.text);
+        src/game/sa2/special_stage/player.o(.text);
+        src/game/sa2/special_stage/collectables.o(.text);
+        src/game/sa2/special_stage/world.o(.text);
+        src/game/sa2/special_stage/physics.o(.text);
+        src/game/sa2/special_stage/ui.o(.text);
+        src/game/sa2/special_stage/guard_robo.o(.text);
 
         src/game/sa2/save.o(.text);
 
@@ -450,14 +450,14 @@ SECTIONS
         src/game/interactables_1/checkpoint.o(.rodata);
         src/game/interactables_1/windmill.o(.rodata);
         src/game/options_screen.o(.rodata);
-        src/game/special_stage/data.o(.rodata);
-        src/game/special_stage/player.o(.rodata);
-        src/game/special_stage/collectables.o(.rodata);
-        src/game/special_stage/world.o(.rodata);
-        src/game/special_stage/physics.o(.rodata);
-        src/game/special_stage/ui.o(.rodata);
-        src/game/special_stage/guard_robo.o(.rodata);
-        src/game/special_stage/tables.o(.rodata);
+        src/game/sa2/special_stage/data.o(.rodata);
+        src/game/sa2/special_stage/player.o(.rodata);
+        src/game/sa2/special_stage/collectables.o(.rodata);
+        src/game/sa2/special_stage/world.o(.rodata);
+        src/game/sa2/special_stage/physics.o(.rodata);
+        src/game/sa2/special_stage/ui.o(.rodata);
+        src/game/sa2/special_stage/guard_robo.o(.rodata);
+        src/game/sa2/special_stage/tables.o(.rodata);
         src/game/interactables_2/hot_crater/dash_ring.o(.rodata);
         src/game/interactables_2/music_plant/note_sphere.o(.rodata);
         src/game/interactables_2/music_plant/note_block.o(.rodata);

sa1/ldscript.txt

@@ -77,12 +77,12 @@ SECTIONS {
         src/game/sa1_sa2_shared/magnetic_ring.o(.text);
         src/game/interactables/platform_crumbling.o(.text);
         src/game/interactables/fadein_to_be_continued.o(.text);
-        src/game/special_stage/temporary_sound_play_task.o(.text);
+        src/game/sa1/special_stage/temporary_sound_play_task.o(.text);
         src/game/enemies/boss_1_egg_hammer_tank.o(.text);
         src/game/interactables/breakable_wall.o(.text);
         src/game/mp_chao.o(.text);
         src/game/egg_rocket_transitions.o(.text);
-        src/game/special_stage/main.o(.text);
+        src/game/sa1/special_stage/main.o(.text);
         src/game/enemies/boss_2_egg_press.o(.text);
         src/game/enemies/boss_3_egg_ball.o(.text);
         src/game/enemies/boss_4_egg_spider.o(.text);
@@ -150,7 +150,7 @@ SECTIONS {
         src/game/player_name_input_menu.o(.text);
         src/game/character_select.o(.text);
         src/game/time_over.o(.text);
-        src/game/special_stage/game_2_0.o(.text);
+        src/game/sa1/special_stage/game_2_0.o(.text);
         src/game/game_2_1.o(.text);
         src/game/staff_credits.o(.text);
         src/game/sound_test.o(.text);
@@ -160,7 +160,7 @@ SECTIONS {
         src/game/game_2_3.o(.text);
         src/game/intro_animation.o(.text);
         src/game/extra_stage_results.o(.text);
-        src/game/special_stage/intro.o(.text);
+        src/game/sa1/special_stage/intro.o(.text);
         src/game/collect_chaos_emeralds_msg.o(.text);
         src/game/time_attack/results.o(.text);
         src/game/time_attack/lobby.o(.text);
@@ -325,7 +325,7 @@ SECTIONS {
         src/data/oam_data.o(.rodata);
         src/data/obj_palettes.o(.rodata);
         data/obj_gfx.o(.rodata);
-        src/game/special_stage/main.o(.rodata);
+        src/game/sa1/special_stage/main.o(.rodata);
         data/data_0_2.o(.rodata);
         src/data/tilemaps_special_stage.o(.rodata);
         src/data/tilemaps_special_stage.o(.data);
@@ -350,7 +350,7 @@ SECTIONS {
         src/game/stage/trapped_animals.o(.rodata);
         data/data_0_5_2.o(.rodata);
         src/game/character_select.o(.rodata);
-        src/game/special_stage/game_2_0.o(.rodata);
+        src/game/sa1/special_stage/game_2_0.o(.rodata);
         src/game/game_2_1.o(.rodata);
         src/game/staff_credits.o(.rodata);
         src/data/credits.o(.rodata);

sa1/src/game/game_2_1.c

@@ -7,7 +7,7 @@
 #include "game/entity.h"
 #include "game/globals.h"
 #include "game/sa1/save.h"
-#include "game/special_stage/main.h"
+#include "game/sa1/special_stage/main.h"
 #include "game/stage/stage.h"
 
 #include "constants/ui_graphics.h"

sa1/src/game/interactables/special_spring.c

@@ -6,7 +6,7 @@
 #include "game/entity.h"
 #include "game/sa1_sa2_shared/collision.h"
 #include "game/stage/player.h"
-#include "game/special_stage/main.h"
+#include "game/sa1/special_stage/main.h"
 
 #include "constants/animations.h"
 #include "constants/char_states.h"

sa1/src/game/sa1/special_stage/game_2_0.c

@@ -6,7 +6,7 @@
 #include "game/game_over.h"
 #include "game/title_screen.h"
 #include "game/sa1/save.h"
-#include "game/special_stage/main.h"
+#include "game/sa1/special_stage/main.h"
 #include "game/stage/player_controls.h"
 #include "game/stage/stage.h"
 #include "game/stage/ui.h"

sa1/src/game/sa1/special_stage/intro.c

@@ -4,7 +4,7 @@
 #include "game/game_over.h"
 #include "game/gTask_03006240.h"
 #include "game/globals.h"
-#include "game/special_stage/main.h"
+#include "game/sa1/special_stage/main.h"
 #include "game/stage/ui.h"
 
 #include "constants/animations.h"

sa1/src/game/sa1/special_stage/main.c

@@ -9,7 +9,7 @@
 #include "game/sa1_sa2_shared/pause_menu.h"
 #include "game/sa1_sa2_shared/player.h"
 #include "game/sa1/save.h"
-#include "game/special_stage/main.h"
+#include "game/sa1/special_stage/main.h"
 #include "game/stage/player_controls.h"
 #include "game/stage/terrain_collision.h"
 
@@ -956,7 +956,7 @@ void sub_802A248(Strc_3005690 *param0)
 }
 
 // (90.14%) https://decomp.me/scratch/ZDa67
-NONMATCH("asm/non_matching/game/special_stage/sub_802A4C4.inc", void sub_802A4C4(Strc_3005690 *param0))
+NONMATCH("asm/non_matching/game/sa1/special_stage/sub_802A4C4.inc", void sub_802A4C4(Strc_3005690 *param0))
 {
     Sprite *s = &gUnknown_030055F0.s;
     SpriteTransform *tf = &gUnknown_030055F0.tf;
@@ -1476,7 +1476,7 @@ void sub_802B008(void)
 }
 
 // (98.11%) https://decomp.me/scratch/jrZYE
-NONMATCH("asm/non_matching/game/special_stage/sub_802B07C.inc", void sub_802B07C(void))
+NONMATCH("asm/non_matching/game/sa1/special_stage/sub_802B07C.inc", void sub_802B07C(void))
 {
     Strc_3005690 *strc5690 = &gUnknown_03005690;
     Sprite *s = &gUnknown_030055F0.s;
@@ -1670,7 +1670,7 @@ void sub_802B5DC(Sprite *s)
 }
 
 // (97.41%) https://decomp.me/scratch/veYrR
-NONMATCH("asm/non_matching/game/special_stage/sub_802B66C.inc", u32 sub_802B66C(SpStage74 *strc74, Sprite *s, s16 param2, s16 param3))
+NONMATCH("asm/non_matching/game/sa1/special_stage/sub_802B66C.inc", u32 sub_802B66C(SpStage74 *strc74, Sprite *s, s16 param2, s16 param3))
 {
     Sprite *spr55F0 = &gUnknown_030055F0.s;
     Strc_3005690 *strc5690;
@@ -1838,7 +1838,7 @@ void sub_802BBF0()
     strc74->unk44 += strc74->unk56;
 }
 
-NONMATCH("asm/non_matching/game/special_stage/sub_802BC6C.inc", bool32 sub_802BC6C(void))
+NONMATCH("asm/non_matching/game/sa1/special_stage/sub_802BC6C.inc", bool32 sub_802BC6C(void))
 {
     s32 var_r0;
     s32 var_r4;
@@ -1905,7 +1905,7 @@ NONMATCH("asm/non_matching/game/special_stage/sub_802BC6C.inc", bool32 sub_802BC
 END_NONMATCH
 
 // (73.95%) https://decomp.me/scratch/2UCbe
-NONMATCH("asm/non_matching/game/special_stage/sub_802BE0C.inc", void sub_802BE0C(Sprite *s, SpriteTransform *tf))
+NONMATCH("asm/non_matching/game/sa1/special_stage/sub_802BE0C.inc", void sub_802BE0C(Sprite *s, SpriteTransform *tf))
 {
     u16 sp00[8];
     const SpriteOffset *dims;
@@ -2329,7 +2329,7 @@ void sub_802C934(void)
 // This function loads all objects' positions, scales and renders them
 // and the player character, and checks the collision between them.
 // NOTE(Jace): I think the loops in this should have the same layout as sub_802D58C().
-NONMATCH("asm/non_matching/game/special_stage/UpdateObjectsAndRender.inc", void UpdateObjectsAndRender(void))
+NONMATCH("asm/non_matching/game/sa1/special_stage/UpdateObjectsAndRender.inc", void UpdateObjectsAndRender(void))
 {
     u16 sp4;
     SpStageC *sp8;

sa1/src/game/sa1/special_stage/temporary_sound_play_task.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "task.h"
 #include "lib/m4a/m4a.h"
-#include "game/special_stage/main.h"
+#include "game/sa1/special_stage/main.h"
 #include "game/sa1_sa2_shared/player.h"
 
 #include "constants/songs.h"

sa1/src/game/sa1_sa2_shared/unused_level_select.c

@@ -20,7 +20,7 @@
 #endif
 
 #if (GAME == GAME_SA1) || PORTABLE
-#include "game/special_stage/main.h"
+#include "game/sa1/special_stage/main.h"
 #endif
 
 #include "animation_commands_bg.h"

sa1/src/game/stage/ui.c

@@ -5,7 +5,7 @@
 #include "data/ui_graphics.h"
 #include "game/sa1_sa2_shared/player.h"
 #include "game/globals.h"
-#include "game/special_stage/main.h"
+#include "game/sa1/special_stage/main.h"
 #include "game/gTask_03006240.h"
 #include "game/multiplayer/mp_player.h"
 #include "game/sa1/save.h"

sa1/sym_iwram.txt

@@ -23,7 +23,7 @@ sa2/src/sio32_multi_load.o(COMMON);
 sa2/src/game/globals.o(.data);
 
 . = 0x00005154; 
-src/game/special_stage/main.o(.data);
+src/game/sa1/special_stage/main.o(.data);
 
 . = 0x00005160; gLoadedSaveGame = .;
 
@@ -36,7 +36,7 @@ src/game/special_stage/main.o(.data);
 . = 0x000056F0; gUnknown_030056F0 = .;
 
 . = 0x00005730;
-src/game/special_stage/temporary_sound_play_task.o(.data);
+src/game/sa1/special_stage/temporary_sound_play_task.o(.data);
 
 . = 0x00005740; gUnknown_03005740 = .;
 . = 0x00005780; gUnknown_03005780 = .;

src/game/sa1_sa2_shared/unused_level_select.c

@@ -15,7 +15,7 @@
 #endif
 
 #if PORTABLE
-#include "game/special_stage/main.h"
+#include "game/sa2/special_stage/main.h"
 #endif
 
 #include "animation_commands_bg.h"

src/game/sa2/special_stage/collectables.c

@@ -1,9 +1,9 @@
 #include "core.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/player.h"
-#include "game/special_stage/utils.h"
-#include "game/special_stage/collectables.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/player.h"
+#include "game/sa2/special_stage/utils.h"
+#include "game/sa2/special_stage/collectables.h"
+#include "game/sa2/special_stage/data.h"
 #include "task.h"
 #include "lib/m4a/m4a.h"
 #include "trig.h"

src/game/sa2/special_stage/data.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/data.h"
 
 /**
  * These arrays are likely generated from some compilation

src/game/sa2/special_stage/guard_robo.c

@@ -1,13 +1,13 @@
 #include "core.h"
 #include "sprite.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/player.h"
-#include "game/special_stage/utils.h"
-#include "game/special_stage/guard_robo.h"
-#include "game/special_stage/physics.h"
-#include "game/special_stage/collectables.h"
-#include "game/special_stage/tables.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/player.h"
+#include "game/sa2/special_stage/utils.h"
+#include "game/sa2/special_stage/guard_robo.h"
+#include "game/sa2/special_stage/physics.h"
+#include "game/sa2/special_stage/collectables.h"
+#include "game/sa2/special_stage/tables.h"
+#include "game/sa2/special_stage/data.h"
 #include "trig.h"
 #include "lib/m4a/m4a.h"
 #include "constants/songs.h"

src/game/sa2/special_stage/main.c

@@ -1,13 +1,13 @@
 #include "core.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/utils.h"
-#include "game/special_stage/player.h"
-#include "game/special_stage/ui.h"
-#include "game/special_stage/world.h"
-#include "game/special_stage/collectables.h"
-#include "game/special_stage/guard_robo.h"
-#include "game/special_stage/physics.h"
-#include "game/special_stage/tables.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/utils.h"
+#include "game/sa2/special_stage/player.h"
+#include "game/sa2/special_stage/ui.h"
+#include "game/sa2/special_stage/world.h"
+#include "game/sa2/special_stage/collectables.h"
+#include "game/sa2/special_stage/guard_robo.h"
+#include "game/sa2/special_stage/physics.h"
+#include "game/sa2/special_stage/tables.h"
 #include "game/stage/stage.h"
 #include "game/sa2/save.h"
 #include "sprite.h"

src/game/sa2/special_stage/physics.c

@@ -1,10 +1,10 @@
 #include "core.h"
 #include "game/stage/player_controls.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/player.h"
-#include "game/special_stage/physics.h"
-#include "game/special_stage/guard_robo.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/player.h"
+#include "game/sa2/special_stage/physics.h"
+#include "game/sa2/special_stage/guard_robo.h"
+#include "game/sa2/special_stage/data.h"
 #include "task.h"
 #include "trig.h"
 #include "lib/m4a/m4a.h"

src/game/sa2/special_stage/player.c

@@ -1,9 +1,9 @@
 #include "core.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/player.h"
-#include "game/special_stage/utils.h"
-#include "game/special_stage/tables.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/player.h"
+#include "game/sa2/special_stage/utils.h"
+#include "game/sa2/special_stage/tables.h"
+#include "game/sa2/special_stage/data.h"
 
 #include "constants/animations.h"
 #include "constants/characters.h"

src/game/sa2/special_stage/tables.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "game/special_stage/tables.h"
+#include "game/sa2/special_stage/tables.h"
 #include "constants/zones.h"
 
 // bearing, acceleration, rotateSpeed, maxSpeed

src/game/sa2/special_stage/ui.c

@@ -1,11 +1,11 @@
 #include "core.h"
 #include "lib/m4a/m4a.h"
 #include "game/sa2/save.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/player.h"
-#include "game/special_stage/ui.h"
-#include "game/special_stage/utils.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/player.h"
+#include "game/sa2/special_stage/ui.h"
+#include "game/sa2/special_stage/utils.h"
+#include "game/sa2/special_stage/data.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"

src/game/sa2/special_stage/utils.c

@@ -1,8 +1,8 @@
 #include "core.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/world.h"
-#include "game/special_stage/utils.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/world.h"
+#include "game/sa2/special_stage/utils.h"
+#include "game/sa2/special_stage/data.h"
 #include "sprite.h"
 #include "data/sprite_data.h"
 #include "trig.h"

src/game/sa2/special_stage/world.c

@@ -1,10 +1,10 @@
 #include "core.h"
-#include "game/special_stage/main.h"
-#include "game/special_stage/player.h"
-#include "game/special_stage/utils.h"
-#include "game/special_stage/world.h"
-#include "game/special_stage/guard_robo.h"
-#include "game/special_stage/data.h"
+#include "game/sa2/special_stage/main.h"
+#include "game/sa2/special_stage/player.h"
+#include "game/sa2/special_stage/utils.h"
+#include "game/sa2/special_stage/world.h"
+#include "game/sa2/special_stage/guard_robo.h"
+#include "game/sa2/special_stage/data.h"
 #include "task.h"
 #include "lib/m4a/m4a.h"
 #include "game/sa2/save.h"

src/game/stage/results.c

@@ -11,7 +11,7 @@
 #include "game/cutscenes/level_endings.h"
 #include "game/sa2/save.h"
 #include "game/stage/screen_fade.h"
-#include "game/special_stage/main.h"
+#include "game/sa2/special_stage/main.h"
 #include "game/stage/results.h"
 #include "game/stage/ui.h"