Skip to content

Commit e3a066a

Browse files
committed
sa1: reference collsion_1 from sa2
1 parent 5b521c3 commit e3a066a

4 files changed

Lines changed: 546 additions & 653 deletions

File tree

sa1/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ SA2_C_FILES := \
269269
src/game/shared/stage/player.c \
270270
src/game/shared/collect_rings/results.c \
271271
src/game/shared/menus/unused_level_select.c \
272+
src/game/shared/stage/collision_1.c \
272273
src/game/sa1/ui/game_2_0.c \
273274
src/game/sa1/ui/game_2_1.c \
274275
src/game/sa1/ui/stage_results.c \

sa1/ldscript.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SECTIONS {
2828
/* Game */
2929
src/game/shared/stage/rings_manager.o(.text);
3030
src/game/shared/stage/entities_manager.o(.text);
31-
src/game/shared/stage/collision_1.o(.text);
31+
sa2/src/game/shared/stage/collision_1.o(.text);
3232
src/game/shared/stage/collision_3.o(.text);
3333
src/game/shared/stage/collision_2.o(.text);
3434
sa2/src/game/shared/stage/palette_loader.o(.text);

0 commit comments

Comments
 (0)