1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
index b70aa83c1..cec8e2fca 100644
--- a/data/maps/SaffronCity/map.json
+++ b/data/maps/SaffronCity/map.json
@@ -36,7 +36,7 @@
   "connections_no_include": true,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 22,
       "y": 15,
       "elevation": 3,
@@ -49,7 +49,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 26,
       "y": 16,
       "elevation": 3,
@@ -62,7 +62,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 46,
       "y": 13,
       "elevation": 3,
@@ -75,7 +75,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 27,
       "y": 22,
       "elevation": 3,
@@ -88,7 +88,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 25,
       "y": 33,
       "elevation": 3,
@@ -101,7 +101,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 34,
       "y": 31,
       "elevation": 3,
@@ -114,7 +114,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 30,
       "y": 39,
       "elevation": 3,
@@ -127,7 +127,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 48,
       "y": 24,
       "elevation": 3,
@@ -140,7 +140,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 37,
       "y": 32,
       "elevation": 3,
@@ -153,7 +153,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
       "x": 21,
       "y": 23,
       "elevation": 3,
@@ -166,7 +166,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MAN",
       "x": 39,
       "y": 16,
       "elevation": 3,
@@ -179,7 +179,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BOY",
+      "graphics_id": "OBJECT_EVENT_GFX_BOY",
       "x": 44,
       "y": 22,
       "elevation": 3,
@@ -192,7 +192,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PIDGEOT",
+      "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT",
       "x": 45,
       "y": 22,
       "elevation": 3,
@@ -205,7 +205,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 32,
       "y": 39,
       "elevation": 3,
@@ -218,7 +218,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
       "x": 47,
       "y": 24,
       "elevation": 3,