sa1: remove final duplicate shared headers

Author: freshollie

.vscode/settings.json

@@ -239,7 +239,7 @@
     "kura_kura.h": "c",
     "star.h": "c",
     "demo_manager.h": "c",
-    "spot_light.h": "c",
+    "spot_lights_manager.h": "c",
     "entities_manager.h": "c",
     "rings_manager.h": "c",
     "game_over.h": "c",

include/game/shared/stage/mp_event_mgr.h

@@ -9,6 +9,7 @@
 #include "game/globals.h"
 
 // RoomEvent types
+#if (GAME == GAME_SA1)
 #define ROOMEVENT_TYPE_NONE                  0
 #define ROOMEVENT_TYPE_PLATFORM_CHANGE       1
 #define ROOMEVENT_TYPE_ITEMBOX_BREAK         2
@@ -18,7 +19,18 @@
 #define ROOMEVENT_TYPE_ITEMEFFECT_APPLIED    6
 #define ROOMEVENT_TYPE_REACHED_STAGE_GOAL    7
 #define ROOMEVENT_TYPE_8                     8
-#define ROOMEVENT_TYPE_UNKNOWN               8
+#define ROOMEVENT_TYPE_CHAO_COLLECTED        9
+#elif (GAME == GAME_SA2)
+#define ROOMEVENT_TYPE_NONE                  0
+#define ROOMEVENT_TYPE_PLATFORM_CHANGE       1
+#define ROOMEVENT_TYPE_ITEMBOX_BREAK         2
+#define ROOMEVENT_TYPE_ENEMY_DESTROYED       3
+#define ROOMEVENT_TYPE_PLAYER_RING_LOSS      4
+#define ROOMEVENT_TYPE_MYSTERY_ITEMBOX_BREAK 5
+#define ROOMEVENT_TYPE_ITEMEFFECT_APPLIED    6
+#define ROOMEVENT_TYPE_REACHED_STAGE_GOAL    7
+#define ROOMEVENT_TYPE_8                     8
+#endif
 
 // RoomEvent variable structs
 typedef struct {

include/game/shared/stage/spot_light.h …/game/shared/stage/spot_lights_manager.hinclude/game/shared/stage/spot_light.h renamed to include/game/shared/stage/spot_lights_manager.h include/game/shared/stage/spot_light.h renamed to include/game/shared/stage/spot_lights_manager.h

@@ -3,6 +3,6 @@
 
 #include "gba/types.h"
 
-bool32 CreateSpotLightBeams(void);
+bool32 CreateSpotlightsManager(void);
 
-#endif // GUARD_STAGE_SPOT_LIGHT_H
+#endif // GUARD_STAGE_SPOT_LIGHT_H

ldscript.txt

@@ -107,7 +107,7 @@ SECTIONS
         src/game/shared/stage/demo_manager.o(.text);
         src/game/shared/stage/unused_flash_task.o(.text);
         src/game/sa2/stage/simple_sprite_particle.o(.text);
-        src/game/shared/stage/spot_light.o(.text);
+        src/game/shared/stage/spot_lights_manager.o(.text);
         src/game/shared/stage/pause_menu.o(.text);
         src/game/shared/stage/collect_ring_effect.o(.text);
         src/game/sa2/stage/itembox.o(.text);