*actual* final pass at unifying on object event

1 files changed, 20 insertions, 20 deletions

diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
index 1b6927eb8..45fcd4703 100644
--- a/data/maps/MtEmber_Exterior/map.json
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_HIKER",
+      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
       "x": 29,
       "y": 45,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 41,
       "y": 40,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 42,
       "y": 40,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
       "x": 22,
       "y": 35,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CAMPER",
+      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
       "x": 15,
       "y": 28,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
       "x": 14,
       "y": 42,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 29,
       "y": 41,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 30,
       "y": 42,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
       "x": 22,
       "y": 45,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
       "x": 17,
       "y": 46,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
       "x": 36,
       "y": 14,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 34,
       "y": 14,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 36,
       "y": 15,
       "elevation": 3,
@@ -183,7 +183,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
       "x": 35,
       "y": 14,
       "elevation": 3,
@@ -196,7 +196,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
       "x": 35,
       "y": 17,
       "elevation": 3,
@@ -209,7 +209,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 18,
       "y": 39,
       "elevation": 3,
@@ -222,7 +222,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 19,
       "y": 40,
       "elevation": 3,
@@ -235,7 +235,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 13,
       "y": 6,
       "elevation": 3,
@@ -248,7 +248,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 38,
       "y": 10,
       "elevation": 3,
@@ -261,7 +261,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 48,
       "y": 20,
       "elevation": 3,