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_see.c
+++ b/src/trainer_see.c
@@ -235,7 +235,7 @@ static u8 CheckTrainer(u8 eventObjectId)
    u8 approachDistance;

    if (InTrainerHill() == TRUE)
-        scriptPtr = sub_81D62AC();
+        scriptPtr = GetTrainerHillTrainerScript();
    else
        scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjectId);