sa1: finish migrating game/sa1 to root

include/game/shared/stage/spot_light_beam_task.h

@@ -10,7 +10,7 @@ typedef struct {
     s16 unk8;
     u8 bg;
     u8 unkB;
-} SpotlightBeamTask; /* size: 0xC */
+} SpotlightBeam; /* size: 0xC */
 
 struct Task *CreateSpotlightBeamTask(void);
 

include/game/shared/stage/water_effects.h

@@ -36,5 +36,6 @@ extern Water gWater;
 void InitWaterPalettes(void);
 void CreateRunOnWaterEffect(void);
 struct Task *CreateWaterfallSurfaceHitEffect(s32 x, s32 y);
+void LoadPalette423Anim(void);
 
 #endif // GUARD_WATER_EFFECT_H

sa1/Makefile

@@ -386,16 +386,11 @@ SA2_C_FILES := \
 	src/game/sa1/stage/backgrounds/zone_1.c \
 	src/game/sa1/stage/backgrounds/zone_7_act_2_init.c \
 	src/game/sa1/stage/backgrounds/zone_5.c \
-# 	src/game/sa1/stage/trapped_animals.c \
-# 	src/game/sa1/stage/stage_ui_z.c \
-# 	src/game/sa1/stage/stage_ui.c \
-# 	src/game/sa1/stage/mystery_itembox.c \
-
-
-
-# Nonmatching
-
-# Can't build
+	src/game/sa1/stage/trapped_animals.c \
+	src/game/sa1/stage/stage_ui_z.c \
+	src/game/sa1/stage/stage_ui.c \
+	src/game/sa1/stage/mystery_itembox.c \
+	src/game/sa1/ui/intro_animation.c \
 
 SA2_C_ASM_FILES := \
 	src/rom_header.s \

sa1/ldscript.txt

@@ -65,7 +65,7 @@ SECTIONS {
         src/game/shared/stage/pause_menu.o(.text);
         src/game/shared/collect_rings/results.o(.text);
         sa2/src/game/sa1/stage/mp_hud.o(.text);
-        src/game/sa1/stage/mystery_itembox.o(.text);
+        sa2/src/game/sa1/stage/mystery_itembox.o(.text);
         sa2/src/game/sa1/stage/mp_unk_0.o(.text);
         sa2/src/game/sa1/stage/mp_unk_1.o(.text);
         
@@ -163,9 +163,9 @@ SECTIONS {
         sa2/src/game/sa1/stage/enemies/boss_xtra_super_egg_robot.o(.text);
         
         sa2/src/game/sa1/stage/ui_rendering.o(.text);
-        src/game/sa1/stage/stage_ui.o(.text);
-        src/game/sa1/stage/trapped_animals.o(.text);
-        src/game/sa1/stage/stage_ui_z.o(.text);
+        sa2/src/game/sa1/stage/stage_ui.o(.text);
+        sa2/src/game/sa1/stage/trapped_animals.o(.text);
+        sa2/src/game/sa1/stage/stage_ui_z.o(.text);
 
         /* game/sa1/ui */
         sa2/src/game/sa1/ui/game_over.o(.text);
@@ -181,7 +181,7 @@ SECTIONS {
         sa2/src/game/sa1/ui/time_attack_record.o(.text);
         sa2/src/game/sa1/ui/course_select.o(.text);
         sa2/src/game/sa1/ui/game_2_3.o(.text);
-        src/game/sa1/ui/intro_animation.o(.text);
+        sa2/src/game/sa1/ui/intro_animation.o(.text);
         sa2/src/game/sa1/ui/extra_stage_results.o(.text);
         sa2/src/game/sa1/ui/special_stage_intro.o(.text);
         sa2/src/game/sa1/ui/collect_chaos_emeralds_msg.o(.text);
@@ -334,7 +334,7 @@ SECTIONS {
         sa2/src/game/sa1/stage/mp_results.o(.rodata);
         src/game/shared/stage/mp_finish.o(.rodata);
         sa2/src/game/sa1/stage/mp_hud.o(.rodata);
-        src/game/sa1/stage/mystery_itembox.o(.rodata);
+        sa2/src/game/sa1/stage/mystery_itembox.o(.rodata);
         sa2/src/game/sa1/stage/interactables/spring.o(.rodata);
         sa2/src/game/sa1/stage/interactables/platform_thin.o(.rodata);
         sa2/src/game/sa1/stage/interactables/platform_crumbling.o(.rodata);
@@ -370,7 +370,7 @@ SECTIONS {
         src/data/sa1/ui_graphics_data.o(.rodata);
         data/sa1/data_0_5.o(.rodata);
         src/data/sa1/ui_graphics_table.o(.rodata);
-        src/game/sa1/stage/trapped_animals.o(.rodata);
+        sa2/src/game/sa1/stage/trapped_animals.o(.rodata);
         data/sa1/data_0_5_2.o(.rodata);
         sa2/src/game/sa1/ui/character_select.o(.rodata);
         sa2/src/game/sa1/ui/game_2_0.o(.rodata);
@@ -382,7 +382,7 @@ SECTIONS {
         data/sa1/data_0_6.o(.rodata);
         sa2/src/game/sa1/ui/course_select.o(.rodata);
         sa2/src/game/sa1/ui/game_2_3.o(.rodata);
-        src/game/sa1/ui/intro_animation.o(.rodata);
+        sa2/src/game/sa1/ui/intro_animation.o(.rodata);
         data/sa1/data_0_6_0.o(.rodata);
         sa2/src/game/sa1/ui/time_attack_results.o(.rodata);
         data/sa1/data_0_6_1.o(.rodata);

src/game/shared/stage/spot_light.c

@@ -26,7 +26,7 @@ bool32 CreateSpotLightBeams(void)
 {
     struct Task *t = TaskCreate(Task_SpotLightMain, sizeof(StageSpotLight), 0x2000, 0, TaskDestructor_SpotLightMain);
     StageSpotLight *spotLight = TASK_DATA(t);
-    SpotlightBeamTask *beam;
+    SpotlightBeam *beam;
 
     spotLight->unk8 = 0x600;
     spotLight->unkC = 0;
@@ -59,7 +59,7 @@ bool32 CreateSpotLightBeams(void)
 void Task_SpotLightMain(void)
 {
     StageSpotLight *spotLight = TASK_DATA(gCurTask);
-    SpotlightBeamTask *beam;
+    SpotlightBeam *beam;
     s32 unkC;
 
     if (!(gStageFlags & STAGE_FLAG__100)) {
@@ -120,7 +120,7 @@ void Task_800A8E0(void)
 {
     bool32 boolR5 = FALSE;
     StageSpotLight *spotLight = TASK_DATA(gCurTask);
-    SpotlightBeamTask *beam;
+    SpotlightBeam *beam;
     s32 unkC;
 
     beam = TASK_DATA(spotLight->t0);

src/game/shared/stage/spot_light_beam_task.c

@@ -15,8 +15,8 @@ void TaskDestructor_SpotlightBeamTask(struct Task *);
 
 struct Task *CreateSpotlightBeamTask(void)
 {
-    struct Task *t = TaskCreate(Task_SpotlightBeamTask, sizeof(SpotlightBeamTask), 0x2000, 0, TaskDestructor_SpotlightBeamTask);
-    SpotlightBeamTask *beam = TASK_DATA(t);
+    struct Task *t = TaskCreate(Task_SpotlightBeamTask, sizeof(SpotlightBeam), 0x2000, 0, TaskDestructor_SpotlightBeamTask);
+    SpotlightBeam *beam = TASK_DATA(t);
 
     beam->unk6 = 120;
     beam->unk8 = 200;
@@ -65,7 +65,7 @@ NONMATCH("asm/non_matching/game/shared/stage/Task_SpotlightBeamTask.inc", void T
     u32 temp_r5;
     u32 temp_r5_2;
 
-    SpotlightBeamTask *beam = TASK_DATA(gCurTask);
+    SpotlightBeam *beam = TASK_DATA(gCurTask);
 
     if (beam->unkB == 0) {
         return;