Merge branch 'master' into doc-partymenu

2019-10-31 14:22:51 -04:00
parent b33db9b96c 67ce8c9cc2
commit b1ea2592c3
219 changed files with 7959 additions and 7663 deletions
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -556,7 +556,7 @@ void sub_80AF848(void)
    gFieldCallback = sub_80AF3E8;
 }

-void sub_80AF87C(void)
+void DoMossdeepGymWarp(void)
 {
    sub_8085540(1);
    ScriptContext2_Enable();