Merge master into ObjEvent rename

This commit is contained in:
GriffinR committed 2019-11-25 20:00:04 -05:00
commit f559fa3fe2
144 files changed
+8322 -8521

No files matched your search

@@ -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"
},
{