summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-03-16 07:51:21 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-03-16 07:51:21 -0400
commit0367cc7d7884ff4100b90832ac000a3e415d2896 (patch)
treea06d1aa77e267d20d0d925477fc27ffb303594a8 /ld_script.txt
parent9c2e157123903ba18ee51655c42c7304517b37cc (diff)
parentf44f89a463d7280a95094e8f37a56873a90da843 (diff)
Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 178474863..4538c714e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -93,8 +93,7 @@ SECTIONS {
src/field_camera.o(.text);
src/field_door.o(.text);
asm/field_player_avatar.o(.text);
- asm/event_object_movement.o(.text);
- src/event_object_80688E4.o(.text); /* event_object_movement */
+ src/event_object_movement.o(.text);
src/field_message_box.o(.text);
src/event_object_lock.o(.text);
src/text_window_graphics.o(.text);
@@ -434,7 +433,7 @@ SECTIONS {
src/field_door.o(.rodata);
data/field_player_avatar.o(.rodata);
data/event_object_movement.o(.rodata);
- src/event_object_80688E4.o(.rodata); /* event_object_movement */
+ src/event_object_movement.o(.rodata);
src/scrcmd.o(.rodata);
src/coord_event_weather.o(.rodata);
src/field_tasks.o(.rodata);