diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /ld_script.txt | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index 551a63cef..341b1b103 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -103,7 +103,7 @@ SECTIONS { src/script.o(.text); src/scrcmd.o(.text); asm/field_control_avatar.o(.text); - asm/event_data.o(.text); + src/event_data.o(.text); src/coord_event_weather.o(.text); asm/field_tasks.o(.text); src/start_menu.o(.text); @@ -283,6 +283,7 @@ SECTIONS { src/unk_815C980.o(.text); src/ss_anne.o(.text); src/cereader_tool.o(.text); + src/renewable_hidden_items.o(.text); src/trainer_tower.o(.text); src/berry_powder.o(.text); src/unk_815F138.o(.text); @@ -396,6 +397,7 @@ SECTIONS { src/daycare.o(.rodata); src/battle_gfx_sfx_util.o(.rodata); data/data.o(.rodata.8260270); + data/overworld.o(.rodata); data/tilesets.o(.rodata); data/maps.o(.rodata); src/fieldmap.o(.rodata); @@ -509,15 +511,19 @@ SECTIONS { src/text_window_graphics.o(.rodata); src/quest_log_8150454.o(.rodata); data/data_8471F00.o(.rodata); + src/unk_8159F40.o(.rodata); src/teachy_tv.o(.rodata); src/unk_815C980.o(.rodata); data/data_8471F00.o(.rodata.8479668); src/ss_anne.o(.rodata); src/cereader_tool.o(.rodata); + src/renewable_hidden_items.o(.rodata); src/trainer_tower.o(.rodata); src/unk_815F138.o(.rodata); src/berry_fix_program.o(.rodata); data/data_8471F00.o(.rodata.after_trainer_tower); + + /* These should not be moved to C files */ src/mystery_event_msg.o(.rodata); data/mystery_event_msg.o(.rodata); src/m4a_tables.o(.rodata); |