Skip to content

Commit 10e1059

Browse files
committed
sa2: split collision based on sa1
1 parent fa32a02 commit 10e1059

7 files changed

Lines changed: 457 additions & 944 deletions

File tree

ldscript.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ SECTIONS
114114
src/game/shared/stage/dust_cloud.o(.text);
115115
src/game/shared/stage/magnetic_ring.o(.text);
116116
src/game/shared/stage/music_manager.o(.text);
117-
src/game/shared/stage/collision.o(.text);
117+
src/game/shared/stage/collision_3.o(.text);
118+
src/game/shared/stage/collision_1.o(.text);
119+
src/game/shared/stage/collision_2.o(.text);
118120
src/game/sa2/stage/input_buffer.o(.text);
119121

120122
src/game/sa2/stage/interactables/spring.o(.text);

multi_boot/roms/collect_rings/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ SA2_C_FILES := \
121121
sa2/game/shared/stage/mp_event_recv_mgr.c \
122122
sa2/game/shared/collect_rings/results.c \
123123
sa2/game/shared/stage/entities_manager.c \
124-
sa2/game/shared/stage/collision.c \
124+
sa2/game/shared/stage/collision_1.c \
125+
sa2/game/shared/stage/collision_2.c \
126+
sa2/game/shared/stage/collision_3.c \
125127
sa2/game/sa2/stage/mystery_itembox.c \
126128
sa2/game/shared/stage/rings_manager.c \
127129
sa2/game/sa2/collect_rings/time_display.c \

multi_boot/roms/collect_rings/ldscript.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ SECTIONS {
4646
build/collect_rings/src/sa2/game/shared/stage/mp_event_recv_mgr.o(.text);
4747
build/collect_rings/src/sa2/game/shared/collect_rings/results.o(.text);
4848
build/collect_rings/src/sa2/game/shared/stage/entities_manager.o(.text);
49-
build/collect_rings/src/sa2/game/shared/stage/collision.o(.text);
49+
build/collect_rings/src/sa2/game/shared/stage/collision_3.o(.text);
50+
build/collect_rings/src/sa2/game/shared/stage/collision_1.o(.text);
51+
build/collect_rings/src/sa2/game/shared/stage/collision_2.o(.text);
5052
build/collect_rings/src/sa2/game/sa2/stage/mystery_itembox.o(.text);
5153
build/collect_rings/src/sa2/game/shared/stage/rings_manager.o(.text);
5254
build/collect_rings/src/sa2/game/sa2/collect_rings/time_display.o(.text);

0 commit comments

Comments
 (0)