diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-15 00:40:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 00:40:47 -0400 |
| commit | e129d04b931a4fc0e6584b4340dc57b9162264d5 (patch) | |
| tree | a6ae1eb111f652b1cfffdd9a4bccba4a65a0de35 /ld_script.txt | |
| parent | ebb6c4ee661758874972956a94eb06d38eaa18a8 (diff) | |
| parent | 3c356a1d7af543d84c06f28f670b6ddc4b27fdd6 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ld_script.txt b/ld_script.txt index fbfeea112..4fe9c4aa0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -169,7 +169,7 @@ SECTIONS { src/record_mixing.o(.text); src/secret_base.o(.text); src/tv.o(.text); - src/contest_link_80F57C4.o(.text); + src/contest_util.o(.text); src/script_pokemon_util_80F87D8.o(.text); src/field_poison.o(.text); src/pokemon_size_record.o(.text); @@ -177,7 +177,7 @@ SECTIONS { src/field_special_scene.o(.text); src/rotating_gate.o(.text); src/safari_zone.o(.text); - src/contest_link_80FC4F4.o(.text); + src/contest_link.o(.text); src/item_use.o(.text); src/battle_anim_effects_1.o(.text); src/battle_anim_effects_2.o(.text); @@ -238,7 +238,7 @@ SECTIONS { src/cable_car.o(.text); src/math_util.o(.text); src/roulette_util.o(.text); - src/rom_81520A8.o(.text); + src/confetti_util.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); src/field_effect_helpers.o(.text); @@ -329,7 +329,7 @@ SECTIONS { src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); src/walda_phrase.o(.text); - src/contest_link_81D9DE4.o(.text); + src/contest_link_util.o(.text); src/gym_leader_rematch.o(.text); src/unk_transition.o(.text); src/international_string_util.o(.text); @@ -544,13 +544,13 @@ SECTIONS { src/record_mixing.o(.rodata); src/secret_base.o(.rodata); src/tv.o(.rodata); - src/contest_link_80F57C4.o(.rodata); + src/contest_util.o(.rodata); src/script_pokemon_util_80F87D8.o(.rodata); src/pokemon_size_record.o(.rodata) src/fldeff_misc.o(.rodata); src/field_special_scene.o(.rodata); src/rotating_gate.o(.rodata); - src/contest_link_80FC4F4.o(.rodata); + src/contest_link.o(.rodata); src/item_use.o(.rodata); src/battle_anim_effects_1.o(.rodata); src/battle_anim_effects_2.o(.rodata); |