*actual* final pass at unifying on object event

1 files changed, 29 insertions, 29 deletions

diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json
index b618253aa..3520eaac0 100644
--- a/data/maps/OneIsland_KindleRoad/map.json
+++ b/data/maps/OneIsland_KindleRoad/map.json
@@ -20,7 +20,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
       "x": 11,
       "y": 32,
       "elevation": 1,
@@ -33,7 +33,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_LAND",
+      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_LAND",
       "x": 17,
       "y": 132,
       "elevation": 3,
@@ -46,7 +46,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
       "x": 7,
       "y": 39,
       "elevation": 1,
@@ -59,7 +59,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND",
+      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
       "x": 19,
       "y": 79,
       "elevation": 3,
@@ -72,7 +72,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_FISHER",
+      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
       "x": 15,
       "y": 25,
       "elevation": 3,
@@ -85,7 +85,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
       "x": 9,
       "y": 53,
       "elevation": 3,
@@ -98,7 +98,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
       "x": 18,
       "y": 105,
       "elevation": 4,
@@ -111,7 +111,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
       "x": 16,
       "y": 64,
       "elevation": 3,
@@ -124,7 +124,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
       "x": 11,
       "y": 64,
       "elevation": 3,
@@ -137,7 +137,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CAMPER",
+      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
       "x": 11,
       "y": 89,
       "elevation": 3,
@@ -150,7 +150,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
       "x": 9,
       "y": 108,
       "elevation": 3,
@@ -163,7 +163,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
       "x": 8,
       "y": 68,
       "elevation": 3,
@@ -176,7 +176,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
       "x": 9,
       "y": 68,
       "elevation": 3,
@@ -189,7 +189,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 8,
       "y": 104,
       "elevation": 3,
@@ -202,7 +202,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 11,
       "y": 95,
       "elevation": 3,
@@ -215,7 +215,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 12,
       "y": 96,
       "elevation": 3,
@@ -228,7 +228,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 10,
       "y": 95,
       "elevation": 3,
@@ -241,7 +241,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 105,
       "elevation": 3,
@@ -254,7 +254,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 75,
       "elevation": 3,
@@ -267,7 +267,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 84,
       "elevation": 3,
@@ -280,7 +280,7 @@
       "flag": "FLAG_TEMP_1A"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 74,
       "elevation": 3,
@@ -293,7 +293,7 @@
       "flag": "FLAG_TEMP_1B"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 73,
       "elevation": 3,
@@ -306,7 +306,7 @@
       "flag": "FLAG_TEMP_1C"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 18,
       "y": 111,
       "elevation": 4,
@@ -319,7 +319,7 @@
       "flag": "FLAG_TEMP_1D"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 10,
       "y": 86,
       "elevation": 3,
@@ -332,7 +332,7 @@
       "flag": "FLAG_TEMP_1E"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 110,
       "elevation": 3,
@@ -345,7 +345,7 @@
       "flag": "FLAG_TEMP_1F"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 18,
       "y": 112,
       "elevation": 4,
@@ -358,7 +358,7 @@
       "flag": "FLAG_TEMP_11"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 15,
       "y": 70,
       "elevation": 3,
@@ -371,7 +371,7 @@
       "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 103,
       "elevation": 3,
@@ -384,7 +384,7 @@
       "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 18,
       "y": 114,
       "elevation": 4,