Merge master into ObjEvent rename

2019-11-25 20:00:04 -05:00
parent 4c52cf9ed1 6efa51f8ad
commit f559fa3fe2
144 changed files with 8322 additions and 8521 deletions
@@ -89,7 +89,7 @@
      "movement_range_y": 1,
      "trainer_type": "0",
      "trainer_sight_or_berry_tree_id": "0",
-      "script": "EventScript_Apprentice",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_Apprentice",
      "flag": "FLAG_HIDE_APPRENTICE"
    },
    {