diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-07 23:53:43 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-07 23:53:43 -0500 |
| commit | 79c64d2b7137f12cccf290ea7f495727ad6b4cca (patch) | |
| tree | b2022ddfbc867bab3802465afbbdc7c3843460a9 /ld_script.txt | |
| parent | fd42bcc78ce229d13afc26af4c6d2dd0187b871d (diff) | |
| parent | 6b38db228befa044a2cfe31ed78555e3f0bd3935 (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ld_script.txt b/ld_script.txt index 4ac9ea4ee..4b28ff022 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -50,8 +50,7 @@ SECTIONS { src/rom_800D42C.o(.text); asm/battle_1.o(.text_800DC24); src/battle/battle_2.o(.text); - asm/battle_2.o(.text); - src/battle/battle_3.o(.text); + src/battle/battle_util.o(.text); src/battle/battle_4.o(.text); src/battle/battle_controller_player.o(.text); src/battle/battle_7.o(.text); @@ -348,9 +347,9 @@ SECTIONS { src/battle/battle_controller_linkpartner.o(.text); src/battle/battle_message.o(.text); src/field/choose_party.o(.text); - asm/cable_car.o(.text); + src/scene/cable_car.o(.text); asm/roulette_util.o(.text); - asm/cable_car_util.o(.text); + src/engine/cable_car_util.o(.text); src/unused_8124F94.o(.text); src/engine/save.o(.text); src/engine/mystery_event_script.o(.text); @@ -454,7 +453,7 @@ SECTIONS { src/battle/battle_controller_opponent.o(.rodata); src/battle/battle_controller_linkopponent.o(.rodata); data/battle_moves.o(.rodata); - src/battle/battle_3.o(.rodata); + src/battle/battle_util.o(.rodata); src/pokemon/pokemon_data.o(.rodata); . = ALIGN(4); src/engine/trig.o(.rodata); @@ -574,7 +573,7 @@ SECTIONS { src/battle/battle_controller_linkpartner.o(.rodata); src/battle/battle_message.o(.rodata); src/field/choose_party.o(.rodata); - data/cable_car.o(.rodata); + src/scene/cable_car.o(.rodata); src/engine/save.o(.rodata); src/field/field_effect_helpers.o(.rodata); data/contest_ai.o(.rodata); |