auto-assign map object hide/show flags

178 files changed, 606 insertions, 606 deletions

diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
index 0d81cfa6c..a38e0223e 100644
--- a/data/maps/BirthIsland_Exterior/map.json
+++ b/data/maps/BirthIsland_Exterior/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "BirthIsland_Exterior_EventScript_165271",
-      "flag": "154"
+      "flag": "FLAG_0x09A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "153"
+      "flag": "FLAG_0x099"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index 136e04982..e9094aea3 100644
--- a/data/maps/CeladonCity/map.json
+++ b/data/maps/CeladonCity/map.json
@@ -35,7 +35,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_EventScript_166CFA",
-      "flag": "95"
+      "flag": "FLAG_0x05F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
@@ -126,7 +126,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_EventScript_166D03",
-      "flag": "95"
+      "flag": "FLAG_0x05F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
@@ -152,7 +152,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_EventScript_1BDF13",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -165,7 +165,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BOY",
@@ -204,7 +204,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_EventScript_1BEBC0",
-      "flag": "465"
+      "flag": "FLAG_0x1D1"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -217,7 +217,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_EventScript_166D15",
-      "flag": "95"
+      "flag": "FLAG_0x05F"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json
index 3541660d4..de354af8b 100644
--- a/data/maps/CeladonCity_Condominiums_2F/map.json
+++ b/data/maps/CeladonCity_Condominiums_2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
-      "flag": "158"
+      "flag": "FLAG_0x09E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
-      "flag": "158"
+      "flag": "FLAG_0x09E"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
index 14c5e6d98..a34d04891 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D",
-      "flag": "87"
+      "flag": "FLAG_0x057"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
index 0f01dd4cd..fae0949c0 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
index 3a1f161e2..d92c4256b 100644
--- a/data/maps/CeladonCity_GameCorner/map.json
+++ b/data/maps/CeladonCity_GameCorner/map.json
@@ -154,7 +154,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_GameCorner_EventScript_16CAF5",
-      "flag": "91"
+      "flag": "FLAG_0x05B"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
index 690cf2d47..46942cd80 100644
--- a/data/maps/CeladonCity_Gym/map.json
+++ b/data/maps/CeladonCity_Gym/map.json
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_Gym_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_Gym_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_Gym_EventScript_1BDF13",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json
index 6db3c2c2a..99a137100 100644
--- a/data/maps/CeladonCity_PokemonCenter_2F/map.json
+++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json
index bc61b6f2a..f09b09fbc 100644
--- a/data/maps/CeruleanCave_1F/map.json
+++ b/data/maps/CeruleanCave_1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BEA47",
-      "flag": "434"
+      "flag": "FLAG_0x1B2"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BEA54",
-      "flag": "435"
+      "flag": "FLAG_0x1B3"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BEA3A",
-      "flag": "433"
+      "flag": "FLAG_0x1B1"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json
index 4afc6c445..bcff9dba4 100644
--- a/data/maps/CeruleanCave_2F/map.json
+++ b/data/maps/CeruleanCave_2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BEA6E",
-      "flag": "437"
+      "flag": "FLAG_0x1B5"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BEA7B",
-      "flag": "438"
+      "flag": "FLAG_0x1B6"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BEA61",
-      "flag": "436"
+      "flag": "FLAG_0x1B4"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "24"
+      "flag": "FLAG_0x018"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "25"
+      "flag": "FLAG_0x019"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -167,7 +167,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "26"
+      "flag": "FLAG_0x01A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -180,7 +180,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "27"
+      "flag": "FLAG_0x01B"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json
index 0954f895e..3f9c44aa4 100644
--- a/data/maps/CeruleanCave_B1F/map.json
+++ b/data/maps/CeruleanCave_B1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BEA95",
-      "flag": "440"
+      "flag": "FLAG_0x1B8"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BEA88",
-      "flag": "439"
+      "flag": "FLAG_0x1B7"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_MEWTWO",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1624F5",
-      "flag": "129"
+      "flag": "FLAG_0x081"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "24"
+      "flag": "FLAG_0x018"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "25"
+      "flag": "FLAG_0x019"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -167,7 +167,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "26"
+      "flag": "FLAG_0x01A"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json
index a51b06518..4fc523b06 100644
--- a/data/maps/CeruleanCity/map.json
+++ b/data/maps/CeruleanCity/map.json
@@ -58,7 +58,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCity_EventScript_166603",
-      "flag": "59"
+      "flag": "FLAG_0x03B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
@@ -136,7 +136,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "60"
+      "flag": "FLAG_0x03C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -149,7 +149,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCity_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "65375",
@@ -188,7 +188,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCity_EventScript_16672F",
-      "flag": "92"
+      "flag": "FLAG_0x05C"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
index be49ee0b6..9b5b8fc4a 100644
--- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json
+++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
index 1780cc18f..88d26ac52 100644
--- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json
+++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json
index b70cb19c9..28cba0247 100644
--- a/data/maps/CinnabarIsland/map.json
+++ b/data/maps/CinnabarIsland/map.json
@@ -61,7 +61,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "98"
+      "flag": "FLAG_0x062"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
@@ -74,7 +74,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "107"
+      "flag": "FLAG_0x06B"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
index 406880956..2b0508a57 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BILL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A",
-      "flag": "162"
+      "flag": "FLAG_0x0A2"
     }
   ],
   "warp_events": [
diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
index b7778f77b..3a302e10a 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json
index 3de72549a..726f3b098 100644
--- a/data/maps/FiveIsland_LostCave_Room10/map.json
+++ b/data/maps/FiveIsland_LostCave_Room10/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "147"
+      "flag": "FLAG_0x093"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB",
-      "flag": "504"
+      "flag": "FLAG_0x1F8"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json
index b6c7eee6a..b8522005b 100644
--- a/data/maps/FiveIsland_LostCave_Room11/map.json
+++ b/data/maps/FiveIsland_LostCave_Room11/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8",
-      "flag": "505"
+      "flag": "FLAG_0x1F9"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json
index 81d5c84a6..6a0e49b0d 100644
--- a/data/maps/FiveIsland_LostCave_Room12/map.json
+++ b/data/maps/FiveIsland_LostCave_Room12/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5",
-      "flag": "506"
+      "flag": "FLAG_0x1FA"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json
index 34c5d1c2e..304cab4f0 100644
--- a/data/maps/FiveIsland_LostCave_Room13/map.json
+++ b/data/maps/FiveIsland_LostCave_Room13/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2",
-      "flag": "507"
+      "flag": "FLAG_0x1FB"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json
index 61b7c7707..089d0c044 100644
--- a/data/maps/FiveIsland_LostCave_Room14/map.json
+++ b/data/maps/FiveIsland_LostCave_Room14/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF",
-      "flag": "508"
+      "flag": "FLAG_0x1FC"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json
index 79492a3ef..e755aa014 100644
--- a/data/maps/FiveIsland_Meadow/map.json
+++ b/data/maps/FiveIsland_Meadow/map.json
@@ -35,7 +35,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "FiveIsland_Meadow_EventScript_1689BB",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -48,7 +48,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
       "script": "FiveIsland_Meadow_EventScript_16898D",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -61,7 +61,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "FiveIsland_Meadow_EventScript_1689A4",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -74,7 +74,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_Meadow_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -87,7 +87,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_Meadow_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -100,7 +100,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_Meadow_EventScript_1BEC69",
-      "flag": "478"
+      "flag": "FLAG_0x1DE"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -113,7 +113,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_Meadow_EventScript_1BEC76",
-      "flag": "479"
+      "flag": "FLAG_0x1DF"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json
index fcb4710ef..459dfe953 100644
--- a/data/maps/FiveIsland_MemorialPillar/map.json
+++ b/data/maps/FiveIsland_MemorialPillar/map.json
@@ -82,7 +82,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_MemorialPillar_EventScript_1BEC83",
-      "flag": "480"
+      "flag": "FLAG_0x1E0"
     }
   ],
   "warp_events": [],
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json
index b89d73b1b..a7756e0dc 100644
--- a/data/maps/FiveIsland_PokemonCenter_1F/map.json
+++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json
index 5c59463ff..f667fd526 100644
--- a/data/maps/FiveIsland_PokemonCenter_2F/map.json
+++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json
index a33858daf..3f7b471ae 100644
--- a/data/maps/FiveIsland_ResortGorgeous/map.json
+++ b/data/maps/FiveIsland_ResortGorgeous/map.json
@@ -121,7 +121,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "148"
+      "flag": "FLAG_0x094"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json
index 68c9ce418..f19d24ea5 100644
--- a/data/maps/FiveIsland_ResortGorgeous_House/map.json
+++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE",
-      "flag": "149"
+      "flag": "FLAG_0x095"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_ResortGorgeous_House_EventScript_172062",
-      "flag": "150"
+      "flag": "FLAG_0x096"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
index 5191f32d2..e5b0bc9e9 100644
--- a/data/maps/FiveIsland_RocketWarehouse/map.json
+++ b/data/maps/FiveIsland_RocketWarehouse/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "FiveIsland_RocketWarehouse_EventScript_163FE6",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "FiveIsland_RocketWarehouse_EventScript_163FFD",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_F",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "FiveIsland_RocketWarehouse_EventScript_164087",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "FiveIsland_RocketWarehouse_EventScript_164014",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_F",
@@ -76,7 +76,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "FiveIsland_RocketWarehouse_EventScript_164070",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_RocketWarehouse_EventScript_1BED87",
-      "flag": "500"
+      "flag": "FLAG_0x1F4"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_RocketWarehouse_EventScript_1BED94",
-      "flag": "501"
+      "flag": "FLAG_0x1F5"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_RocketWarehouse_EventScript_1BEDA1",
-      "flag": "502"
+      "flag": "FLAG_0x1F6"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FiveIsland_RocketWarehouse_EventScript_1BEDAE",
-      "flag": "503"
+      "flag": "FLAG_0x1F7"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
index 26cc2645b..a8052de3f 100644
--- a/data/maps/FourIsland/map.json
+++ b/data/maps/FourIsland/map.json
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_EventScript_1BEC28",
-      "flag": "473"
+      "flag": "FLAG_0x1D9"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_EventScript_1BEC35",
-      "flag": "474"
+      "flag": "FLAG_0x1DA"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BLUE",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "151"
+      "flag": "FLAG_0x097"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json
index cdff7efeb..6e4f19dbd 100644
--- a/data/maps/FourIsland_IcefallCave_1F/map.json
+++ b/data/maps/FourIsland_IcefallCave_1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_IcefallCave_1F_EventScript_1BED53",
-      "flag": "496"
+      "flag": "FLAG_0x1F0"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_IcefallCave_1F_EventScript_1BED60",
-      "flag": "497"
+      "flag": "FLAG_0x1F1"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json
index ab812373b..1bb5b7bdb 100644
--- a/data/maps/FourIsland_IcefallCave_B1F/map.json
+++ b/data/maps/FourIsland_IcefallCave_B1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_IcefallCave_B1F_EventScript_1BED6D",
-      "flag": "498"
+      "flag": "FLAG_0x1F2"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_IcefallCave_B1F_EventScript_1BED7A",
-      "flag": "499"
+      "flag": "FLAG_0x1F3"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json
index 6582bf948..446afbf11 100644
--- a/data/maps/FourIsland_IcefallCave_Back/map.json
+++ b/data/maps/FourIsland_IcefallCave_Back/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "141"
+      "flag": "FLAG_0x08D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "141"
+      "flag": "FLAG_0x08D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LORELEI",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_IcefallCave_Back_EventScript_163F25",
-      "flag": "139"
+      "flag": "FLAG_0x08B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "141"
+      "flag": "FLAG_0x08D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json
index b60903dd4..9873f36c8 100644
--- a/data/maps/FourIsland_LoreleisHouse/map.json
+++ b/data/maps/FourIsland_LoreleisHouse/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C58",
-      "flag": "140"
+      "flag": "FLAG_0x08C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
-      "flag": "165"
+      "flag": "FLAG_0x0A5"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CHANSEY",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
-      "flag": "166"
+      "flag": "FLAG_0x0A6"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
-      "flag": "168"
+      "flag": "FLAG_0x0A8"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
-      "flag": "167"
+      "flag": "FLAG_0x0A7"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_NIDORAN_M",
@@ -167,7 +167,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
-      "flag": "169"
+      "flag": "FLAG_0x0A9"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_PIDGEOT",
@@ -180,7 +180,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
-      "flag": "171"
+      "flag": "FLAG_0x0AB"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_FEAROW",
@@ -193,7 +193,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
-      "flag": "170"
+      "flag": "FLAG_0x0AA"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL",
@@ -206,7 +206,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
-      "flag": "172"
+      "flag": "FLAG_0x0AC"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json
index 7d06d9822..3a6edfa3a 100644
--- a/data/maps/FourIsland_PokemonCenter_2F/map.json
+++ b/data/maps/FourIsland_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json
index 874f2159b..9d03cc645 100644
--- a/data/maps/FuchsiaCity/map.json
+++ b/data/maps/FuchsiaCity/map.json
@@ -170,7 +170,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FuchsiaCity_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -183,7 +183,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FuchsiaCity_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -196,7 +196,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FuchsiaCity_EventScript_1BDF13",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -209,7 +209,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FuchsiaCity_EventScript_1BDF13",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
@@ -235,7 +235,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FuchsiaCity_EventScript_166DC1",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json
index 838a6c0ab..59c6d9153 100644
--- a/data/maps/FuchsiaCity_Building1/map.json
+++ b/data/maps/FuchsiaCity_Building1/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FuchsiaCity_Building1_EventScript_1BEAA2",
-      "flag": "441"
+      "flag": "FLAG_0x1B9"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FuchsiaCity_Building1_EventScript_1ACEB8",
-      "flag": "159"
+      "flag": "FLAG_0x09F"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
index 0f4c1c456..f90456e9a 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
+++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json
index d10117c39..359b6d592 100644
--- a/data/maps/IndigoPlateau_Exterior/map.json
+++ b/data/maps/IndigoPlateau_Exterior/map.json
@@ -30,7 +30,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "163"
+      "flag": "FLAG_0x0A3"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_PROF_OAK",
@@ -43,7 +43,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "164"
+      "flag": "FLAG_0x0A4"
     }
   ],
   "warp_events": [
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
index 012378da2..d7a85e461 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
index a730db362..12e7e671c 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json
index 2020bf5fe..53464f223 100644
--- a/data/maps/LavenderTown_PokemonCenter_1F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "LavenderTown_PokemonCenter_1F_EventScript_1AD0A0",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json
index 923796037..50043e367 100644
--- a/data/maps/LavenderTown_PokemonCenter_2F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
index 25f7e849f..b3432a395 100644
--- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B14A",
-      "flag": "53"
+      "flag": "FLAG_0x035"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_NIDORINO",
diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
index fa5fb2e2d..a33310783 100644
--- a/data/maps/MtEmber_Exterior/map.json
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_16397F",
-      "flag": "137"
+      "flag": "FLAG_0x089"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1639F0",
-      "flag": "137"
+      "flag": "FLAG_0x089"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -167,7 +167,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -180,7 +180,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -219,7 +219,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -232,7 +232,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -245,7 +245,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BED2C",
-      "flag": "493"
+      "flag": "FLAG_0x1ED"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -258,7 +258,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BED39",
-      "flag": "494"
+      "flag": "FLAG_0x1EE"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -271,7 +271,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Exterior_EventScript_1BED46",
-      "flag": "495"
+      "flag": "FLAG_0x1EF"
     }
   ],
   "warp_events": [
diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json
index acf62c06f..262c014b0 100644
--- a/data/maps/MtEmber_RubyPath_1F/map.json
+++ b/data/maps/MtEmber_RubyPath_1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     }
   ],
   "warp_events": [
diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json
index 16207a3b3..d72e33df6 100644
--- a/data/maps/MtEmber_RubyPath_B1F/map.json
+++ b/data/maps/MtEmber_RubyPath_B1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     }
   ],
   "warp_events": [
diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
index 205387b0a..c18a21287 100644
--- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
+++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     }
   ],
   "warp_events": [
diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json
index 23465b7aa..50b4acd25 100644
--- a/data/maps/MtEmber_RubyPath_B2F/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     }
   ],
   "warp_events": [
diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
index 196b31152..ec9ca1c93 100644
--- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     }
   ],
   "warp_events": [
diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json
index 4318d5b87..e208baa96 100644
--- a/data/maps/MtEmber_RubyPath_B3F/map.json
+++ b/data/maps/MtEmber_RubyPath_B3F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json
index b5c72fefb..4c0bcf6db 100644
--- a/data/maps/MtEmber_RubyPath_B5F/map.json
+++ b/data/maps/MtEmber_RubyPath_B5F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_RubyPath_B5F_EventScript_163C49",
-      "flag": "138"
+      "flag": "FLAG_0x08A"
     }
   ],
   "warp_events": [
diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json
index 25635fa61..a43849161 100644
--- a/data/maps/MtEmber_Summit/map.json
+++ b/data/maps/MtEmber_Summit/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_Summit_EventScript_163B33",
-      "flag": "82"
+      "flag": "FLAG_0x052"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json
index f376b7bcc..f17f76a12 100644
--- a/data/maps/MtEmber_SummitPath_2F/map.json
+++ b/data/maps/MtEmber_SummitPath_2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "24"
+      "flag": "FLAG_0x018"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "25"
+      "flag": "FLAG_0x019"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
-      "flag": "26"
+      "flag": "FLAG_0x01A"
     }
   ],
   "warp_events": [
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json
index ec9135155..78869beff 100644
--- a/data/maps/MtMoon_1F/map.json
+++ b/data/maps/MtMoon_1F/map.json
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_1F_EventScript_1BE5CF",
-      "flag": "345"
+      "flag": "FLAG_0x159"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_1F_EventScript_1BE5DC",
-      "flag": "346"
+      "flag": "FLAG_0x15A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_1F_EventScript_1BE5E9",
-      "flag": "347"
+      "flag": "FLAG_0x15B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_1F_EventScript_1BE5F6",
-      "flag": "348"
+      "flag": "FLAG_0x15C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -167,7 +167,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_1F_EventScript_1BE603",
-      "flag": "349"
+      "flag": "FLAG_0x15D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -180,7 +180,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_1F_EventScript_1BE610",
-      "flag": "350"
+      "flag": "FLAG_0x15E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json
index d78f3a942..4a66006bd 100644
--- a/data/maps/MtMoon_B2F/map.json
+++ b/data/maps/MtMoon_B2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_B2F_EventScript_16071B",
-      "flag": "47"
+      "flag": "FLAG_0x02F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_FOSSIL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_B2F_EventScript_16077F",
-      "flag": "48"
+      "flag": "FLAG_0x030"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "MtMoon_B2F_EventScript_160829",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -76,7 +76,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "MtMoon_B2F_EventScript_1607E4",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -89,7 +89,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "MtMoon_B2F_EventScript_160812",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -102,7 +102,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "MtMoon_B2F_EventScript_1607FB",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_B2F_EventScript_1BE61D",
-      "flag": "351"
+      "flag": "FLAG_0x15F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_B2F_EventScript_1BE62A",
-      "flag": "352"
+      "flag": "FLAG_0x160"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_B2F_EventScript_1BEAD6",
-      "flag": "447"
+      "flag": "FLAG_0x1BF"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "MtMoon_B2F_EventScript_1BEAE3",
-      "flag": "448"
+      "flag": "FLAG_0x1C0"
     }
   ],
   "warp_events": [
diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json
index e088f779a..d9d2c5a8e 100644
--- a/data/maps/NavelRock_Base/map.json
+++ b/data/maps/NavelRock_Base/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "NavelRock_Base_EventScript_165134",
-      "flag": "155"
+      "flag": "FLAG_0x09B"
     }
   ],
   "warp_events": [
diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json
index a8bba827c..365e088a0 100644
--- a/data/maps/NavelRock_Summit/map.json
+++ b/data/maps/NavelRock_Summit/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "156"
+      "flag": "FLAG_0x09C"
     }
   ],
   "warp_events": [
diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json
index a495cc5a5..ee2444858 100644
--- a/data/maps/OneIsland/map.json
+++ b/data/maps/OneIsland/map.json
@@ -35,7 +35,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "113"
+      "flag": "FLAG_0x071"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json
index 3ea281a61..97c7a6a3b 100644
--- a/data/maps/OneIsland_KindleRoad/map.json
+++ b/data/maps/OneIsland_KindleRoad/map.json
@@ -199,7 +199,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -212,7 +212,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -225,7 +225,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -238,7 +238,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -251,7 +251,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "24"
+      "flag": "FLAG_0x018"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -264,7 +264,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "25"
+      "flag": "FLAG_0x019"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -277,7 +277,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "26"
+      "flag": "FLAG_0x01A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -290,7 +290,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "27"
+      "flag": "FLAG_0x01B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -303,7 +303,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "28"
+      "flag": "FLAG_0x01C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -316,7 +316,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "29"
+      "flag": "FLAG_0x01D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -329,7 +329,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "30"
+      "flag": "FLAG_0x01E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -342,7 +342,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "31"
+      "flag": "FLAG_0x01F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -355,7 +355,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BE00C",
-      "flag": "17"
+      "flag": "FLAG_0x011"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -368,7 +368,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BEC42",
-      "flag": "475"
+      "flag": "FLAG_0x1DB"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -381,7 +381,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BEC4F",
-      "flag": "476"
+      "flag": "FLAG_0x1DC"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -394,7 +394,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EventScript_1BEC5C",
-      "flag": "477"
+      "flag": "FLAG_0x1DD"
     }
   ],
   "warp_events": [
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
index d081340e8..82a4ddf58 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json
index 7e9257071..ae54dc6e2 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_1F/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_PokemonCenter_1F_EventScript_170E9D",
-      "flag": "114"
+      "flag": "FLAG_0x072"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CELIO",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_PokemonCenter_1F_EventScript_170EC5",
-      "flag": "115"
+      "flag": "FLAG_0x073"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json
index e407f61d3..32111a11c 100644
--- a/data/maps/OneIsland_PokemonCenter_2F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
index 10e4cc83c..6854282b5 100644
--- a/data/maps/PalletTown/map.json
+++ b/data/maps/PalletTown/map.json
@@ -61,7 +61,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "44"
+      "flag": "FLAG_0x02C"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json
index b63fc575a..4516e4910 100644
--- a/data/maps/PalletTown_GarysHouse/map.json
+++ b/data/maps/PalletTown_GarysHouse/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PalletTown_GarysHouse_EventScript_168F63",
-      "flag": "57"
+      "flag": "FLAG_0x039"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json
index 494906574..f6b80642a 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/map.json
+++ b/data/maps/PalletTown_ProfessorOaksLab/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PalletTown_ProfessorOaksLab_EventScript_169595",
-      "flag": "43"
+      "flag": "FLAG_0x02B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB",
-      "flag": "40"
+      "flag": "FLAG_0x028"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PalletTown_ProfessorOaksLab_EventScript_169D78",
-      "flag": "41"
+      "flag": "FLAG_0x029"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE",
-      "flag": "42"
+      "flag": "FLAG_0x02A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BLUE",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PalletTown_ProfessorOaksLab_EventScript_16955F",
-      "flag": "45"
+      "flag": "FLAG_0x02D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_POKEDEX",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
-      "flag": "58"
+      "flag": "FLAG_0x03A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_POKEDEX",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
-      "flag": "58"
+      "flag": "FLAG_0x03A"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json
index e8fb9dbf0..57b359ab5 100644
--- a/data/maps/PewterCity/map.json
+++ b/data/maps/PewterCity/map.json
@@ -48,7 +48,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PewterCity_EventScript_16607E",
-      "flag": "80"
+      "flag": "FLAG_0x050"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
@@ -87,7 +87,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PewterCity_EventScript_165B9D",
-      "flag": "46"
+      "flag": "FLAG_0x02E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -100,7 +100,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PewterCity_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -113,7 +113,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PewterCity_EventScript_1662A9",
-      "flag": "146"
+      "flag": "FLAG_0x092"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json
index 3414e91fd..848da7bbb 100644
--- a/data/maps/PewterCity_Museum_1F/map.json
+++ b/data/maps/PewterCity_Museum_1F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PewterCity_Museum_1F_EventScript_16A509",
-      "flag": "86"
+      "flag": "FLAG_0x056"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json
index 3e4536016..c624918c8 100644
--- a/data/maps/PewterCity_PokemonCenter_2F/map.json
+++ b/data/maps/PewterCity_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json
index a0398c3f5..c98a22470 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/map.json
+++ b/data/maps/PokemonLeague_ChampionsRoom/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "90"
+      "flag": "FLAG_0x05A"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
index d6850e960..911b12629 100644
--- a/data/maps/PokemonMansion_1F/map.json
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_1F_EventScript_1BE95D",
-      "flag": "415"
+      "flag": "FLAG_0x19F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_1F_EventScript_1BE96A",
-      "flag": "416"
+      "flag": "FLAG_0x1A0"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_1F_EventScript_1BEB65",
-      "flag": "458"
+      "flag": "FLAG_0x1CA"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
index a23d361b7..7bddef15b 100644
--- a/data/maps/PokemonMansion_2F/map.json
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_2F_EventScript_1BE977",
-      "flag": "417"
+      "flag": "FLAG_0x1A1"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_2F_EventScript_1BEB72",
-      "flag": "459"
+      "flag": "FLAG_0x1CB"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_2F_EventScript_1BEB7F",
-      "flag": "460"
+      "flag": "FLAG_0x1CC"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
index a47dbd546..f846a0556 100644
--- a/data/maps/PokemonMansion_3F/map.json
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_3F_EventScript_1BE984",
-      "flag": "418"
+      "flag": "FLAG_0x1A2"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_3F_EventScript_1BE991",
-      "flag": "419"
+      "flag": "FLAG_0x1A3"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
index ff1468f6a..d3d6b2506 100644
--- a/data/maps/PokemonMansion_B1F/map.json
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_B1F_EventScript_1BE9B8",
-      "flag": "423"
+      "flag": "FLAG_0x1A7"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_B1F_EventScript_1BE99E",
-      "flag": "420"
+      "flag": "FLAG_0x1A4"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_B1F_EventScript_1BE9AB",
-      "flag": "421"
+      "flag": "FLAG_0x1A5"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonMansion_B1F_EventScript_1BE9C5",
-      "flag": "424"
+      "flag": "FLAG_0x1A8"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json
index ac910fa70..6b79803c0 100644
--- a/data/maps/PokemonTower_2F/map.json
+++ b/data/maps/PokemonTower_2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "81"
+      "flag": "FLAG_0x051"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CHANNELER",
diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json
index 5035b861f..eb53d726e 100644
--- a/data/maps/PokemonTower_3F/map.json
+++ b/data/maps/PokemonTower_3F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_3F_EventScript_1BE755",
-      "flag": "375"
+      "flag": "FLAG_0x177"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json
index c5fd2c6ef..7d7e85cd1 100644
--- a/data/maps/PokemonTower_4F/map.json
+++ b/data/maps/PokemonTower_4F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_4F_EventScript_1BE762",
-      "flag": "376"
+      "flag": "FLAG_0x178"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_4F_EventScript_1BE76F",
-      "flag": "377"
+      "flag": "FLAG_0x179"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_4F_EventScript_1BE77C",
-      "flag": "378"
+      "flag": "FLAG_0x17A"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json
index d2d4ad16f..fc115f22b 100644
--- a/data/maps/PokemonTower_5F/map.json
+++ b/data/maps/PokemonTower_5F/map.json
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_5F_EventScript_1BE789",
-      "flag": "379"
+      "flag": "FLAG_0x17B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_5F_EventScript_1BEBB3",
-      "flag": "464"
+      "flag": "FLAG_0x1D0"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json
index 225dac857..4a20cdaed 100644
--- a/data/maps/PokemonTower_6F/map.json
+++ b/data/maps/PokemonTower_6F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_6F_EventScript_1BE796",
-      "flag": "380"
+      "flag": "FLAG_0x17C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_6F_EventScript_1BE7A3",
-      "flag": "381"
+      "flag": "FLAG_0x17D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json
index d1d2e8f61..e6183274c 100644
--- a/data/maps/PokemonTower_7F/map.json
+++ b/data/maps/PokemonTower_7F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PokemonTower_7F_EventScript_16355A",
-      "flag": "52"
+      "flag": "FLAG_0x034"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "PokemonTower_7F_EventScript_163586",
-      "flag": "94"
+      "flag": "FLAG_0x05E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "PokemonTower_7F_EventScript_16363D",
-      "flag": "131"
+      "flag": "FLAG_0x083"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "PokemonTower_7F_EventScript_1636D6",
-      "flag": "132"
+      "flag": "FLAG_0x084"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json
index 59cac8021..1f9ab99eb 100644
--- a/data/maps/PowerPlant/map.json
+++ b/data/maps/PowerPlant/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PowerPlant_EventScript_1BE91C",
-      "flag": "410"
+      "flag": "FLAG_0x19A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PowerPlant_EventScript_1BE929",
-      "flag": "411"
+      "flag": "FLAG_0x19B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PowerPlant_EventScript_1BE936",
-      "flag": "412"
+      "flag": "FLAG_0x19C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PowerPlant_EventScript_1BE943",
-      "flag": "413"
+      "flag": "FLAG_0x19D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PowerPlant_EventScript_1BE950",
-      "flag": "414"
+      "flag": "FLAG_0x19E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ZAPDOS",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PowerPlant_EventScript_1637B8",
-      "flag": "93"
+      "flag": "FLAG_0x05D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PowerPlant_EventScript_16388D",
-      "flag": "134"
+      "flag": "FLAG_0x086"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "PowerPlant_EventScript_16382F",
-      "flag": "133"
+      "flag": "FLAG_0x085"
     }
   ],
   "warp_events": [
diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json
index 29f5d11de..48413cccb 100644
--- a/data/maps/RockTunnel_1F/map.json
+++ b/data/maps/RockTunnel_1F/map.json
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_1F_EventScript_1BEB0A",
-      "flag": "451"
+      "flag": "FLAG_0x1C3"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_1F_EventScript_1BEB17",
-      "flag": "452"
+      "flag": "FLAG_0x1C4"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_1F_EventScript_1BEB24",
-      "flag": "453"
+      "flag": "FLAG_0x1C5"
     }
   ],
   "warp_events": [
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
index c4e1b42ce..709936b91 100644
--- a/data/maps/RockTunnel_B1F/map.json
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BEB31",
-      "flag": "454"
+      "flag": "FLAG_0x1C6"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BEB3E",
-      "flag": "455"
+      "flag": "FLAG_0x1C7"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -167,7 +167,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -180,7 +180,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -193,7 +193,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -206,7 +206,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -219,7 +219,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -232,7 +232,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -245,7 +245,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "24"
+      "flag": "FLAG_0x018"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -258,7 +258,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "25"
+      "flag": "FLAG_0x019"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -271,7 +271,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "26"
+      "flag": "FLAG_0x01A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -284,7 +284,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "27"
+      "flag": "FLAG_0x01B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -297,7 +297,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "28"
+      "flag": "FLAG_0x01C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -310,7 +310,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "29"
+      "flag": "FLAG_0x01D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -323,7 +323,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "30"
+      "flag": "FLAG_0x01E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -336,7 +336,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "31"
+      "flag": "FLAG_0x01F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -349,7 +349,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RockTunnel_B1F_EventScript_1BE00C",
-      "flag": "17"
+      "flag": "FLAG_0x011"
     }
   ],
   "warp_events": [
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
index 4f970c68d..fed09fca0 100644
--- a/data/maps/RocketHideout_B1F/map.json
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
       "script": "RocketHideout_B1F_EventScript_1611C5",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "RocketHideout_B1F_EventScript_1611AE",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "RocketHideout_B1F_EventScript_1611F3",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "RocketHideout_B1F_EventScript_1611DC",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -76,7 +76,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "RocketHideout_B1F_EventScript_16120A",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B1F_EventScript_1BE6C6",
-      "flag": "364"
+      "flag": "FLAG_0x16C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B1F_EventScript_1BE6D3",
-      "flag": "365"
+      "flag": "FLAG_0x16D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index 4be94d6af..abb2a4869 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "RocketHideout_B2F_EventScript_1612A2",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B2F_EventScript_1BE6E0",
-      "flag": "366"
+      "flag": "FLAG_0x16E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B2F_EventScript_1BE6ED",
-      "flag": "367"
+      "flag": "FLAG_0x16F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B2F_EventScript_1BE6FA",
-      "flag": "368"
+      "flag": "FLAG_0x170"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B2F_EventScript_1BE707",
-      "flag": "369"
+      "flag": "FLAG_0x171"
     }
   ],
   "warp_events": [
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
index a67f9c37e..fee71066d 100644
--- a/data/maps/RocketHideout_B3F/map.json
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "RocketHideout_B3F_EventScript_1612D1",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "RocketHideout_B3F_EventScript_1612BA",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B3F_EventScript_1BE714",
-      "flag": "370"
+      "flag": "FLAG_0x172"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B3F_EventScript_1BE721",
-      "flag": "371"
+      "flag": "FLAG_0x173"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B3F_EventScript_1BEBCD",
-      "flag": "466"
+      "flag": "FLAG_0x1D2"
     }
   ],
   "warp_events": [
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index 013b6eb15..f41c5a420 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B4F_EventScript_161317",
-      "flag": "56"
+      "flag": "FLAG_0x038"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B4F_EventScript_161363",
-      "flag": "55"
+      "flag": "FLAG_0x037"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "RocketHideout_B4F_EventScript_161381",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B4F_EventScript_1613AD",
-      "flag": "54"
+      "flag": "FLAG_0x036"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -76,7 +76,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B4F_EventScript_161418",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -89,7 +89,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B4F_EventScript_1613CE",
-      "flag": "173"
+      "flag": "FLAG_0x0AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B4F_EventScript_1BE72E",
-      "flag": "372"
+      "flag": "FLAG_0x174"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B4F_EventScript_1BE73B",
-      "flag": "373"
+      "flag": "FLAG_0x175"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "RocketHideout_B4F_EventScript_1BE748",
-      "flag": "374"
+      "flag": "FLAG_0x176"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json
index 119352969..ff05d885e 100644
--- a/data/maps/Route10/map.json
+++ b/data/maps/Route10/map.json
@@ -113,7 +113,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route10_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -126,7 +126,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route10_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -139,7 +139,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route10_EventScript_1BDF13",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -152,7 +152,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route10_EventScript_1BDF13",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json
index 73355e87c..a8e42604f 100644
--- a/data/maps/Route10_PokemonCenter_2F/map.json
+++ b/data/maps/Route10_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json
index aa6a4f459..59ca5b8fe 100644
--- a/data/maps/Route11/map.json
+++ b/data/maps/Route11/map.json
@@ -165,7 +165,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route11_EventScript_1BEAF0",
-      "flag": "449"
+      "flag": "FLAG_0x1C1"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -178,7 +178,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route11_EventScript_1BEB99",
-      "flag": "462"
+      "flag": "FLAG_0x1CE"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -191,7 +191,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route11_EventScript_1BEBA6",
-      "flag": "463"
+      "flag": "FLAG_0x1CF"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json
index c5e15685d..9488352bc 100644
--- a/data/maps/Route12/map.json
+++ b/data/maps/Route12/map.json
@@ -92,7 +92,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route12_EventScript_168014",
-      "flag": "84"
+      "flag": "FLAG_0x054"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKER",
@@ -144,7 +144,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route12_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -157,7 +157,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route12_EventScript_1BE7B0",
-      "flag": "382"
+      "flag": "FLAG_0x17E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -170,7 +170,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route12_EventScript_1BE7BD",
-      "flag": "383"
+      "flag": "FLAG_0x17F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BEAUTY",
@@ -209,7 +209,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route12_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json
index aca567b0d..215ad80ee 100644
--- a/data/maps/Route13/map.json
+++ b/data/maps/Route13/map.json
@@ -165,7 +165,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route13_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     }
   ],
   "warp_events": [],
diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json
index 025e2b85a..4537ad1d9 100644
--- a/data/maps/Route14/map.json
+++ b/data/maps/Route14/map.json
@@ -165,7 +165,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route14_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -178,7 +178,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route14_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -191,7 +191,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route14_EventScript_1BDF13",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
index fdd8ace65..80e04eb86 100644
--- a/data/maps/Route15/map.json
+++ b/data/maps/Route15/map.json
@@ -165,7 +165,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route15_EventScript_1BE7CA",
-      "flag": "384"
+      "flag": "FLAG_0x180"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
index 36d03530a..36e3a4fa0 100644
--- a/data/maps/Route16/map.json
+++ b/data/maps/Route16/map.json
@@ -113,7 +113,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route16_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BEAUTY",
@@ -152,7 +152,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route16_EventScript_168121",
-      "flag": "128"
+      "flag": "FLAG_0x080"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
index fd9c5c069..4d68aacb4 100644
--- a/data/maps/Route2/map.json
+++ b/data/maps/Route2/map.json
@@ -35,7 +35,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route2_EventScript_1BDF13",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -48,7 +48,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route2_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -61,7 +61,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route2_EventScript_1BDF13",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -74,7 +74,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route2_EventScript_1BDF13",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -87,7 +87,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route2_EventScript_1BE58E",
-      "flag": "340"
+      "flag": "FLAG_0x154"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -100,7 +100,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route2_EventScript_1BE59B",
-      "flag": "341"
+      "flag": "FLAG_0x155"
     },
     {
       "graphics_id": "65375",
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
index 605d5eb14..aef0d0936 100644
--- a/data/maps/Route22/map.json
+++ b/data/maps/Route22/map.json
@@ -35,7 +35,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "79"
+      "flag": "FLAG_0x04F"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
index 0d7507633..effe42476 100644
--- a/data/maps/Route24/map.json
+++ b/data/maps/Route24/map.json
@@ -35,7 +35,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route24_EventScript_168620",
-      "flag": "49"
+      "flag": "FLAG_0x031"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CAMPER",
@@ -126,7 +126,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route24_EventScript_1BE644",
-      "flag": "354"
+      "flag": "FLAG_0x162"
     }
   ],
   "warp_events": [],
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
index 0b79dde41..23f1cda54 100644
--- a/data/maps/Route25/map.json
+++ b/data/maps/Route25/map.json
@@ -147,7 +147,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route25_EventScript_1BE651",
-      "flag": "355"
+      "flag": "FLAG_0x163"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -160,7 +160,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route25_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BEAUTY",
diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json
index 128acb099..fc102e8e5 100644
--- a/data/maps/Route25_SeaCottage/map.json
+++ b/data/maps/Route25_SeaCottage/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route25_SeaCottage_EventScript_17054B",
-      "flag": "51"
+      "flag": "FLAG_0x033"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CLEFAIRY",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route25_SeaCottage_EventScript_17054B",
-      "flag": "50"
+      "flag": "FLAG_0x032"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
index 7b0026c94..5f2a32fca 100644
--- a/data/maps/Route4/map.json
+++ b/data/maps/Route4/map.json
@@ -61,7 +61,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route4_EventScript_1BE637",
-      "flag": "353"
+      "flag": "FLAG_0x161"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BOY",
diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json
index 45e1dd929..a7ebc2c26 100644
--- a/data/maps/Route4_PokemonCenter_2F/map.json
+++ b/data/maps/Route4_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index 41057eafb..500a3abd4 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -152,7 +152,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route8_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -165,7 +165,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route8_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json
index 1ef29c698..9a49d9314 100644
--- a/data/maps/Route9/map.json
+++ b/data/maps/Route9/map.json
@@ -152,7 +152,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route9_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -165,7 +165,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route9_EventScript_1BE6B9",
-      "flag": "363"
+      "flag": "FLAG_0x16B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -178,7 +178,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "Route9_EventScript_1BEAFD",
-      "flag": "450"
+      "flag": "FLAG_0x1C2"
     }
   ],
   "warp_events": [],
diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json
index 5793556e0..cb55f49a6 100644
--- a/data/maps/SSAnne_1F_Room2/map.json
+++ b/data/maps/SSAnne_1F_Room2/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SSAnne_1F_Room2_EventScript_1BE65E",
-      "flag": "356"
+      "flag": "FLAG_0x164"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json
index 9c9094a9e..f763d00f9 100644
--- a/data/maps/SSAnne_2F_Corridor/map.json
+++ b/data/maps/SSAnne_2F_Corridor/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "61"
+      "flag": "FLAG_0x03D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SAILOR",
diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json
index ec5dd93e0..6586004ab 100644
--- a/data/maps/SSAnne_2F_Room2/map.json
+++ b/data/maps/SSAnne_2F_Room2/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SSAnne_2F_Room2_EventScript_1BE66B",
-      "flag": "357"
+      "flag": "FLAG_0x165"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json
index 3a67ca542..fa0aca76b 100644
--- a/data/maps/SSAnne_2F_Room4/map.json
+++ b/data/maps/SSAnne_2F_Room4/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SSAnne_2F_Room4_EventScript_1BE678",
-      "flag": "358"
+      "flag": "FLAG_0x166"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json
index c72190617..3009045a3 100644
--- a/data/maps/SSAnne_B1F_Room2/map.json
+++ b/data/maps/SSAnne_B1F_Room2/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SSAnne_B1F_Room2_EventScript_1BE685",
-      "flag": "359"
+      "flag": "FLAG_0x167"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json
index e452c6161..f1cbab62d 100644
--- a/data/maps/SSAnne_B1F_Room3/map.json
+++ b/data/maps/SSAnne_B1F_Room3/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SSAnne_B1F_Room3_EventScript_1BE692",
-      "flag": "360"
+      "flag": "FLAG_0x168"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json
index 249582a93..6ff25abb3 100644
--- a/data/maps/SSAnne_B1F_Room5/map.json
+++ b/data/maps/SSAnne_B1F_Room5/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SSAnne_B1F_Room5_EventScript_1BE69F",
-      "flag": "361"
+      "flag": "FLAG_0x169"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json
index a3c567ea9..56d68287b 100644
--- a/data/maps/SSAnne_Exterior/map.json
+++ b/data/maps/SSAnne_Exterior/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "135"
+      "flag": "FLAG_0x087"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
index be4d95f8b..980304be4 100644
--- a/data/maps/SSAnne_Kitchen/map.json
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SSAnne_Kitchen_EventScript_1BE6AC",
-      "flag": "362"
+      "flag": "FLAG_0x16A"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json
index e97b979b7..90999fd84 100644
--- a/data/maps/SafariZone_Center/map.json
+++ b/data/maps/SafariZone_Center/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_Center_EventScript_1BE7D7",
-      "flag": "385"
+      "flag": "FLAG_0x181"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json
index 9495368ad..bc67fc7f2 100644
--- a/data/maps/SafariZone_East/map.json
+++ b/data/maps/SafariZone_East/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_East_EventScript_1BE7E4",
-      "flag": "386"
+      "flag": "FLAG_0x182"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_East_EventScript_1BE7F1",
-      "flag": "387"
+      "flag": "FLAG_0x183"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_East_EventScript_1BE7FE",
-      "flag": "388"
+      "flag": "FLAG_0x184"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_East_EventScript_1BE80B",
-      "flag": "389"
+      "flag": "FLAG_0x185"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index c45a2bbda..d39f6fc7b 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_North_EventScript_1BE818",
-      "flag": "390"
+      "flag": "FLAG_0x186"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_North_EventScript_1BE825",
-      "flag": "391"
+      "flag": "FLAG_0x187"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_North_EventScript_1BEBDA",
-      "flag": "467"
+      "flag": "FLAG_0x1D3"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json
index dd0db9475..6d55d24a6 100644
--- a/data/maps/SafariZone_West/map.json
+++ b/data/maps/SafariZone_West/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_West_EventScript_1BE83F",
-      "flag": "393"
+      "flag": "FLAG_0x189"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_West_EventScript_1BE832",
-      "flag": "392"
+      "flag": "FLAG_0x188"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_West_EventScript_1BE84C",
-      "flag": "394"
+      "flag": "FLAG_0x18A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SafariZone_West_EventScript_1BE859",
-      "flag": "395"
+      "flag": "FLAG_0x18B"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
index 7064178fc..9eb079d11 100644
--- a/data/maps/SaffronCity/map.json
+++ b/data/maps/SaffronCity/map.json
@@ -46,7 +46,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_16737A",
-      "flag": "62"
+      "flag": "FLAG_0x03E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -59,7 +59,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_167383",
-      "flag": "62"
+      "flag": "FLAG_0x03E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -72,7 +72,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_16738C",
-      "flag": "62"
+      "flag": "FLAG_0x03E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -85,7 +85,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_167395",
-      "flag": "62"
+      "flag": "FLAG_0x03E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -98,7 +98,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_16739E",
-      "flag": "62"
+      "flag": "FLAG_0x03E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -111,7 +111,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_1673B9",
-      "flag": "62"
+      "flag": "FLAG_0x03E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -124,7 +124,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_1673B0",
-      "flag": "62"
+      "flag": "FLAG_0x03E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -137,7 +137,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_1673A7",
-      "flag": "62"
+      "flag": "FLAG_0x03E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
@@ -150,7 +150,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_1673EC",
-      "flag": "63"
+      "flag": "FLAG_0x03F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_M",
@@ -163,7 +163,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_1673E3",
-      "flag": "63"
+      "flag": "FLAG_0x03F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_MAN",
@@ -176,7 +176,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_16741A",
-      "flag": "63"
+      "flag": "FLAG_0x03F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BOY",
@@ -189,7 +189,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_1673FE",
-      "flag": "63"
+      "flag": "FLAG_0x03F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_PIDGEOT",
@@ -202,7 +202,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_167407",
-      "flag": "63"
+      "flag": "FLAG_0x03F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LASS",
@@ -215,7 +215,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_1673F5",
-      "flag": "63"
+      "flag": "FLAG_0x03F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
@@ -228,7 +228,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_EventScript_1AD03A",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json
index 1645e564a..5830f52e9 100644
--- a/data/maps/SaffronCity_Dojo/map.json
+++ b/data/maps/SaffronCity_Dojo/map.json
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_Dojo_EventScript_16EC00",
-      "flag": "96"
+      "flag": "FLAG_0x060"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_Dojo_EventScript_16EC46",
-      "flag": "97"
+      "flag": "FLAG_0x061"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json
index f963d1184..0aacd178a 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
-      "flag": "174"
+      "flag": "FLAG_0x0AE"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
-      "flag": "174"
+      "flag": "FLAG_0x0AE"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json
index ed564ac70..a093c38f1 100644
--- a/data/maps/SaffronCity_PokemonCenter_2F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
index 3bf92e3fb..07a8cfa61 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D",
-      "flag": "110"
+      "flag": "FLAG_0x06E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKER",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF",
-      "flag": "109"
+      "flag": "FLAG_0x06D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BEAUTY",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521",
-      "flag": "111"
+      "flag": "FLAG_0x06F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583",
-      "flag": "108"
+      "flag": "FLAG_0x06C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json
index c7d7d89f3..96bc7f42a 100644
--- a/data/maps/SeafoamIslands_1F/map.json
+++ b/data/maps/SeafoamIslands_1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 66,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_1F_EventScript_1BE11D",
-      "flag": "64"
+      "flag": "FLAG_0x040"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
       "trainer_type": 67,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_1F_EventScript_1BE11D",
-      "flag": "65"
+      "flag": "FLAG_0x041"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_1F_EventScript_1BEBE7",
-      "flag": "468"
+      "flag": "FLAG_0x1D4"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json
index 2cf41f4f2..1cbfd79ec 100644
--- a/data/maps/SeafoamIslands_B1F/map.json
+++ b/data/maps/SeafoamIslands_B1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 68,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B1F_EventScript_1BE11D",
-      "flag": "66"
+      "flag": "FLAG_0x042"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
       "trainer_type": 69,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B1F_EventScript_1BE11D",
-      "flag": "67"
+      "flag": "FLAG_0x043"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B1F_EventScript_1BEBF4",
-      "flag": "469"
+      "flag": "FLAG_0x1D5"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B1F_EventScript_1BEC01",
-      "flag": "470"
+      "flag": "FLAG_0x1D6"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json
index 1eaf0d500..af9c18c1d 100644
--- a/data/maps/SeafoamIslands_B2F/map.json
+++ b/data/maps/SeafoamIslands_B2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 70,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B2F_EventScript_1BE11D",
-      "flag": "68"
+      "flag": "FLAG_0x044"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
       "trainer_type": 71,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B2F_EventScript_1BE11D",
-      "flag": "69"
+      "flag": "FLAG_0x045"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B2F_EventScript_1BEC0E",
-      "flag": "471"
+      "flag": "FLAG_0x1D7"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json
index 3a202884c..82b9e86f0 100644
--- a/data/maps/SeafoamIslands_B3F/map.json
+++ b/data/maps/SeafoamIslands_B3F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "70"
+      "flag": "FLAG_0x046"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "71"
+      "flag": "FLAG_0x047"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -50,7 +50,7 @@
       "trainer_type": 77,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B3F_EventScript_1BE11D",
-      "flag": "74"
+      "flag": "FLAG_0x04A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B3F_EventScript_1BE11D",
-      "flag": "75"
+      "flag": "FLAG_0x04B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B3F_EventScript_1BE11D",
-      "flag": "73"
+      "flag": "FLAG_0x049"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -89,7 +89,7 @@
       "trainer_type": 76,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B3F_EventScript_1BE11D",
-      "flag": "72"
+      "flag": "FLAG_0x048"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json
index c721e7811..3425a67d9 100644
--- a/data/maps/SeafoamIslands_B4F/map.json
+++ b/data/maps/SeafoamIslands_B4F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "76"
+      "flag": "FLAG_0x04C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "77"
+      "flag": "FLAG_0x04D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ARTICUNO",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B4F_EventScript_1631AC",
-      "flag": "130"
+      "flag": "FLAG_0x082"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SeafoamIslands_B4F_EventScript_1BEC1B",
-      "flag": "472"
+      "flag": "FLAG_0x1D8"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json
index 587f07638..20457a028 100644
--- a/data/maps/SevenIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
-      "flag": "157"
+      "flag": "FLAG_0x09D"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json
index 28e1dd365..55aeabf03 100644
--- a/data/maps/SevenIsland_PokemonCenter_2F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json
index 504a835b9..ca6441141 100644
--- a/data/maps/SevenIsland_SevaultCanyon/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon/map.json
@@ -139,7 +139,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -165,7 +165,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -178,7 +178,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -191,7 +191,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -204,7 +204,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -230,7 +230,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
-      "flag": "27"
+      "flag": "FLAG_0x01B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -243,7 +243,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BECDE",
-      "flag": "487"
+      "flag": "FLAG_0x1E7"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -256,7 +256,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BECEB",
-      "flag": "488"
+      "flag": "FLAG_0x1E8"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -269,7 +269,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_EventScript_1BECF8",
-      "flag": "489"
+      "flag": "FLAG_0x1E9"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json
index 39afb5a0a..32e68bb2f 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC",
-      "flag": "509"
+      "flag": "FLAG_0x1FD"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json
index 532daae51..727e5af6e 100644
--- a/data/maps/SevenIsland_TrainerTower_1F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8",
-      "flag": "2"
+      "flag": "FLAG_0x002"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE",
-      "flag": "3"
+      "flag": "FLAG_0x003"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4",
-      "flag": "4"
+      "flag": "FLAG_0x004"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_3",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA",
-      "flag": "5"
+      "flag": "FLAG_0x005"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json
index e8de15ddc..e36264bbe 100644
--- a/data/maps/SevenIsland_TrainerTower_2F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8",
-      "flag": "2"
+      "flag": "FLAG_0x002"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE",
-      "flag": "3"
+      "flag": "FLAG_0x003"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4",
-      "flag": "4"
+      "flag": "FLAG_0x004"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_3",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA",
-      "flag": "5"
+      "flag": "FLAG_0x005"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json
index 802ba5bd4..4fa7b638e 100644
--- a/data/maps/SevenIsland_TrainerTower_3F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_3F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8",
-      "flag": "2"
+      "flag": "FLAG_0x002"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE",
-      "flag": "3"
+      "flag": "FLAG_0x003"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4",
-      "flag": "4"
+      "flag": "FLAG_0x004"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_3",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA",
-      "flag": "5"
+      "flag": "FLAG_0x005"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json
index 3774fc22f..76436506e 100644
--- a/data/maps/SevenIsland_TrainerTower_4F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_4F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8",
-      "flag": "2"
+      "flag": "FLAG_0x002"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE",
-      "flag": "3"
+      "flag": "FLAG_0x003"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4",
-      "flag": "4"
+      "flag": "FLAG_0x004"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_3",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA",
-      "flag": "5"
+      "flag": "FLAG_0x005"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json
index dc69e9504..ed02f71d1 100644
--- a/data/maps/SevenIsland_TrainerTower_5F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_5F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8",
-      "flag": "2"
+      "flag": "FLAG_0x002"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE",
-      "flag": "3"
+      "flag": "FLAG_0x003"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4",
-      "flag": "4"
+      "flag": "FLAG_0x004"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_3",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA",
-      "flag": "5"
+      "flag": "FLAG_0x005"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json
index 44d5f950a..c3bb44867 100644
--- a/data/maps/SevenIsland_TrainerTower_6F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_6F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8",
-      "flag": "2"
+      "flag": "FLAG_0x002"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE",
-      "flag": "3"
+      "flag": "FLAG_0x003"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4",
-      "flag": "4"
+      "flag": "FLAG_0x004"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_3",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA",
-      "flag": "5"
+      "flag": "FLAG_0x005"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json
index 4d063d090..749911494 100644
--- a/data/maps/SevenIsland_TrainerTower_7F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_7F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8",
-      "flag": "2"
+      "flag": "FLAG_0x002"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE",
-      "flag": "3"
+      "flag": "FLAG_0x003"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4",
-      "flag": "4"
+      "flag": "FLAG_0x004"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_3",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA",
-      "flag": "5"
+      "flag": "FLAG_0x005"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json
index 065169b6d..64563e4cc 100644
--- a/data/maps/SevenIsland_TrainerTower_8F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_8F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8",
-      "flag": "2"
+      "flag": "FLAG_0x002"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE",
-      "flag": "3"
+      "flag": "FLAG_0x003"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4",
-      "flag": "4"
+      "flag": "FLAG_0x004"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_3",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA",
-      "flag": "5"
+      "flag": "FLAG_0x005"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json
index d75337d2e..473ffbb68 100644
--- a/data/maps/SevenIsland_TrainerTower_Roof/map.json
+++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0",
-      "flag": "6"
+      "flag": "FLAG_0x006"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json
index 8faa6e7f5..61e37007b 100644
--- a/data/maps/SilphCo_10F/map.json
+++ b/data/maps/SilphCo_10F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "SilphCo_10F_EventScript_161DC0",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_F",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "SilphCo_10F_EventScript_161DD7",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_10F_EventScript_1BE8F5",
-      "flag": "407"
+      "flag": "FLAG_0x197"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_10F_EventScript_1BE902",
-      "flag": "408"
+      "flag": "FLAG_0x198"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_10F_EventScript_1BE90F",
-      "flag": "409"
+      "flag": "FLAG_0x199"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json
index 4014beb4e..5ee4065e9 100644
--- a/data/maps/SilphCo_11F/map.json
+++ b/data/maps/SilphCo_11F/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
       "script": "SilphCo_11F_EventScript_161F40",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_11F_EventScript_1BEB58",
-      "flag": "457"
+      "flag": "FLAG_0x1C9"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -89,7 +89,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
       "script": "SilphCo_11F_EventScript_161F57",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json
index 62409cf7e..b054dfe80 100644
--- a/data/maps/SilphCo_1F/map.json
+++ b/data/maps/SilphCo_1F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_1F_EventScript_16162F",
-      "flag": "63"
+      "flag": "FLAG_0x03F"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
index 7b2b65641..d6c62a776 100644
--- a/data/maps/SilphCo_2F/map.json
+++ b/data/maps/SilphCo_2F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
       "script": "SilphCo_2F_EventScript_1616AE",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "SilphCo_2F_EventScript_161680",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "SilphCo_2F_EventScript_161697",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_2F_EventScript_161669",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
index 0567a351f..b1e95071d 100644
--- a/data/maps/SilphCo_3F/map.json
+++ b/data/maps/SilphCo_3F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "SilphCo_3F_EventScript_16171F",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_M",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_3F_EventScript_161708",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_3F_EventScript_1BE866",
-      "flag": "396"
+      "flag": "FLAG_0x18C"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json
index dc0e5a20b..65150b0ef 100644
--- a/data/maps/SilphCo_4F/map.json
+++ b/data/maps/SilphCo_4F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "SilphCo_4F_EventScript_1617A7",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
       "script": "SilphCo_4F_EventScript_161790",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "SilphCo_4F_EventScript_161779",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_M",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_4F_EventScript_1BE873",
-      "flag": "397"
+      "flag": "FLAG_0x18D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_4F_EventScript_1BE880",
-      "flag": "398"
+      "flag": "FLAG_0x18E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_4F_EventScript_1BE88D",
-      "flag": "399"
+      "flag": "FLAG_0x18F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_4F_EventScript_1BEE09",
-      "flag": "510"
+      "flag": "FLAG_0x1FE"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json
index 860cc1701..33808bb0b 100644
--- a/data/maps/SilphCo_5F/map.json
+++ b/data/maps/SilphCo_5F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "SilphCo_5F_EventScript_161853",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKER",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "SilphCo_5F_EventScript_16186A",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_M",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "SilphCo_5F_EventScript_161825",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -76,7 +76,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "SilphCo_5F_EventScript_16183C",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_5F_EventScript_1BE89A",
-      "flag": "400"
+      "flag": "FLAG_0x190"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_5F_EventScript_1BE8A7",
-      "flag": "401"
+      "flag": "FLAG_0x191"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_5F_EventScript_1BE8B4",
-      "flag": "402"
+      "flag": "FLAG_0x192"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json
index e41beefea..f9f43b61e 100644
--- a/data/maps/SilphCo_6F/map.json
+++ b/data/maps/SilphCo_6F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "SilphCo_6F_EventScript_161956",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_M",
@@ -102,7 +102,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "SilphCo_6F_EventScript_16193F",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_6F_EventScript_1BE8C1",
-      "flag": "403"
+      "flag": "FLAG_0x193"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_6F_EventScript_1BE8CE",
-      "flag": "404"
+      "flag": "FLAG_0x194"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -141,7 +141,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "SilphCo_6F_EventScript_16196D",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json
index 67bc96a41..7b92929e3 100644
--- a/data/maps/SilphCo_7F/map.json
+++ b/data/maps/SilphCo_7F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "78"
+      "flag": "FLAG_0x04E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_M",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "SilphCo_7F_EventScript_161C1A",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "SilphCo_7F_EventScript_161C31",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -76,7 +76,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "SilphCo_7F_EventScript_161C48",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_F",
@@ -128,7 +128,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "SilphCo_7F_EventScript_161C03",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_7F_EventScript_1BE8DB",
-      "flag": "405"
+      "flag": "FLAG_0x195"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_7F_EventScript_1BE8E8",
-      "flag": "406"
+      "flag": "FLAG_0x196"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
index 7e51d2dc5..2f06fce10 100644
--- a/data/maps/SilphCo_8F/map.json
+++ b/data/maps/SilphCo_8F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
       "script": "SilphCo_8F_EventScript_161CB0",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
       "script": "SilphCo_8F_EventScript_161CC7",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -50,7 +50,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "SilphCo_8F_EventScript_161C99",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WORKER_M",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SilphCo_8F_EventScript_1BEB4B",
-      "flag": "456"
+      "flag": "FLAG_0x1C8"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json
index d6edefc9b..fa79b9017 100644
--- a/data/maps/SilphCo_9F/map.json
+++ b/data/maps/SilphCo_9F/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
       "script": "SilphCo_9F_EventScript_161D41",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
       "script": "SilphCo_9F_EventScript_161D6F",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
@@ -63,7 +63,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
       "script": "SilphCo_9F_EventScript_161D58",
-      "flag": "83"
+      "flag": "FLAG_0x053"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
index b0b164629..e05e304e9 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5",
-      "flag": "143"
+      "flag": "FLAG_0x08F"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "144"
+      "flag": "FLAG_0x090"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json
index 025217635..17f40e789 100644
--- a/data/maps/SixIsland_OutcastIsland/map.json
+++ b/data/maps/SixIsland_OutcastIsland/map.json
@@ -30,7 +30,7 @@
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
       "script": "SixIsland_OutcastIsland_EventScript_168B16",
-      "flag": "136"
+      "flag": "FLAG_0x088"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_FISHER",
@@ -108,7 +108,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_OutcastIsland_EventScript_1BEC90",
-      "flag": "481"
+      "flag": "FLAG_0x1E1"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json
index dbb6c6757..67a35c1ee 100644
--- a/data/maps/SixIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_1F/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "152"
+      "flag": "FLAG_0x098"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_HIKER",
diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json
index a5d38fc08..3adcd4e33 100644
--- a/data/maps/SixIsland_PokemonCenter_2F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json
index 77ec0eeaa..6ab143f1d 100644
--- a/data/maps/SixIsland_RuinValley/map.json
+++ b/data/maps/SixIsland_RuinValley/map.json
@@ -30,7 +30,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_RuinValley_EventScript_168B6D",
-      "flag": "142"
+      "flag": "FLAG_0x08E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_HIKER",
@@ -212,7 +212,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_RuinValley_EventScript_1BECC4",
-      "flag": "485"
+      "flag": "FLAG_0x1E5"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -225,7 +225,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_RuinValley_EventScript_1BECB7",
-      "flag": "484"
+      "flag": "FLAG_0x1E4"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -238,7 +238,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_RuinValley_EventScript_1BECD1",
-      "flag": "486"
+      "flag": "FLAG_0x1E6"
     }
   ],
   "warp_events": [
diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json
index 90e0ddf10..9f6d0a73a 100644
--- a/data/maps/SixIsland_WaterPath/map.json
+++ b/data/maps/SixIsland_WaterPath/map.json
@@ -131,7 +131,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_WaterPath_EventScript_1BEC9D",
-      "flag": "482"
+      "flag": "FLAG_0x1E2"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -144,7 +144,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "SixIsland_WaterPath_EventScript_1BECAA",
-      "flag": "483"
+      "flag": "FLAG_0x1E3"
     }
   ],
   "warp_events": [
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
index f42fb0dd7..674f2260f 100644
--- a/data/maps/ThreeIsland/map.json
+++ b/data/maps/ThreeIsland/map.json
@@ -35,7 +35,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1677E5",
-      "flag": "126"
+      "flag": "FLAG_0x07E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_MAN",
@@ -48,7 +48,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_167989",
-      "flag": "126"
+      "flag": "FLAG_0x07E"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BIKER",
@@ -61,7 +61,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1677D8",
-      "flag": "145"
+      "flag": "FLAG_0x091"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BIKER",
@@ -74,7 +74,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1677D8",
-      "flag": "121"
+      "flag": "FLAG_0x079"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BIKER",
@@ -87,7 +87,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1677D8",
-      "flag": "121"
+      "flag": "FLAG_0x079"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BIKER",
@@ -100,7 +100,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1677D8",
-      "flag": "121"
+      "flag": "FLAG_0x079"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BIKER",
@@ -113,7 +113,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1677D8",
-      "flag": "121"
+      "flag": "FLAG_0x079"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BIKER",
@@ -126,7 +126,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1677D8",
-      "flag": "121"
+      "flag": "FLAG_0x079"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -139,7 +139,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -152,7 +152,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_1BEABC",
-      "flag": "443"
+      "flag": "FLAG_0x1BB"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
@@ -204,7 +204,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_EventScript_167CA5",
-      "flag": "121"
+      "flag": "FLAG_0x079"
     }
   ],
   "warp_events": [
diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json
index 323ac255e..bedd0a8b5 100644
--- a/data/maps/ThreeIsland_BerryForest/map.json
+++ b/data/maps/ThreeIsland_BerryForest/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_163C83",
-      "flag": "122"
+      "flag": "FLAG_0x07A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "20"
+      "flag": "FLAG_0x014"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "21"
+      "flag": "FLAG_0x015"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "22"
+      "flag": "FLAG_0x016"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "23"
+      "flag": "FLAG_0x017"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "24"
+      "flag": "FLAG_0x018"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "25"
+      "flag": "FLAG_0x019"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -141,7 +141,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "26"
+      "flag": "FLAG_0x01A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
-      "flag": "27"
+      "flag": "FLAG_0x01B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -167,7 +167,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BED05",
-      "flag": "490"
+      "flag": "FLAG_0x1EA"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -180,7 +180,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BED12",
-      "flag": "491"
+      "flag": "FLAG_0x1EB"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -193,7 +193,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BerryForest_EventScript_1BED1F",
-      "flag": "492"
+      "flag": "FLAG_0x1EC"
     }
   ],
   "warp_events": [
diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json
index c9aaffdff..087c7807f 100644
--- a/data/maps/ThreeIsland_BondBridge/map.json
+++ b/data/maps/ThreeIsland_BondBridge/map.json
@@ -121,7 +121,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BondBridge_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -134,7 +134,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_BondBridge_EventScript_1BDF13",
-      "flag": "19"
+      "flag": "FLAG_0x013"
     }
   ],
   "warp_events": [
diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json
index b9bf65eaf..45b59e396 100644
--- a/data/maps/ThreeIsland_House1/map.json
+++ b/data/maps/ThreeIsland_House1/map.json
@@ -24,7 +24,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_House1_EventScript_17181A",
-      "flag": "118"
+      "flag": "FLAG_0x076"
     }
   ],
   "warp_events": [
diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
index 167aebf6d..e2392fb7d 100644
--- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json
+++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json
index 87552c5f8..e33cf3e1f 100644
--- a/data/maps/ThreeIsland_Port/map.json
+++ b/data/maps/ThreeIsland_Port/map.json
@@ -43,7 +43,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_Port_EventScript_1687CC",
-      "flag": "121"
+      "flag": "FLAG_0x079"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BIKER",
@@ -56,7 +56,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ThreeIsland_Port_EventScript_1687D5",
-      "flag": "121"
+      "flag": "FLAG_0x079"
     }
   ],
   "warp_events": [
diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
index b0ff63ec1..ce882f5ed 100644
--- a/data/maps/TwoIsland/map.json
+++ b/data/maps/TwoIsland/map.json
@@ -43,7 +43,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "TwoIsland_EventScript_167755",
-      "flag": "123"
+      "flag": "FLAG_0x07B"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BEAUTY",
@@ -56,7 +56,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "TwoIsland_EventScript_16775E",
-      "flag": "124"
+      "flag": "FLAG_0x07C"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SAILOR",
@@ -82,7 +82,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "TwoIsland_EventScript_167777",
-      "flag": "125"
+      "flag": "FLAG_0x07D"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -95,7 +95,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "TwoIsland_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -108,7 +108,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "TwoIsland_EventScript_1BEAAF",
-      "flag": "442"
+      "flag": "FLAG_0x1BA"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json
index 2082f25f9..7f49f334a 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/map.json
+++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "0x0",
-      "flag": "116"
+      "flag": "FLAG_0x074"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C",
-      "flag": "117"
+      "flag": "FLAG_0x075"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_MAN",
diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json
index d701f3ccd..f42e4f729 100644
--- a/data/maps/TwoIsland_PokemonCenter_2F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json
index be536383a..770988fc8 100644
--- a/data/maps/UnknownMap_00_04/map.json
+++ b/data/maps/UnknownMap_00_04/map.json
@@ -37,7 +37,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "UnknownMap_00_04_EventScript_1604DA",
-      "flag": "102"
+      "flag": "FLAG_0x066"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_7",
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "UnknownMap_00_04_EventScript_160502",
-      "flag": "106"
+      "flag": "FLAG_0x06A"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_6",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "UnknownMap_00_04_EventScript_1604F8",
-      "flag": "105"
+      "flag": "FLAG_0x069"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_5",
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "UnknownMap_00_04_EventScript_1604EE",
-      "flag": "104"
+      "flag": "FLAG_0x068"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_4",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "UnknownMap_00_04_EventScript_1604E4",
-      "flag": "103"
+      "flag": "FLAG_0x067"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_2",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "UnknownMap_00_04_EventScript_1604D0",
-      "flag": "101"
+      "flag": "FLAG_0x065"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_1",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "UnknownMap_00_04_EventScript_1604C6",
-      "flag": "100"
+      "flag": "FLAG_0x064"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "UnknownMap_00_04_EventScript_1604BC",
-      "flag": "99"
+      "flag": "FLAG_0x063"
     }
   ],
   "warp_events": [
diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json
index ee747f3e1..41805e39f 100644
--- a/data/maps/VermilionCity/map.json
+++ b/data/maps/VermilionCity/map.json
@@ -113,7 +113,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VermilionCity_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -126,7 +126,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VermilionCity_EventScript_166C20",
-      "flag": "161"
+      "flag": "FLAG_0x0A1"
     }
   ],
   "warp_events": [
diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json
index b32eef9b5..5fc06c707 100644
--- a/data/maps/VermilionCity_PokemonCenter_1F/map.json
+++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83",
-      "flag": "160"
+      "flag": "FLAG_0x0A0"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83",
-      "flag": "160"
+      "flag": "FLAG_0x0A0"
     }
   ],
   "warp_events": [
diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json
index c1e3c359d..0b2a3a580 100644
--- a/data/maps/VermilionCity_PokemonCenter_2F/map.json
+++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index add43603e..c3b1d79c0 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -50,7 +50,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_1F_EventScript_1BE9D2",
-      "flag": "425"
+      "flag": "FLAG_0x1A9"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_1F_EventScript_1BE9DF",
-      "flag": "426"
+      "flag": "FLAG_0x1AA"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index 092ade4a5..ec7650c44 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_2F_EventScript_1BE9EC",
-      "flag": "427"
+      "flag": "FLAG_0x1AB"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_2F_EventScript_1BE9F9",
-      "flag": "428"
+      "flag": "FLAG_0x1AC"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_2F_EventScript_1BEA06",
-      "flag": "429"
+      "flag": "FLAG_0x1AD"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_2F_EventScript_1BEA13",
-      "flag": "430"
+      "flag": "FLAG_0x1AE"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -167,7 +167,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_2F_EventScript_1BE11D",
-      "flag": "88"
+      "flag": "FLAG_0x058"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
index e82abc58f..bf95bfae9 100644
--- a/data/maps/VictoryRoad_3F/map.json
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -76,7 +76,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_3F_EventScript_1BEA20",
-      "flag": "431"
+      "flag": "FLAG_0x1AF"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_3F_EventScript_1BEA2D",
-      "flag": "432"
+      "flag": "FLAG_0x1B0"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -115,7 +115,7 @@
       "trainer_type": 88,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "VictoryRoad_3F_EventScript_1BE11D",
-      "flag": "89"
+      "flag": "FLAG_0x059"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json
index 6b132ab5d..469bdb963 100644
--- a/data/maps/ViridianCity/map.json
+++ b/data/maps/ViridianCity/map.json
@@ -53,7 +53,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianCity_EventScript_1BDF13",
-      "flag": "17"
+      "flag": "FLAG_0x011"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
@@ -131,7 +131,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianCity_EventScript_1BDF13",
-      "flag": "18"
+      "flag": "FLAG_0x012"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -144,7 +144,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianCity_EventScript_1BEB8C",
-      "flag": "461"
+      "flag": "FLAG_0x1CD"
     }
   ],
   "warp_events": [
diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json
index bc622f449..e1cdba88a 100644
--- a/data/maps/ViridianCity_Gym/map.json
+++ b/data/maps/ViridianCity_Gym/map.json
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianCity_Gym_EventScript_169ECA",
-      "flag": "85"
+      "flag": "FLAG_0x055"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json
index 27900e068..5e1824f85 100644
--- a/data/maps/ViridianCity_PokemonCenter_2F/map.json
+++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json
@@ -63,7 +63,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_0x070"
     }
   ],
   "warp_events": [
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
index 952013612..b18edb3ef 100644
--- a/data/maps/ViridianForest/map.json
+++ b/data/maps/ViridianForest/map.json
@@ -89,7 +89,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianForest_EventScript_1BE5A8",
-      "flag": "342"
+      "flag": "FLAG_0x156"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianForest_EventScript_1BE5B5",
-      "flag": "343"
+      "flag": "FLAG_0x157"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianForest_EventScript_1BE5C2",
-      "flag": "344"
+      "flag": "FLAG_0x158"
     },
     {
       "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
@@ -154,7 +154,7 @@
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
       "script": "ViridianForest_EventScript_1BEAC9",
-      "flag": "446"
+      "flag": "FLAG_0x1BE"
     }
   ],
   "warp_events": [
diff --git a/include/constants/flags.h b/include/constants/flags.h
index ed7a727e8..3cf229ffb 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -85,7 +85,7 @@
 #define FLAG_0x050               0x50
 #define FLAG_0x051               0x51
 #define FLAG_0x052               0x52
-#define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53
+#define FLAG_0x053               0x53
 #define FLAG_0x054               0x54
 #define FLAG_0x055               0x55
 #define FLAG_0x056               0x56