summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-11-12 15:38:42 -0500
committerGitHub <noreply@github.com>2019-11-12 15:38:42 -0500
commit4a6563b82d0d10169b7f361ee44412d65a99582e (patch)
tree46c0f4eff4b30b1ec2158888be0a4cd3c66c48da /ld_script.txt
parent68ac755bb91041868cde6d558b2af2123ddad0a0 (diff)
parentf04e6737b2073446efa285cfa74a80ee23649afd (diff)
Merge pull request #154 from PikalaxALT/dism_more_data
Field Door
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/ld_script.txt b/ld_script.txt
index d40c88c0a..d84a70c7a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -93,7 +93,7 @@ SECTIONS {
src/fieldmap.o(.text);
src/metatile_behavior.o(.text);
asm/field_camera.o(.text);
- asm/field_door.o(.text);
+ src/field_door.o(.text);
asm/field_player_avatar.o(.text);
asm/field_map_obj.o(.text);
asm/field_ground_effect.o(.text);
@@ -136,7 +136,7 @@ SECTIONS {
asm/script_movement.o(.text);
asm/fldeff_cut.o(.text);
src/mail_data.o(.text);
- asm/map_name_popup.o(.text);
+ src/map_name_popup.o(.text);
src/item_menu_icons.o(.text);
src/battle_anim_mon_movement.o(.text);
src/item.o(.text);
@@ -408,8 +408,7 @@ SECTIONS {
data/maps.o(.rodata);
src/fieldmap.o(.rodata);
src/metatile_behavior.o(.rodata);
- data/metatile_behavior.o(.rodata);
- data/field_door.o(.rodata);
+ src/field_door.o(.rodata);
data/field_player_avatar.o(.rodata);
data/field_map_obj.o(.rodata);
data/field_ground_effect.o(.rodata);
@@ -438,7 +437,7 @@ SECTIONS {
data/pokemon_storage_system.o(.rodata);
src/pokemon_icon.o(.rodata);
data/fldeff_cut.o(.rodata);
- data/map_name_popup.o(.rodata);
+ src/map_name_popup.o(.rodata);
src/item_menu_icons.o(.rodata);
src/battle_anim_mon_movement.o(.rodata);
src/item.o(.rodata);
@@ -447,7 +446,7 @@ SECTIONS {
src/script_menu.o(.rodata);
data/naming_screen.o(.rodata);
src/pokemon_size_record.o(.rodata);
- data/item_use.o(.rodata);
+ src/item_use.o(.rodata);
data/battle_anim_effects_misc.o(.rodata);
src/flying.o(.rodata);
src/psychic.o(.rodata);