Merge branch 'master' into doc-overworld

2020-07-18 20:24:09 -04:00
parent e129d04b93 8e6dd3bafe
commit af09e73d67
247 changed files with 4787 additions and 4035 deletions
@@ -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);