diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /ld_script.txt | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ld_script.txt b/ld_script.txt index 9f6e7297d..7096dde96 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -140,8 +140,8 @@ SECTIONS { src/item_menu_icons.o(.text); src/battle_anim_mon_movement.o(.text); src/item.o(.text); - src/shop.o(.text); - src/sea_cottage_special_anim.o(.text); + src/shop.o(.text); + src/sea_cottage_special_anim.o(.text); src/berry.o(.text); src/script_menu.o(.text); asm/naming_screen.o(.text); @@ -196,7 +196,7 @@ SECTIONS { src/fldeff_strength.o(.text); src/battle_transition.o(.text); src/battle_controller_link_partner.o(.text); - asm/battle_message.o(.text); + src/battle_message.o(.text); src/math_util.o(.text); src/roulette_util.o(.text); src/cable_car_util.o(.text); @@ -240,7 +240,7 @@ SECTIONS { src/quest_log.o(.text); asm/link_rfu_3.o(.text); asm/pokemon_special_anim.o(.text); - asm/party_menu.o(.text); + src/party_menu.o(.text); asm/union_room_chat.o(.text); src/help_system_812B1E0.o(.text); src/quest_log_battle.o(.text); @@ -442,8 +442,8 @@ SECTIONS { src/item_menu_icons.o(.rodata); src/battle_anim_mon_movement.o(.rodata); src/item.o(.rodata); - src/shop.o(.rodata); - src/sea_cottage_special_anim.o(.rodata); + src/shop.o(.rodata); + src/sea_cottage_special_anim.o(.rodata); src/berry.o(.rodata); src/script_menu.o(.rodata); data/naming_screen.o(.rodata); @@ -479,7 +479,7 @@ SECTIONS { src/evolution_scene.o(.rodata); src/battle_transition.o(.rodata); src/battle_controller_link_partner.o(.rodata); - data/battle_message.o(.rodata); + src/battle_message.o(.rodata); src/save.o(.rodata); data/field_effect_helpers.o(.rodata); src/battle_controller_safari.o(.rodata); @@ -518,7 +518,7 @@ SECTIONS { src/quest_log.o(.rodata); data/link_rfu_3.o(.rodata); data/pokemon_special_anim.o(.rodata); - data/party_menu.o(.rodata); + src/party_menu.o(.rodata); data/union_room_chat.o(.rodata); src/help_system_812B1E0.o(.rodata); src/fame_checker.o(.rodata); |