sa1: reference rings manager from sa2

Author: freshollie

include/constants/sa1/animations.h

@@ -21,8 +21,9 @@
 #define SA1_CHAR_ANIM_WALK             4
 #define SA1_CHAR_ANIM_RUN              5
 #define SA1_CHAR_ANIM_SPIN_ATTACK      8
+#define SA1_CHAR_ANIM_HIT              19
 #define SA1_CHAR_ANIM_20               20
-#define SA1_CHAR_ANIM_21               21
+#define SA1_CHAR_ANIM_DEAD             21
 #define SA1_CHAR_ANIM_22               22
 #define SA1_CHAR_ANIM_23               23
 #define SA1_CHAR_ANIM_24               24

include/constants/sa2/animations.h

@@ -21,8 +21,9 @@
 #define SA1_CHAR_ANIM_WALK             4
 #define SA1_CHAR_ANIM_RUN              5
 #define SA1_CHAR_ANIM_SPIN_ATTACK      8
+#define SA1_CHAR_ANIM_HIT              19
 #define SA1_CHAR_ANIM_20               20
-#define SA1_CHAR_ANIM_21               21
+#define SA1_CHAR_ANIM_DEAD             21
 #define SA1_CHAR_ANIM_22               22
 #define SA1_CHAR_ANIM_23               23
 #define SA1_CHAR_ANIM_24               24

sa1/Makefile

@@ -276,6 +276,7 @@ SA2_C_FILES := \
 	src/game/shared/stage/spot_light_beam_task.c \
 	src/game/shared/stage/camera.c \
 	src/game/shared/stage/stage.c \
+	src/game/shared/stage/rings_manager.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

@@ -26,7 +26,7 @@ SECTIONS {
         sa2/src/sio32_multi_load.o(.text);
 
         /* Game */
-        src/game/shared/stage/rings_manager.o(.text);
+        sa2/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);
         sa2/src/game/shared/stage/collision_3.o(.text);