sa1: reference stage.c from sa2

Author: freshollie

include/game/shared/stage/player.h

@@ -293,6 +293,7 @@ typedef struct {
 } MaybeSuperSonic; /* size: 0x8C */
 #endif
 
+void CreatePlayer(u32 UNUSED characterId, u32 levelId, Player *player);
 s32 SA2_LABEL(sub_8022F58)(u8 param0, Player *p);
 
 extern Player gPlayer;

include/game/shared/stage/stage.h

@@ -10,8 +10,12 @@
 #include "constants/sa2/zones.h"
 #endif
 
+#if (GAME == GAME_SA1)
+void ApplyGameStageSettingsAndStart(void);
+#elif (GAME == GAME_SA2)
 void ApplyGameStageSettings(void);
 void GameStageStart(void);
+#endif
 void CreateGameStage(void);
 void GoToNextLevel(void);
 

sa1/Makefile

@@ -275,6 +275,7 @@ SA2_C_FILES := \
 	src/game/shared/stage/water_effects.c \
 	src/game/shared/stage/spot_light_beam_task.c \
 	src/game/shared/stage/camera.c \
+	src/game/shared/stage/stage.c \
 	src/game/sa1/ui/game_2_0.c \
 	src/game/sa1/ui/game_2_1.c \
 	src/game/sa1/ui/stage_results.c \

sa1/asm/non_matching/game/sa1/ui/time_attack_records__Task_806BBC0.inc

@@ -52,7 +52,7 @@
 	strh r6, [r0, #4]
 	ldr r0, [r5]
 	bl TaskDestroy
-	bl ApplyGameStageSettings
+	bl ApplyGameStageSettingsAndStart
 	b _0806BCF6
 	.align 2, 0
 _0806BC30: .4byte gCurTask

sa1/data/sa1/data_0_6_1.s

@@ -26,7 +26,7 @@ C_DECL(gUnknown_0868B6B8):
 
     .global C_DECL(gUnknown_0868B6C4)
 C_DECL(gUnknown_0868B6C4):
-    mPtr C_DECL(ApplyGameStageSettings)
+    mPtr C_DECL(ApplyGameStageSettingsAndStart)
     mPtr C_DECL(sub_806A66C)
     mPtr C_DECL(sub_806A680)
     mPtr C_DECL(sub_806A68C)

sa1/ldscript.txt

@@ -113,7 +113,7 @@ SECTIONS {
         sa2/src/game/game.o(.text);
         sa2/src/game/dummy_task.o(.text);
 
-        src/game/shared/stage/stage.o(.text);
+        sa2/src/game/shared/stage/stage.o(.text);
         sa2/src/game/shared/stage/camera.o(.text);
         sa2/src/game/shared/stage/terrain_collision.o(.text);
         sa2/src/game/shared/stage/mp_sprite_task.o(.text);
@@ -344,7 +344,7 @@ SECTIONS {
         sa2/src/game/shared/multiplayer/communication_outcome.o(.rodata);
         sa2/src/game/shared/stage/amy_attack_heart_effect.o(.rodata);
         sa2/src/game/shared/stage/music_manager.o(.rodata);
-        src/game/shared/stage/stage.o(.rodata);
+        sa2/src/game/shared/stage/stage.o(.rodata);
         sa2/src/game/shared/stage/camera.o(.rodata);
         src/data/sa1/tilemap_table.o(.rodata);
         sa2/src/game/shared/stage/terrain_collision.o(.rodata);