diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-06 09:53:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 09:53:56 -0800 |
| commit | b396c6038cec6eba5eed46ed8f70f6a465acc2a6 (patch) | |
| tree | 7c3be19b73aae2f31f0cca77e94621aced62c7be /ld_script.txt | |
| parent | 818dfa314e1658ab797af686fedd464c9fda6557 (diff) | |
| parent | e6d86ff7748e67d22ec22e7f842bd9552fd8f292 (diff) | |
Merge pull request #445 from PikalaxALT/cable_car
Cable car and Cable car util
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5bfc8b171..9a2cbe4e5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -347,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); @@ -572,7 +572,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); |