sa1: reference collison_2 from sa2

Author: freshollie

include/game/shared/stage/collision.h

@@ -78,7 +78,6 @@ u32 Coll_Player_Platform(Sprite *, CamCoord x, CamCoord y, Player *);
 bool32 Coll_AmyHammer_Spring(Sprite *s, CamCoord worldX, CamCoord worldY, Player *p);
 #endif
 
-u32 sub_800CE94(Sprite *s, s32 sx, s32 sy, Rect8 *param3, Player *p);
 bool32 SA2_LABEL(sub_800DD54)(Player *p);
 bool32 SA2_LABEL(sub_800DE44)(Player *p);
 u32 SA2_LABEL(sub_800D0A0)(Sprite *s, s16 worldX, s16 worldY, s16 qSpeedX, s16 qSpeedY, u8 layer, u32 arg6);

sa1/Makefile

@@ -270,6 +270,7 @@ SA2_C_FILES := \
 	src/game/shared/collect_rings/results.c \
 	src/game/shared/menus/unused_level_select.c \
 	src/game/shared/stage/collision_1.c \
+	src/game/shared/stage/collision_2.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/ldscript.txt

@@ -30,7 +30,7 @@ SECTIONS {
         src/game/shared/stage/entities_manager.o(.text);
         sa2/src/game/shared/stage/collision_1.o(.text);
         src/game/shared/stage/collision_3.o(.text);
-        src/game/shared/stage/collision_2.o(.text);
+        sa2/src/game/shared/stage/collision_2.o(.text);
         sa2/src/game/shared/stage/palette_loader.o(.text);
 
         /* Menus */

sa1/src/game/shared/stage/collision_2.c

@@ -15,6 +15,10 @@
 #include "constants/sa2/char_states.h"
 #endif
 
+#if (GAME == GAME_SA2)
+static u32 sub_800CE94(Sprite *s, s32 sx, s32 sy, Rect8 *inRect, Player *p);
+#endif
+
 // COLLISION 1
 
 u32 Coll_Player_Platform(Sprite *s, CamCoord x, CamCoord y, Player *p)
@@ -125,7 +129,7 @@ u32 Coll_Player_Interactable(Sprite *s, s32 sx, s32 sy, Player *p)
 
 // Looks like each byte in the result is one value
 // TODO: Remove gotos
-u32 sub_800CE94(Sprite *s, s32 sx, s32 sy, Rect8 *inRect, Player *p)
+static u32 sub_800CE94(Sprite *s, s32 sx, s32 sy, Rect8 *inRect, Player *p)
 {
     s32 px = I(p->qWorldX);
     s32 py = I(p->qWorldY);