sa1: reference water_effects from sa2

Author: freshollie

include/game/shared/stage/underwater_effects.h

@@ -4,7 +4,7 @@
 #include "core.h"
 #include "game/shared/stage/player.h"
 
-extern void sub_804C40C(void);
+extern void InitWaterPalettes(void);
 
 struct Task *SpawnDrowningCountdownNum(Player *p, s32 countdown);
 struct Task *SpawnAirBubbles(s32 p0, s32 p1, s32 p2, s32 p3);

sa1/Makefile

@@ -272,6 +272,7 @@ SA2_C_FILES := \
 	src/game/shared/stage/collision_1.c \
 	src/game/shared/stage/collision_2.c \
 	src/game/shared/stage/collision_3.c \
+	src/game/shared/stage/water_effects.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/stage/stage_ui__Task_8055458.inc

@@ -269,7 +269,7 @@ _08055622:
 	cmp r0, #1
 	bhi _08055672
 	bl LoadPalette423Anim
-	bl sub_804C40C
+	bl InitWaterPalettes
 _08055672:
 	ldr r0, [r4, #0x20]
 	bl TaskDestroy
@@ -332,7 +332,7 @@ _08055708:
 	lsrs r0, r0, #0x18
 	cmp r0, #1
 	bhi _0805571A
-	bl sub_804C40C
+	bl InitWaterPalettes
 _0805571A:
 	add sp, #4
 	pop {r3, r4, r5}

sa1/ldscript.txt

@@ -144,7 +144,7 @@ SECTIONS {
         sa2/src/game/sa1/stage/player_super_sonic.o(.text);
         sa2/src/game/shared/stage/item_tasks.o(.text);
         sa2/src/game/shared/stage/underwater_effects.o(.text);
-        src/game/shared/stage/water_effects.o(.text);
+        sa2/src/game/shared/stage/water_effects.o(.text);
         sa2/src/game/shared/stage/screen_shake.o(.text);
 
         /* NOTE: input_recorder was not part of the engine in this version */

sa1/scripts/disasm.cfg

@@ -898,7 +898,7 @@ thumb_func 0x0804c12c sub_804C12C
 thumb_func 0x0804c1c0 sub_804C1C0
 thumb_func 0x0804c2e8 sub_804C2E8
 thumb_func 0x0804c3cc sub_804C3CC
-thumb_func 0x0804c40c sub_804C40C
+thumb_func 0x0804c40c InitWaterPalettes
 thumb_func 0x0804c598 sub_804C598
 thumb_func 0x0804c5d8 sub_804C5D8
 thumb_func 0x0804c668 sub_804C668