Merge branch 'master' into main-menu-state-machine

2019-02-26 22:34:42 -05:00
parent 6cb4c677cd 231355f84d
commit 72bb0daccb
457 changed files with 17619 additions and 23557 deletions
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -796,7 +796,7 @@ void sub_81D5FB4(u16 *mapArg)
        dst += 31;
    }

-    mapheader_run_script_with_tag_x1();
+    RunOnLoadMapScript();
    FreeDataStruct();
 }