Merge master into ObjEvent rename

2019-12-15 02:00:00 -05:00
parent 6556b556dd 6967caefb2
commit 82f55f2381
49 changed files with 1845 additions and 1829 deletions
@@ -24,7 +24,7 @@
      "movement_range_y": 1,
      "trainer_type": "0",
      "trainer_sight_or_berry_tree_id": "3",
-      "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0",
+      "script": "BattleFrontier_BattlePyramidTop_EventScript_Attendant",
      "flag": "0"
    },
    {
@@ -50,7 +50,7 @@
      "elevation": 4,
      "var": "VAR_TEMP_2",
      "var_value": "0",
-      "script": "BattleFrontier_BattlePyramidTop_EventScript_255256"
+      "script": "BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon"
    }
  ],
  "bg_events": []