Skip to content

Commit 7dc67a8

Browse files
committed
sa1: merge spot_lights_manager into sa2
1 parent 6a19173 commit 7dc67a8

4 files changed

Lines changed: 186 additions & 216 deletions

File tree

sa1/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ SA2_C_FILES := \
262262
src/game/shared/stage/underwater_effects.c \
263263
src/game/shared/stage/grind_effect_1.c \
264264
src/game/shared/stage/mp_event_recv_mgr.c \
265+
src/game/shared/stage/spot_lights_manager.c \
265266
src/game/sa1/ui/game_2_0.c \
266267
src/game/sa1/ui/game_2_1.c \
267268
src/game/sa1/ui/stage_results.c \

sa1/ldscript.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ SECTIONS {
5454
sa2/src/game/sa1/stage/enemies/bosses_egg_mobile.o(.text);
5555
sa2/src/game/sa1/stage/enemies/bosses_misc.o(.text);
5656
sa2/src/game/sa1/stage/nuts_and_bolts_task.o(.text);
57-
src/game/shared/stage/spot_lights_manager.o(.text);
57+
sa2/src/game/shared/stage/spot_lights_manager.o(.text);
5858

5959
src/game/shared/stage/mp_event_mgr.o(.text);
6060
sa2/src/game/shared/stage/mp_event_recv_mgr.o(.text);

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

Lines changed: 0 additions & 124 deletions
This file was deleted.

0 commit comments

Comments
 (0)