diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /ld_script.txt | |
parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'ld_script.txt')
-rw-r--r-- | ld_script.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 4fe9c4aa0..f3e418c08 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -331,7 +331,7 @@ SECTIONS { src/walda_phrase.o(.text); src/contest_link_util.o(.text); src/gym_leader_rematch.o(.text); - src/unk_transition.o(.text); + src/battle_transition_frontier.o(.text); src/international_string_util.o(.text); } =0 @@ -685,7 +685,7 @@ SECTIONS { src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); src/gym_leader_rematch.o(.rodata); - src/unk_transition.o(.rodata); + src/battle_transition_frontier.o(.rodata); src/text_input_strings.o(.rodata); data/fonts.o(.rodata); src/mystery_event_msg.o(.rodata); |