sa1: reference collision_3 from sa2

Author: freshollie

include/game/shared/stage/collision.h

@@ -58,7 +58,7 @@ EHit sub_800C2B8(Sprite *s, s16 sx, s16 sy, Player *p);
 bool32 sub_800C934(Sprite *s, s32 x, s32 y, Rect8 *rectPlayer, u32 UNUSED param4, Player *p, u32 *moveState);
 bool32 sub_800CBBC(Sprite *s, s32 x, s32 y, Rect8 *rectPlayer, u32 UNUSED param4, Player *p, u32 *param6);
 u32 sub_800CCB8(Sprite *, s32 x, s32 y, Player *);
-EHit Coll_Player_Boss(Sprite *s, CamCoord worldX, CamCoord worldY, Player *p);
+EHit Coll_Player_Enemy(Sprite *s, CamCoord worldX, CamCoord worldY, Player *p);
 EHit Coll_Player_Boss_1(Sprite *s, CamCoord worldX, CamCoord worldY, Player *p);
 EHit Coll_Player_Bosses_2_6(Sprite *s, CamCoord worldX, CamCoord worldY, Player *p);
 EHit sub_800BF10(Sprite *s, CamCoord worldX, CamCoord worldY, Player *p);

sa1/Makefile

@@ -271,6 +271,7 @@ SA2_C_FILES := \
 	src/game/shared/menus/unused_level_select.c \
 	src/game/shared/stage/collision_1.c \
 	src/game/shared/stage/collision_2.c \
+	src/game/shared/stage/collision_3.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

@@ -29,7 +29,7 @@ SECTIONS {
         src/game/shared/stage/rings_manager.o(.text);
         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);
+        sa2/src/game/shared/stage/collision_3.o(.text);
         sa2/src/game/shared/stage/collision_2.o(.text);
         sa2/src/game/shared/stage/palette_loader.o(.text);