fix build

32 files changed, 47 insertions, 42 deletions

diff --git a/constants/map_constants.inc b/constants/map_constants.inc
index 6d92c5e65..91f5f029c 100644
--- a/constants/map_constants.inc
+++ b/constants/map_constants.inc
@@ -461,4 +461,9 @@
 
 	new_map_group
 	map_group Route124_DivingTreasureHuntersHouse     @ 33.0
+	
+	.set MAP_None, 0x7F
+	.set GROUP_None, 0x7F
 
+	.set MAP_Undefined, 0xFF
+	.set GROUP_Undefined, 0xFF
diff --git a/data/event_scripts.s b/data/event_scripts.s
index faa9b8406..ebc1a0de8 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -4883,7 +4883,7 @@ S_FallDownHole:: @ 81C6BC5
 	waitmovement 0
 	playse 43
 	delay 60
-	warphole UNDEFINED
+	warphole Undefined
 	waitstate
 	end
 
diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc
index f6142c4b4..a1dd533c1 100644
--- a/data/maps/events/DoubleBattleColosseum.inc
+++ b/data/maps/events/DoubleBattleColosseum.inc
@@ -1,8 +1,8 @@
 DoubleBattleColosseum_MapWarps:: @ 8391428
-	warp_def 5, 8, 3, 127, NONE
-	warp_def 6, 8, 3, 127, NONE
-	warp_def 7, 8, 3, 127, NONE
-	warp_def 8, 8, 3, 127, NONE
+	warp_def 5, 8, 3, 127, None
+	warp_def 6, 8, 3, 127, None
+	warp_def 7, 8, 3, 127, None
+	warp_def 8, 8, 3, 127, None
 
 DoubleBattleColosseum_MapCoordEvents:: @ 8391448
 	coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc
index faf7a5274..7656e2679 100644
--- a/data/maps/events/InsideOfTruck.inc
+++ b/data/maps/events/InsideOfTruck.inc
@@ -4,9 +4,9 @@ InsideOfTruck_MapObjects:: @ 8391618
 	object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
 
 InsideOfTruck_MapWarps:: @ 8391660
-	warp_def 4, 1, 0, 127, NONE
-	warp_def 4, 2, 0, 127, NONE
-	warp_def 4, 3, 0, 127, NONE
+	warp_def 4, 1, 0, 127, None
+	warp_def 4, 2, 0, 127, None
+	warp_def 4, 3, 0, 127, None
 
 InsideOfTruck_MapCoordEvents:: @ 8391678
 	coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
index 896a96649..d35f50db9 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
@@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624
 	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0
 
 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C
-	warp_def 1, 5, 3, 127, NONE
-	warp_def 2, 5, 3, 127, NONE
+	warp_def 1, 5, 3, 127, None
+	warp_def 2, 5, 3, 127, None
 
 LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C
 	map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc
index 7062f61ea..6ef149ab4 100644
--- a/data/maps/events/RecordCorner.inc
+++ b/data/maps/events/RecordCorner.inc
@@ -2,10 +2,10 @@ RecordCorner_MapObjects:: @ 839139C
 	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0
 
 RecordCorner_MapWarps:: @ 83913B4
-	warp_def 8, 9, 3, 127, NONE
-	warp_def 9, 9, 3, 127, NONE
-	warp_def 11, 9, 3, 127, NONE
-	warp_def 10, 9, 3, 127, NONE
+	warp_def 8, 9, 3, 127, None
+	warp_def 9, 9, 3, 127, None
+	warp_def 11, 9, 3, 127, None
+	warp_def 10, 9, 3, 127, None
 
 RecordCorner_MapCoordEvents:: @ 83913D4
 	coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc
index 25bab40da..dd73f50a8 100644
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ b/data/maps/events/SecretBase_BlueCave1.inc
@@ -16,7 +16,7 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_BlueCave1_MapWarps:: @ 838F2F4
-	warp_def 5, 7, 0, 126, NONE
+	warp_def 5, 7, 0, 126, None
 
 SecretBase_BlueCave1_MapEvents:: @ 838F2FC
 	map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc
index a7eac24a4..9b2b6e885 100644
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ b/data/maps/events/SecretBase_BlueCave2.inc
@@ -16,7 +16,7 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_BlueCave2_MapWarps:: @ 838FC0C
-	warp_def 7, 5, 0, 126, NONE
+	warp_def 7, 5, 0, 126, None
 
 SecretBase_BlueCave2_MapEvents:: @ 838FC14
 	map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc
index 202c2bc4e..dd37c2ac5 100644
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ b/data/maps/events/SecretBase_BlueCave3.inc
@@ -16,7 +16,7 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_BlueCave3_MapWarps:: @ 8390524
-	warp_def 4, 15, 0, 126, NONE
+	warp_def 4, 15, 0, 126, None
 
 SecretBase_BlueCave3_MapEvents:: @ 839052C
 	map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc
index 2975c0b37..23ec030e7 100644
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ b/data/maps/events/SecretBase_BlueCave4.inc
@@ -16,7 +16,7 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_BlueCave4_MapWarps:: @ 8390E3C
-	warp_def 4, 15, 0, 126, NONE
+	warp_def 4, 15, 0, 126, None
 
 SecretBase_BlueCave4_MapEvents:: @ 8390E44
 	map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc
index 31e2d0117..0fcac5940 100644
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ b/data/maps/events/SecretBase_BrownCave1.inc
@@ -16,7 +16,7 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_BrownCave1_MapWarps:: @ 838F170
-	warp_def 5, 7, 0, 126, NONE
+	warp_def 5, 7, 0, 126, None
 
 SecretBase_BrownCave1_MapEvents:: @ 838F178
 	map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc
index 93f9a3c03..c305485b8 100644
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ b/data/maps/events/SecretBase_BrownCave2.inc
@@ -16,7 +16,7 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_BrownCave2_MapWarps:: @ 838FA88
-	warp_def 1, 7, 0, 126, NONE
+	warp_def 1, 7, 0, 126, None
 
 SecretBase_BrownCave2_MapEvents:: @ 838FA90
 	map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc
index 5aa5aed7a..65b38542f 100644
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ b/data/maps/events/SecretBase_BrownCave3.inc
@@ -16,7 +16,7 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_BrownCave3_MapWarps:: @ 83903A0
-	warp_def 11, 9, 0, 126, NONE
+	warp_def 11, 9, 0, 126, None
 
 SecretBase_BrownCave3_MapEvents:: @ 83903A8
 	map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc
index fc66e8fb5..782671574 100644
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ b/data/maps/events/SecretBase_BrownCave4.inc
@@ -16,7 +16,7 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_BrownCave4_MapWarps:: @ 8390CB8
-	warp_def 2, 8, 0, 126, NONE
+	warp_def 2, 8, 0, 126, None
 
 SecretBase_BrownCave4_MapEvents:: @ 8390CC0
 	map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc
index dbc8c7593..b30608dbc 100644
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ b/data/maps/events/SecretBase_RedCave1.inc
@@ -16,7 +16,7 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_RedCave1_MapWarps:: @ 838EFEC
-	warp_def 5, 7, 0, 126, NONE
+	warp_def 5, 7, 0, 126, None
 
 SecretBase_RedCave1_MapEvents:: @ 838EFF4
 	map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc
index 910b2c074..eb247278b 100644
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ b/data/maps/events/SecretBase_RedCave2.inc
@@ -16,7 +16,7 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_RedCave2_MapWarps:: @ 838F904
-	warp_def 3, 14, 0, 126, NONE
+	warp_def 3, 14, 0, 126, None
 
 SecretBase_RedCave2_MapEvents:: @ 838F90C
 	map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc
index 8745b272f..f71021236 100644
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ b/data/maps/events/SecretBase_RedCave3.inc
@@ -16,7 +16,7 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_RedCave3_MapWarps:: @ 839021C
-	warp_def 3, 6, 0, 126, NONE
+	warp_def 3, 6, 0, 126, None
 
 SecretBase_RedCave3_MapEvents:: @ 8390224
 	map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc
index 60928ef5c..2ed7c8af5 100644
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ b/data/maps/events/SecretBase_RedCave4.inc
@@ -16,7 +16,7 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_RedCave4_MapWarps:: @ 8390B34
-	warp_def 2, 12, 0, 126, NONE
+	warp_def 2, 12, 0, 126, None
 
 SecretBase_RedCave4_MapEvents:: @ 8390B3C
 	map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc
index 17c2f2530..23387eede 100644
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ b/data/maps/events/SecretBase_Shrub1.inc
@@ -16,7 +16,7 @@ SecretBase_Shrub1_MapObjects:: @ 838F618
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_Shrub1_MapWarps:: @ 838F780
-	warp_def 5, 7, 0, 126, NONE
+	warp_def 5, 7, 0, 126, None
 
 SecretBase_Shrub1_MapEvents:: @ 838F788
 	map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc
index 6b973e730..090a9b0d6 100644
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ b/data/maps/events/SecretBase_Shrub2.inc
@@ -16,7 +16,7 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_Shrub2_MapWarps:: @ 8390098
-	warp_def 7, 5, 0, 126, NONE
+	warp_def 7, 5, 0, 126, None
 
 SecretBase_Shrub2_MapEvents:: @ 83900A0
 	map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc
index 12e2c7c81..7f4370f2d 100644
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ b/data/maps/events/SecretBase_Shrub3.inc
@@ -16,7 +16,7 @@ SecretBase_Shrub3_MapObjects:: @ 8390848
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_Shrub3_MapWarps:: @ 83909B0
-	warp_def 6, 9, 0, 126, NONE
+	warp_def 6, 9, 0, 126, None
 
 SecretBase_Shrub3_MapEvents:: @ 83909B8
 	map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc
index bd3b94522..6aa04277c 100644
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ b/data/maps/events/SecretBase_Shrub4.inc
@@ -16,7 +16,7 @@ SecretBase_Shrub4_MapObjects:: @ 8391160
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_Shrub4_MapWarps:: @ 83912C8
-	warp_def 11, 8, 0, 126, NONE
+	warp_def 11, 8, 0, 126, None
 
 SecretBase_Shrub4_MapEvents:: @ 83912D0
 	map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc
index 465a0d2be..a5d9e2fad 100644
--- a/data/maps/events/SecretBase_Tree1.inc
+++ b/data/maps/events/SecretBase_Tree1.inc
@@ -16,7 +16,7 @@ SecretBase_Tree1_MapObjects:: @ 838F494
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_Tree1_MapWarps:: @ 838F5FC
-	warp_def 5, 7, 0, 126, NONE
+	warp_def 5, 7, 0, 126, None
 
 SecretBase_Tree1_MapEvents:: @ 838F604
 	map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc
index d780ed779..8089c6605 100644
--- a/data/maps/events/SecretBase_Tree2.inc
+++ b/data/maps/events/SecretBase_Tree2.inc
@@ -16,7 +16,7 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_Tree2_MapWarps:: @ 838FF14
-	warp_def 3, 14, 0, 126, NONE
+	warp_def 3, 14, 0, 126, None
 
 SecretBase_Tree2_MapEvents:: @ 838FF1C
 	map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc
index 0c8888764..a77f56364 100644
--- a/data/maps/events/SecretBase_Tree3.inc
+++ b/data/maps/events/SecretBase_Tree3.inc
@@ -16,7 +16,7 @@ SecretBase_Tree3_MapObjects:: @ 83906C4
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_Tree3_MapWarps:: @ 839082C
-	warp_def 8, 6, 0, 126, NONE
+	warp_def 8, 6, 0, 126, None
 
 SecretBase_Tree3_MapEvents:: @ 8390834
 	map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc
index 675ee1b8e..c687e3e48 100644
--- a/data/maps/events/SecretBase_Tree4.inc
+++ b/data/maps/events/SecretBase_Tree4.inc
@@ -16,7 +16,7 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_Tree4_MapWarps:: @ 8391144
-	warp_def 7, 12, 0, 126, NONE
+	warp_def 7, 12, 0, 126, None
 
 SecretBase_Tree4_MapEvents:: @ 839114C
 	map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc
index 8c6999f9b..8d8e2bece 100644
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ b/data/maps/events/SecretBase_YellowCave1.inc
@@ -16,7 +16,7 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_YellowCave1_MapWarps:: @ 838F478
-	warp_def 5, 7, 0, 126, NONE
+	warp_def 5, 7, 0, 126, None
 
 SecretBase_YellowCave1_MapEvents:: @ 838F480
 	map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc
index 8825836bf..99cef474a 100644
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ b/data/maps/events/SecretBase_YellowCave2.inc
@@ -16,7 +16,7 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_YellowCave2_MapWarps:: @ 838FD90
-	warp_def 12, 7, 0, 126, NONE
+	warp_def 12, 7, 0, 126, None
 
 SecretBase_YellowCave2_MapEvents:: @ 838FD98
 	map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc
index a88e44190..82eef2946 100644
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ b/data/maps/events/SecretBase_YellowCave3.inc
@@ -16,7 +16,7 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_YellowCave3_MapWarps:: @ 83906A8
-	warp_def 5, 9, 0, 126, NONE
+	warp_def 5, 9, 0, 126, None
 
 SecretBase_YellowCave3_MapEvents:: @ 83906B0
 	map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc
index 0280e088a..545f65e04 100644
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ b/data/maps/events/SecretBase_YellowCave4.inc
@@ -16,7 +16,7 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58
 	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
 
 SecretBase_YellowCave4_MapWarps:: @ 8390FC0
-	warp_def 6, 12, 0, 126, NONE
+	warp_def 6, 12, 0, 126, None
 
 SecretBase_YellowCave4_MapEvents:: @ 8390FC8
 	map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc
index 1d4b51476..68615ad3e 100644
--- a/data/maps/events/SingleBattleColosseum.inc
+++ b/data/maps/events/SingleBattleColosseum.inc
@@ -2,8 +2,8 @@ SingleBattleColosseum_MapObjects:: @ 83912E4
 	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0
 
 SingleBattleColosseum_MapWarps:: @ 83912FC
-	warp_def 6, 8, 3, 127, NONE
-	warp_def 7, 8, 3, 127, NONE
+	warp_def 6, 8, 3, 127, None
+	warp_def 7, 8, 3, 127, None
 
 SingleBattleColosseum_MapCoordEvents:: @ 839130C
 	coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc
index 8c5ff5578..f49e755f3 100644
--- a/data/maps/events/TradeCenter.inc
+++ b/data/maps/events/TradeCenter.inc
@@ -2,8 +2,8 @@ TradeCenter_MapObjects:: @ 8391340
 	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0
 
 TradeCenter_MapWarps:: @ 8391358
-	warp_def 5, 8, 3, 127, NONE
-	warp_def 6, 8, 3, 127, NONE
+	warp_def 5, 8, 3, 127, None
+	warp_def 6, 8, 3, 127, None
 
 TradeCenter_MapCoordEvents:: @ 8391368
 	coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0