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
@@ -304,7 +304,7 @@ static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8
    gSpecialVar_Facing = direction;

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