Merge branch 'master' into pokenav_unk_2

2019-08-04 15:35:35 -04:00
parent a08cbaee0a fa5bfc1627
commit cd876292d1
378 changed files with 61384 additions and 41039 deletions
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -915,7 +915,7 @@ void SetHillTrainerFlag(void)
    }
 }

-const u8 *sub_81D62AC(void)
+const u8 *GetTrainerHillTrainerScript(void)
 {
    return EventScript_2C83F0;
 }