sa1: matchh sub_80232D0, more player alignment

Author: freshollie

include/game/sa1/stage/spawn_positions.h

@@ -8,7 +8,11 @@ extern const s16 gSpawnPositions[NUM_LEVEL_IDS_SP][2];
 extern const s16 gSpawnPositions_Modes_4_and_5[NUM_LEVEL_IDS_MP][MULTI_SIO_PLAYERS_MAX][2];
 extern const Vec2_32 gCheckpointPositions[];
 
-extern const Vec2_32 SA2_LABEL(gUnknown_080D650C)[];
-extern const Vec2_32 SA2_LABEL(gUnknown_080D661C)[];
-
+#if (GAME == GAME_SA1)
+extern s16 SA2_LABEL(gUnknown_080D650C)[][2];
+extern s16 SA2_LABEL(gUnknown_080D661C)[][2];
+#elif (GAME == GAME_SA2)
+extern const s32 SA2_LABEL(gUnknown_080D650C)[][2];
+extern const s32 SA2_LABEL(gUnknown_080D661C)[][2];
+#endif
 #endif

include/game/sa2/stage/spawn_positions.h

@@ -6,7 +6,7 @@
 extern const s16 gSpawnPositions[][2];
 extern const Vec2_32 gCheckpointPositions[];
 
-extern const Vec2_32 gUnknown_080D650C[];
-extern const Vec2_32 gUnknown_080D661C[];
+extern const s32 gUnknown_080D650C[][2];
+extern const s32 gUnknown_080D661C[][2];
 
 #endif

sa1/asm/non_matching/game/sa1/stage/Player__Player_8043EC0.inc

@@ -11,12 +11,12 @@ C_DECL(gSpawnPositions):
 C_DECL(gSpawnPositions_Modes_4_and_5):
     .incbin "baserom_sa1.gba", 0x004ADF38, 0x40
 
-    .global C_DECL(gUnknown_084ADF78)
-C_DECL(gUnknown_084ADF78):
+    .global C_DECL(sa2__gUnknown_080D650C)
+C_DECL(sa2__gUnknown_080D650C):
     .incbin "baserom_sa1.gba", 0x004ADF78, 0x48
 
-    .global C_DECL(gUnknown_084ADFC0)
-C_DECL(gUnknown_084ADFC0):
+    .global C_DECL(sa2__gUnknown_080D661C)
+C_DECL(sa2__gUnknown_080D661C):
     .incbin "baserom_sa1.gba", 0x004ADFC0, 0x48
 
     .global C_DECL(gPlayerCharacterIdleAnims)