Correct town names and Silent Hill dungeon name (#135)

Corrects Baadon to Birdon, Bull Forest to Blue Forest,
Haiteku to HighTech, and Shizukana Oka to Silent Hills.

constants/flypoint_constants.asm

@@ -4,12 +4,12 @@
 	const FLY_POINT_SILENT_HILL	; 0
 	const FLY_POINT_OLD			; 1
 	const FLY_POINT_WEST		; 2
-	const FLY_POINT_HAITEKU		; 3
-	const FLY_POINT_FONTO		; 4
-	const FLY_POINT_BAADON		; 5
+	const FLY_POINT_HIGH_TECH	; 3
+	const FLY_POINT_FONT		; 4
+	const FLY_POINT_BIRDON		; 5
 	const FLY_POINT_NEWTYPE		; 6
 	const FLY_POINT_SUGAR		; 7
-	const FLY_POINT_BULL_FOREST	; 8
+	const FLY_POINT_BLUE_FOREST	; 8
 	const FLY_POINT_STAND		; 9
 	const FLY_POINT_KANTO		; 10
 	const FLY_POINT_PRINCE		; 11

constants/landmark_constants.asm

@@ -1,45 +1,45 @@
 	const_def
-	const LANDMARK_NONE                     ; 00
-	const LANDMARK_NORTH                    ; 01
-	const LANDMARK_BULL_FOREST_ROUTE_3      ; 02
-	const LANDMARK_BULL_FOREST              ; 03
-	const LANDMARK_BULL_FOREST_ROUTE_2      ; 04
-	const LANDMARK_STAND                    ; 05
-	const LANDMARK_STAND_ROUTE              ; 06
-	const LANDMARK_KANTO_EAST_ROUTE         ; 07
-	const LANDMARK_KANTO                    ; 08
-	const LANDMARK_ROUTE_SILENT_EAST        ; 09
-	const LANDMARK_SILENT_HILL              ; 0a
-	const LANDMARK_PRINCE                   ; 0b
-	const LANDMARK_MT_FUJI                  ; 0c
-	const LANDMARK_ROUTE_1_P1               ; 0d
-	const LANDMARK_ROUTE_1_P2               ; 0e
-	const LANDMARK_OLD_CITY                 ; 0f
-	const LANDMARK_ROUTE_2                  ; 10
-	const LANDMARK_WEST                     ; 11
-	const LANDMARK_BAADON_ROUTE_1           ; 12
-	const LANDMARK_BAADON                   ; 13
-	const LANDMARK_BAADON_ROUTE_2           ; 14
-	const LANDMARK_BAADON_ROUTE_3           ; 15
-	const LANDMARK_ROUTE_15                 ; 16
-	const LANDMARK_NEWTYPE                  ; 17
-	const LANDMARK_SUGAR_ROUTE              ; 18
-	const LANDMARK_SUGAR                    ; 19
-	const LANDMARK_NEWTYPE_ROUTE            ; 1a
-	const LANDMARK_ROUTE_18                 ; 1b
-	const LANDMARK_BULL_FOREST_ROUTE_1      ; 1c
-	const LANDMARK_1C                       ; 1d
-	const LANDMARK_1D                       ; 1e
-	const LANDMARK_FONTO_ROUTE_3            ; 1f
-	const LANDMARK_FONTO                    ; 20
-	const LANDMARK_FONTO_ROUTE_2            ; 21
-	const LANDMARK_FONTO_ROUTE_6            ; 22
-	const LANDMARK_FONTO_ROUTE_5            ; 23
-	const LANDMARK_SOUTH                    ; 24
-	const LANDMARK_FONTO_ROUTE_1            ; 25
-	const LANDMARK_HAITEKU_WEST_ROUTE_OCEAN ; 26
-	const LANDMARK_HAITEKU_WEST_ROUTE       ; 27
-	const LANDMARK_HAITEKU                  ; 28
-	const LANDMARK_WASTE_BRIDGE             ; 29
-	const LANDMARK_FONTO_ROUTE_4            ; 2a
-	const LANDMARK_FONTO_BRIDGE             ; 2b
+	const LANDMARK_NONE                       ; 00
+	const LANDMARK_NORTH                      ; 01
+	const LANDMARK_BLUE_FOREST_ROUTE_3        ; 02
+	const LANDMARK_BLUE_FOREST                ; 03
+	const LANDMARK_BLUE_FOREST_ROUTE_2        ; 04
+	const LANDMARK_STAND                      ; 05
+	const LANDMARK_STAND_ROUTE                ; 06
+	const LANDMARK_KANTO_EAST_ROUTE           ; 07
+	const LANDMARK_KANTO                      ; 08
+	const LANDMARK_ROUTE_SILENT_EAST          ; 09
+	const LANDMARK_SILENT_HILL                ; 0a
+	const LANDMARK_PRINCE                     ; 0b
+	const LANDMARK_MT_FUJI                    ; 0c
+	const LANDMARK_ROUTE_1_P1                 ; 0d
+	const LANDMARK_ROUTE_1_P2                 ; 0e
+	const LANDMARK_OLD_CITY                   ; 0f
+	const LANDMARK_ROUTE_2                    ; 10
+	const LANDMARK_WEST                       ; 11
+	const LANDMARK_BIRDON_ROUTE_1             ; 12
+	const LANDMARK_BIRDON                     ; 13
+	const LANDMARK_BIRDON_ROUTE_2             ; 14
+	const LANDMARK_BIRDON_ROUTE_3             ; 15
+	const LANDMARK_ROUTE_15                   ; 16
+	const LANDMARK_NEWTYPE                    ; 17
+	const LANDMARK_SUGAR_ROUTE                ; 18
+	const LANDMARK_SUGAR                      ; 19
+	const LANDMARK_NEWTYPE_ROUTE              ; 1a
+	const LANDMARK_ROUTE_18                   ; 1b
+	const LANDMARK_BLUE_FOREST_ROUTE_1        ; 1c
+	const LANDMARK_1C                         ; 1d
+	const LANDMARK_1D                         ; 1e
+	const LANDMARK_FONT_ROUTE_3               ; 1f
+	const LANDMARK_FONT                       ; 20
+	const LANDMARK_FONT_ROUTE_2               ; 21
+	const LANDMARK_FONT_ROUTE_6               ; 22
+	const LANDMARK_FONT_ROUTE_5               ; 23
+	const LANDMARK_SOUTH                      ; 24
+	const LANDMARK_FONT_ROUTE_1               ; 25
+	const LANDMARK_HIGH_TECH_WEST_ROUTE_OCEAN ; 26
+	const LANDMARK_HIGH_TECH_WEST_ROUTE       ; 27
+	const LANDMARK_HIGH_TECH                  ; 28
+	const LANDMARK_WASTE_BRIDGE               ; 29
+	const LANDMARK_FONT_ROUTE_4               ; 2a
+	const LANDMARK_FONT_BRIDGE                ; 2b

constants/map_constants.asm

@@ -39,7 +39,7 @@ ENDM
 	map_const SILENT_HILL_LAB_FRONT,             4,  8 ; 12
 	map_const SILENT_HILL_LAB_BACK,              4,  4 ; 13
 	map_const UNUSED_MAP_13,                     4,  4 ; 14
-	map_const SHIZUKANA_OKA,                    25, 18 ; 15
+	map_const SILENT_HILLS,                    25, 18 ; 15
 	endgroup
 
 	newgroup  OLD                                      ;  2
@@ -89,57 +89,57 @@ ENDM
 	map_const WEST_HOUSE_2,                      5,  4 ; 19
 	endgroup
 
-	newgroup  HAITEKU                                  ;  4
-	map_const HAITEKU_WEST_ROUTE,               25,  9 ;  1
-	map_const HAITEKU_WEST_ROUTE_OCEAN,         10, 27 ;  2
-	map_const HAITEKU,                          20, 18 ;  3
-	map_const HAITEKU_WEST_ROUTE_GATE,           5,  4 ;  4
-	map_const HAITEKU_POKECENTER_1F,             8,  4 ;  5
-	map_const HAITEKU_POKECENTER_2F,             8,  4 ;  6
-	map_const HAITEKU_LEAGUE_1F,                 4,  8 ;  7
-	map_const HAITEKU_LEAGUE_2F,                 5,  9 ;  8
-	map_const HAITEKU_MART,                      6,  4 ;  9
-	map_const HAITEKU_HOUSE_1,                   5,  4 ; 10
-	map_const HAITEKU_HOUSE_2,                   5,  4 ; 11
-	map_const HAITEKU_IMPOSTER_OAK_HOUSE,        5,  4 ; 12
-	map_const HAITEKU_AQUARIUM_1F,               8,  4 ; 13
-	map_const HAITEKU_AQUARIUM_2F,               8,  4 ; 14
+	newgroup  HIGHTECH                                  ;  4
+	map_const HIGHTECH_WEST_ROUTE,               25,  9 ;  1
+	map_const HIGHTECH_WEST_ROUTE_OCEAN,         10, 27 ;  2
+	map_const HIGHTECH,                          20, 18 ;  3
+	map_const HIGHTECH_WEST_ROUTE_GATE,           5,  4 ;  4
+	map_const HIGHTECH_POKECENTER_1F,             8,  4 ;  5
+	map_const HIGHTECH_POKECENTER_2F,             8,  4 ;  6
+	map_const HIGHTECH_LEAGUE_1F,                 4,  8 ;  7
+	map_const HIGHTECH_LEAGUE_2F,                 5,  9 ;  8
+	map_const HIGHTECH_MART,                      6,  4 ;  9
+	map_const HIGHTECH_HOUSE_1,                   5,  4 ; 10
+	map_const HIGHTECH_HOUSE_2,                   5,  4 ; 11
+	map_const HIGHTECH_IMPOSTER_OAK_HOUSE,        5,  4 ; 12
+	map_const HIGHTECH_AQUARIUM_1F,               8,  4 ; 13
+	map_const HIGHTECH_AQUARIUM_2F,               8,  4 ; 14
 	endgroup
 
-	newgroup  FONTO                                    ;  5
-	map_const FONTO_ROUTE_1,                    35,  9 ;  1
-	map_const FONTO_ROUTE_2,                    10, 18 ;  2
-	map_const FONTO_ROUTE_3,                    25,  9 ;  3
-	map_const FONTO_ROUTE_4,                    10, 18 ;  4
-	map_const FONTO_ROUTE_5,                    10, 18 ;  5
-	map_const FONTO_ROUTE_6,                    35,  9 ;  6
-	map_const FONTO,                            10,  9 ;  7
-	map_const FONTO_ROUTE_GATE_1,                5,  4 ;  8
-	map_const FONTO_ROUTE_GATE_2,                5,  4 ;  9
-	map_const FONTO_ROUTE_GATE_3,                5,  4 ; 10
-	map_const FONTO_ROCKET_HOUSE,                8,  4 ; 11
-	map_const FONTO_MART,                        8,  4 ; 12
-	map_const FONTO_HOUSE,                       5,  4 ; 13
-	map_const FONTO_POKECENTER_1F,               8,  4 ; 14
-	map_const FONTO_POKECENTER_2F,               8,  4 ; 15
-	map_const FONTO_LAB,                         5,  4 ; 16
+	newgroup  FONT                                    ;  5
+	map_const FONT_ROUTE_1,                    35,  9 ;  1
+	map_const FONT_ROUTE_2,                    10, 18 ;  2
+	map_const FONT_ROUTE_3,                    25,  9 ;  3
+	map_const FONT_ROUTE_4,                    10, 18 ;  4
+	map_const FONT_ROUTE_5,                    10, 18 ;  5
+	map_const FONT_ROUTE_6,                    35,  9 ;  6
+	map_const FONT,                            10,  9 ;  7
+	map_const FONT_ROUTE_GATE_1,                5,  4 ;  8
+	map_const FONT_ROUTE_GATE_2,                5,  4 ;  9
+	map_const FONT_ROUTE_GATE_3,                5,  4 ; 10
+	map_const FONT_ROCKET_HOUSE,                8,  4 ; 11
+	map_const FONT_MART,                        8,  4 ; 12
+	map_const FONT_HOUSE,                       5,  4 ; 13
+	map_const FONT_POKECENTER_1F,               8,  4 ; 14
+	map_const FONT_POKECENTER_2F,               8,  4 ; 15
+	map_const FONT_LAB,                         5,  4 ; 16
 	endgroup
 
-	newgroup  BAADON                                   ;  6
-	map_const BAADON_ROUTE_1,                   10, 27 ;  1
-	map_const BAADON_ROUTE_2,                   50,  9 ;  2
-	map_const BAADON_ROUTE_3,                   10, 18 ;  3
-	map_const BAADON,                           10,  9 ;  4
-	map_const BAADON_ROUTE_GATE_WEST,            5,  4 ;  5
-	map_const BAADON_ROUTE_GATE_NEWTYPE,         5,  4 ;  6
-	map_const BAADON_MART,                       8,  4 ;  7
-	map_const BAADON_POKECENTER_1F,              8,  4 ;  8
-	map_const BAADON_POKECENTER_2F,              8,  4 ;  9
-	map_const BAADON_HOUSE_1,                    4,  4 ; 10
-	map_const BAADON_WALLPAPER_HOUSE,            4,  4 ; 11
-	map_const BAADON_HOUSE_2,                    5,  4 ; 12
-	map_const BAADON_LEAGUE_1F,                  4,  8 ; 13
-	map_const BAADON_LEAGUE_2F,                  5,  9 ; 14
+	newgroup  BIRDON                                   ;  6
+	map_const BIRDON_ROUTE_1,                   10, 27 ;  1
+	map_const BIRDON_ROUTE_2,                   50,  9 ;  2
+	map_const BIRDON_ROUTE_3,                   10, 18 ;  3
+	map_const BIRDON,                           10,  9 ;  4
+	map_const BIRDON_ROUTE_GATE_WEST,            5,  4 ;  5
+	map_const BIRDON_ROUTE_GATE_NEWTYPE,         5,  4 ;  6
+	map_const BIRDON_MART,                       8,  4 ;  7
+	map_const BIRDON_POKECENTER_1F,              8,  4 ;  8
+	map_const BIRDON_POKECENTER_2F,              8,  4 ;  9
+	map_const BIRDON_HOUSE_1,                    4,  4 ; 10
+	map_const BIRDON_WALLPAPER_HOUSE,            4,  4 ; 11
+	map_const BIRDON_HOUSE_2,                    5,  4 ; 12
+	map_const BIRDON_LEAGUE_1F,                  4,  8 ; 13
+	map_const BIRDON_LEAGUE_2F,                  5,  9 ; 14
 	endgroup
 
 	newgroup  NEWTYPE                                  ;  7
@@ -176,22 +176,22 @@ ENDM
 	map_const SUGAR_POKECENTER_2F,               8,  4 ;  8
 	endgroup
 
-	newgroup  BULL                                     ;  9
-	map_const BULL_FOREST_ROUTE_1,              25,  9 ;  1
-	map_const BULL_FOREST_ROUTE_2,              10, 27 ;  2
-	map_const BULL_FOREST_ROUTE_3,              10, 27 ;  3
-	map_const BULL_FOREST,                      20, 18 ;  4
-	map_const BULL_FOREST_ROUTE_1_HOUSE,         5,  4 ;  5
-	map_const BULL_FOREST_ROUTE_GATE_STAND,      5,  4 ;  6
-	map_const BULL_MART,                         8,  4 ;  7
-	map_const BULL_HOUSE_1,                      4,  4 ;  8
-	map_const BULL_HOUSE_2,                      5,  4 ;  9
-	map_const BULL_HOUSE_3,                      5,  4 ; 10
-	map_const BULL_POKECENTER_1F,                8,  4 ; 11
-	map_const BULL_POKECENTER_2F,                8,  4 ; 12
-	map_const BULL_LEAGUE_1F,                    4,  8 ; 13
-	map_const BULL_LEAGUE_2F,                    5,  9 ; 14
-	map_const BULL_HOUSE_4,                      5,  4 ; 15
+	newgroup  BLUE                                     ;  9
+	map_const BLUE_FOREST_ROUTE_1,              25,  9 ;  1
+	map_const BLUE_FOREST_ROUTE_2,              10, 27 ;  2
+	map_const BLUE_FOREST_ROUTE_3,              10, 27 ;  3
+	map_const BLUE_FOREST,                      20, 18 ;  4
+	map_const BLUE_FOREST_ROUTE_1_HOUSE,         5,  4 ;  5
+	map_const BLUE_FOREST_ROUTE_GATE_STAND,      5,  4 ;  6
+	map_const BLUE_MART,                         8,  4 ;  7
+	map_const BLUE_HOUSE_1,                      4,  4 ;  8
+	map_const BLUE_HOUSE_2,                      5,  4 ;  9
+	map_const BLUE_HOUSE_3,                      5,  4 ; 10
+	map_const BLUE_POKECENTER_1F,                8,  4 ; 11
+	map_const BLUE_POKECENTER_2F,                8,  4 ; 12
+	map_const BLUE_LEAGUE_1F,                    4,  8 ; 13
+	map_const BLUE_LEAGUE_2F,                    5,  9 ; 14
+	map_const BLUE_HOUSE_4,                      5,  4 ; 15
 	endgroup
 
 	newgroup  STAND                                    ; 10

constants/palette_constants.asm

@@ -6,12 +6,12 @@
 	const PAL_TOWN_WEST ; 03
 	const PAL_TOWN_NEWTYPE ; 04
 	const PAL_TOWN_SUGAR ; 05
-	const PAL_TOWN_FONTO ; 06
+	const PAL_TOWN_FONT ; 06
 	const PAL_TOWN_SILENTHILL ; 07
-	const PAL_TOWN_HAITEKU ; 08
+	const PAL_TOWN_HIGHTECH ; 08
 	const PAL_TOWN_SOUTH ; 09
-	const PAL_TOWN_BULL ; 0a
-	const PAL_TOWN_BAADON ; 0b
+	const PAL_TOWN_BLUE ; 0a
+	const PAL_TOWN_BIRDON ; 0b
 	const PAL_TOWN_OLDCITY ; 0c
 	const PAL_NIGHTTIME ; 0d
 	const PAL_BLACK ; 0e

constants/tileset_constants.asm

@@ -3,10 +3,10 @@
 	const TILESET_SILENT_HILL
 	const TILESET_OLD_CITY
 	const TILESET_WEST
-	const TILESET_HAITEKU
-	const TILESET_BAADON
-	const TILESET_FONTO
-	const TILESET_BULL_FOREST
+	const TILESET_HIGH_TECH
+	const TILESET_BIRDON
+	const TILESET_FONT
+	const TILESET_NORTH
 	const TILESET_KANTO
 	const TILESET_SOUTH
 	const TILESET_HOUSE

data/maps/flypoints.asm

@@ -11,17 +11,17 @@ SECTION "data/maps/flypoints.asm", ROMX
 FlyPointPaths:
 
 	db FLY_POINT_PRINCE, FLY_POINT_N_A, FLY_POINT_OLD, FLY_POINT_KANTO                  ; FLY_POINT_SILENT_HILL
-	db FLY_POINT_HAITEKU, FLY_POINT_SILENT_HILL, FLY_POINT_WEST, FLY_POINT_SILENT_HILL  ; FLY_POINT_OLD
-	db FLY_POINT_BAADON, FLY_POINT_OLD, FLY_POINT_HAITEKU, FLY_POINT_OLD                ; FLY_POINT_WEST
-	db FLY_POINT_FONTO, FLY_POINT_WEST, FLY_POINT_SOUTH, FLY_POINT_WEST                 ; FLY_POINT_HAITEKU
-	db FLY_POINT_SOUTH, FLY_POINT_HAITEKU, FLY_POINT_SOUTH, FLY_POINT_BAADON            ; FLY_POINT_FONTO
-	db FLY_POINT_FONTO, FLY_POINT_WEST, FLY_POINT_FONTO, FLY_POINT_NEWTYPE              ; FLY_POINT_BAADON
-	db FLY_POINT_SUGAR, FLY_POINT_N_A, FLY_POINT_BAADON, FLY_POINT_BULL_FOREST          ; FLY_POINT_NEWTYPE
+	db FLY_POINT_HIGH_TECH, FLY_POINT_SILENT_HILL, FLY_POINT_WEST, FLY_POINT_SILENT_HILL  ; FLY_POINT_OLD
+	db FLY_POINT_BIRDON, FLY_POINT_OLD, FLY_POINT_HIGH_TECH, FLY_POINT_OLD                ; FLY_POINT_WEST
+	db FLY_POINT_FONT, FLY_POINT_WEST, FLY_POINT_SOUTH, FLY_POINT_WEST                 ; FLY_POINT_HIGH_TECH
+	db FLY_POINT_SOUTH, FLY_POINT_HIGH_TECH, FLY_POINT_SOUTH, FLY_POINT_BIRDON            ; FLY_POINT_FONT
+	db FLY_POINT_FONT, FLY_POINT_WEST, FLY_POINT_FONT, FLY_POINT_NEWTYPE              ; FLY_POINT_BIRDON
+	db FLY_POINT_SUGAR, FLY_POINT_N_A, FLY_POINT_BIRDON, FLY_POINT_BLUE_FOREST          ; FLY_POINT_NEWTYPE
 	db FLY_POINT_N_A, FLY_POINT_NEWTYPE, FLY_POINT_N_A, FLY_POINT_N_A                   ; FLY_POINT_SUGAR
-	db FLY_POINT_NORTH, FLY_POINT_STAND, FLY_POINT_NEWTYPE, FLY_POINT_NORTH             ; FLY_POINT_BULL_FOREST
-	db FLY_POINT_BULL_FOREST, FLY_POINT_KANTO, FLY_POINT_KANTO, FLY_POINT_BULL_FOREST   ; FLY_POINT_STAND
+	db FLY_POINT_NORTH, FLY_POINT_STAND, FLY_POINT_NEWTYPE, FLY_POINT_NORTH             ; FLY_POINT_BLUE_FOREST
+	db FLY_POINT_BLUE_FOREST, FLY_POINT_KANTO, FLY_POINT_KANTO, FLY_POINT_BLUE_FOREST   ; FLY_POINT_STAND
 	db FLY_POINT_STAND, FLY_POINT_SILENT_HILL, FLY_POINT_SILENT_HILL, FLY_POINT_STAND   ; FLY_POINT_KANTO
 	db FLY_POINT_MT_FUJI, FLY_POINT_SILENT_HILL, FLY_POINT_N_A, FLY_POINT_N_A           ; FLY_POINT_PRINCE
 	db FLY_POINT_N_A, FLY_POINT_PRINCE, FLY_POINT_N_A, FLY_POINT_N_A                    ; FLY_POINT_MT_FUJI
-	db FLY_POINT_FONTO, FLY_POINT_HAITEKU, FLY_POINT_N_A, FLY_POINT_FONTO               ; FLY_POINT_SOUTH
-	db FLY_POINT_N_A, FLY_POINT_BULL_FOREST, FLY_POINT_BULL_FOREST, FLY_POINT_N_A       ; FLY_POINT_NORTH
+	db FLY_POINT_FONT, FLY_POINT_HIGH_TECH, FLY_POINT_N_A, FLY_POINT_FONT               ; FLY_POINT_SOUTH
+	db FLY_POINT_N_A, FLY_POINT_BLUE_FOREST, FLY_POINT_BLUE_FOREST, FLY_POINT_N_A       ; FLY_POINT_NORTH

data/maps/landmarks.asm

@@ -12,9 +12,9 @@ SECTION "data/maps/landmarks.asm", ROMX
 LandmarkPositions:
 	landmark -8, -16		; LANDMARK_NONE
 	landmark 148, 12		; LANDMARK_NORTH
-	landmark 148, 24		; LANDMARK_BULL_FOREST_ROUTE_3
-	landmark 148, 36		; LANDMARK_BULL_FOREST
-	landmark 148, 48		; LANDMARK_BULL_FOREST_ROUTE_2
+	landmark 148, 24		; LANDMARK_BLUE_FOREST_ROUTE_3
+	landmark 148, 36		; LANDMARK_BLUE_FOREST
+	landmark 148, 48		; LANDMARK_BLUE_FOREST_ROUTE_2
 	landmark 148, 60 		; LANDMARK_STAND
 	landmark 148, 76		; LANDMARK_STAND_ROUTE
 	landmark 140, 92		; LANDMARK_KANTO_EAST_ROUTE
@@ -28,32 +28,32 @@ LandmarkPositions:
 	landmark 84, 76			; LANDMARK_OLD_CITY
 	landmark 72, 76			; LANDMARK_ROUTE_2
 	landmark 60, 76			; LANDMARK_WEST
-	landmark 60, 64			; LANDMARK_BAADON_ROUTE_1
-	landmark 60, 52			; LANDMARK_BAADON
-	landmark 84, 52			; LANDMARK_BAADON_ROUTE_2
-	landmark 100, 52		; LANDMARK_BAADON_ROUTE_3
+	landmark 60, 64			; LANDMARK_BIRDON_ROUTE_1
+	landmark 60, 52			; LANDMARK_BIRDON
+	landmark 84, 52			; LANDMARK_BIRDON_ROUTE_2
+	landmark 100, 52		; LANDMARK_BIRDON_ROUTE_3
 	landmark 108, 60		; LANDMARK_ROUTE_15
 	landmark 116, 60		; LANDMARK_NEWTYPE
 	landmark 116, 48		; LANDMARK_SUGAR_ROUTE
 	landmark 116, 36		; LANDMARK_SUGAR
 	landmark 124, 60		; LANDMARK_NEWTYPE_ROUTE
 	landmark 132, 44		; LANDMARK_ROUTE_18
-	landmark 140, 36		; LANDMARK_BULL_FOREST_ROUTE_1
+	landmark 140, 36		; LANDMARK_BLUE_FOREST_ROUTE_1
 	landmark 120, 76		; LANDMARK_1C
 	landmark 96, 68			; LANDMARK_1D
-	landmark 48, 44			; LANDMARK_FONTO_ROUTE_3
-	landmark 36, 44			; LANDMARK_FONTO
-	landmark 36, 36			; LANDMARK_FONTO_ROUTE_2
-	landmark 24, 28			; LANDMARK_FONTO_ROUTE_6
-	landmark 12, 36			; LANDMARK_FONTO_ROUTE_5
+	landmark 48, 44			; LANDMARK_FONT_ROUTE_3
+	landmark 36, 44			; LANDMARK_FONT
+	landmark 36, 36			; LANDMARK_FONT_ROUTE_2
+	landmark 24, 28			; LANDMARK_FONT_ROUTE_6
+	landmark 12, 36			; LANDMARK_FONT_ROUTE_5
 	landmark 12, 44			; LANDMARK_SOUTH
-	landmark 24, 44			; LANDMARK_FONTO_ROUTE_1
-	landmark 12, 56			; LANDMARK_HAITEKU_WEST_ROUTE_OCEAN
-	landmark 20, 68			; LANDMARK_HAITEKU_WEST_ROUTE
-	landmark 36, 68			; LANDMARK_HAITEKU
+	landmark 24, 44			; LANDMARK_FONT_ROUTE_1
+	landmark 12, 56			; LANDMARK_HIGH_TECH_WEST_ROUTE_OCEAN
+	landmark 20, 68			; LANDMARK_HIGH_TECH_WEST_ROUTE
+	landmark 36, 68			; LANDMARK_HIGH_TECH
 	landmark 48, 68			; LANDMARK_WASTE_BRIDGE
-	landmark 60, 44			; LANDMARK_FONTO_ROUTE_4
-	landmark 36, 56			; LANDMARK_FONTO_BRIDGE
+	landmark 60, 44			; LANDMARK_FONT_ROUTE_4
+	landmark 36, 56			; LANDMARK_FONT_BRIDGE
 
 SECTION "data/maps/landmarks.asm@LandmarkNames", ROMX
 

data/maps/maps.asm

@@ -19,12 +19,12 @@ MapGroupPointers:
 	dw MapGroup_SilentHill
 	dw MapGroup_OldCity
 	dw MapGroup_West
-	dw MapGroup_Haiteku
-	dw MapGroup_Fonto
-	dw MapGroup_Baadon
+	dw MapGroup_HighTech
+	dw MapGroup_Font
+	dw MapGroup_Birdon
 	dw MapGroup_Newtype
 	dw MapGroup_Sugar
-	dw MapGroup_Bull
+	dw MapGroup_Blue
 	dw MapGroup_Stand
 	dw MapGroup_Kanto
 	dw MapGroup_Prince
@@ -49,7 +49,7 @@ MapGroup_SilentHill:
 	map SilentHillLabFront, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL
 	map SilentHillLabBack, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL
 	map UnusedMap13, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL
-	map ShizukanaOka, TILESET_FOREST, CAVE, LANDMARK_NONE
+	map SilentHills, TILESET_FOREST, CAVE, LANDMARK_NONE
 
 MapGroup_OldCity:
 	map Route2, TILESET_OLD_CITY, ROUTE, LANDMARK_ROUTE_2
@@ -96,55 +96,55 @@ MapGroup_West:
 	map WestHouse1, TILESET_HOUSE, INDOOR, LANDMARK_WEST
 	map WestHouse2, TILESET_HOUSE, INDOOR, LANDMARK_WEST
 
-MapGroup_Haiteku:
-	map HaitekuWestRoute, TILESET_HAITEKU, ROUTE, LANDMARK_HAITEKU_WEST_ROUTE
-	map HaitekuWestRouteOcean, TILESET_HAITEKU, ROUTE, LANDMARK_HAITEKU_WEST_ROUTE_OCEAN
-	map Haiteku, TILESET_HAITEKU, TOWN, LANDMARK_HAITEKU
-	map HaitekuWestRouteGate, TILESET_GATE, GATE, LANDMARK_HAITEKU_WEST_ROUTE_OCEAN
-	map HaitekuPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_HAITEKU
-	map HaitekuPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_HAITEKU
-	map HaitekuLeague1F, TILESET_TOWER, INDOOR, LANDMARK_HAITEKU
-	map HaitekuLeague2F, TILESET_GYM, INDOOR, LANDMARK_HAITEKU
-	map HaitekuMart, TILESET_MART, INDOOR, LANDMARK_HAITEKU
-	map HaitekuHouse1, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU
-	map HaitekuHouse2, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU
-	map HaitekuImposterOakHouse, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU
-	map HaitekuAquarium1F, TILESET_AQUARIUM, INDOOR, LANDMARK_HAITEKU
-	map HaitekuAquarium2F, TILESET_AQUARIUM, INDOOR, LANDMARK_HAITEKU
+MapGroup_HighTech:
+	map HighTechWestRoute, TILESET_HIGH_TECH, ROUTE, LANDMARK_HIGH_TECH_WEST_ROUTE
+	map HighTechWestRouteOcean, TILESET_HIGH_TECH, ROUTE, LANDMARK_HIGH_TECH_WEST_ROUTE_OCEAN
+	map HighTech, TILESET_HIGH_TECH, TOWN, LANDMARK_HIGH_TECH
+	map HighTechWestRouteGate, TILESET_GATE, GATE, LANDMARK_HIGH_TECH_WEST_ROUTE_OCEAN
+	map HighTechPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechLeague1F, TILESET_TOWER, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechLeague2F, TILESET_GYM, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechMart, TILESET_MART, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechHouse1, TILESET_HOUSE, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechHouse2, TILESET_HOUSE, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechImposterOakHouse, TILESET_HOUSE, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechAquarium1F, TILESET_AQUARIUM, INDOOR, LANDMARK_HIGH_TECH
+	map HighTechAquarium2F, TILESET_AQUARIUM, INDOOR, LANDMARK_HIGH_TECH
 
-MapGroup_Fonto:
-	map FontoRoute1, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_1
-	map FontoRoute2, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_2
-	map FontoRoute3, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_3
-	map FontoRoute4, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_4
-	map FontoRoute5, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_5
-	map FontoRoute6, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_6
-	map Fonto, TILESET_FONTO, TOWN, LANDMARK_FONTO
-	map FontoRouteGate1, TILESET_GATE, GATE, LANDMARK_FONTO_ROUTE_1
-	map FontoRouteGate2, TILESET_GATE, GATE, LANDMARK_FONTO_ROUTE_4
-	map FontoRouteGate3, TILESET_GATE, GATE, LANDMARK_FONTO_ROUTE_5
-	map FontoRocketHouse, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_FONTO
-	map FontoMart, TILESET_MART, INDOOR, LANDMARK_FONTO
-	map FontoHouse, TILESET_HOUSE, INDOOR, LANDMARK_FONTO
-	map FontoPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_FONTO
-	map FontoPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_FONTO
-	map FontoLab, TILESET_LAB, INDOOR, LANDMARK_FONTO
+MapGroup_Font:
+	map FontRoute1, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_1
+	map FontRoute2, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_2
+	map FontRoute3, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_3
+	map FontRoute4, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_4
+	map FontRoute5, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_5
+	map FontRoute6, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_6
+	map Font, TILESET_FONT, TOWN, LANDMARK_FONT
+	map FontRouteGate1, TILESET_GATE, GATE, LANDMARK_FONT_ROUTE_1
+	map FontRouteGate2, TILESET_GATE, GATE, LANDMARK_FONT_ROUTE_4
+	map FontRouteGate3, TILESET_GATE, GATE, LANDMARK_FONT_ROUTE_5
+	map FontRocketHouse, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_FONT
+	map FontMart, TILESET_MART, INDOOR, LANDMARK_FONT
+	map FontHouse, TILESET_HOUSE, INDOOR, LANDMARK_FONT
+	map FontPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_FONT
+	map FontPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_FONT
+	map FontLab, TILESET_LAB, INDOOR, LANDMARK_FONT
 
-MapGroup_Baadon:
-	map BaadonRoute1, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_1
-	map BaadonRoute2, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_2
-	map BaadonRoute3, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_3
-	map Baadon, TILESET_BAADON, TOWN, LANDMARK_BAADON
-	map BaadonRouteGateWest, TILESET_GATE, GATE, LANDMARK_BAADON_ROUTE_1
-	map BaadonRouteGateNewtype, TILESET_GATE, GATE, LANDMARK_BAADON_ROUTE_3
-	map BaadonMart, TILESET_MART, INDOOR, LANDMARK_BAADON
-	map BaadonPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BAADON
-	map BaadonPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BAADON
-	map BaadonHouse1, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_BAADON
-	map BaadonWallpaperHouse, TILESET_AQUARIUM, INDOOR, LANDMARK_BAADON
-	map BaadonHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BAADON
-	map BaadonLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BAADON
-	map BaadonLeague2F, TILESET_GYM, INDOOR, LANDMARK_BAADON
+MapGroup_Birdon:
+	map BirdonRoute1, TILESET_BIRDON, ROUTE, LANDMARK_BIRDON_ROUTE_1
+	map BirdonRoute2, TILESET_BIRDON, ROUTE, LANDMARK_BIRDON_ROUTE_2
+	map BirdonRoute3, TILESET_BIRDON, ROUTE, LANDMARK_BIRDON_ROUTE_3
+	map Birdon, TILESET_BIRDON, TOWN, LANDMARK_BIRDON
+	map BirdonRouteGateWest, TILESET_GATE, GATE, LANDMARK_BIRDON_ROUTE_1
+	map BirdonRouteGateNewtype, TILESET_GATE, GATE, LANDMARK_BIRDON_ROUTE_3
+	map BirdonMart, TILESET_MART, INDOOR, LANDMARK_BIRDON
+	map BirdonPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BIRDON
+	map BirdonPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BIRDON
+	map BirdonHouse1, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_BIRDON
+	map BirdonWallpaperHouse, TILESET_AQUARIUM, INDOOR, LANDMARK_BIRDON
+	map BirdonHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BIRDON
+	map BirdonLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BIRDON
+	map BirdonLeague2F, TILESET_GYM, INDOOR, LANDMARK_BIRDON
 
 MapGroup_Newtype:
 	map Route15, TILESET_SILENT_HILL, ROUTE, LANDMARK_ROUTE_15
@@ -169,8 +169,8 @@ MapGroup_Newtype:
 	map NewtypeHouse3, TILESET_HOUSE, INDOOR, LANDMARK_NEWTYPE
 
 MapGroup_Sugar:
-	map SugarRoute, TILESET_HAITEKU, ROUTE, LANDMARK_SUGAR_ROUTE
-	map Sugar, TILESET_HAITEKU, TOWN, LANDMARK_SUGAR
+	map SugarRoute, TILESET_HIGH_TECH, ROUTE, LANDMARK_SUGAR_ROUTE
+	map Sugar, TILESET_HIGH_TECH, TOWN, LANDMARK_SUGAR
 	map SugarRouteGate, TILESET_GATE, GATE, LANDMARK_SUGAR_ROUTE
 	map SugarHouse, TILESET_GYM, INDOOR, LANDMARK_SUGAR
 	map SugarHouse2, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_SUGAR
@@ -178,22 +178,22 @@ MapGroup_Sugar:
 	map SugarPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR
 	map SugarPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR
 
-MapGroup_Bull:
-	map BullForestRoute1, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_1
-	map BullForestRoute2, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_2
-	map BullForestRoute3, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_3
-	map BullForest, TILESET_BULL_FOREST, TOWN, LANDMARK_BULL_FOREST
-	map BullForestRoute1House, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST_ROUTE_1
-	map BullForestRouteGateStand, TILESET_GATE, GATE, LANDMARK_BULL_FOREST_ROUTE_2
-	map BullMart, TILESET_MART, INDOOR, LANDMARK_BULL_FOREST
-	map BullHouse1, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_BULL_FOREST
-	map BullHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST
-	map BullHouse3, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST
-	map BullPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BULL_FOREST
-	map BullPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BULL_FOREST
-	map BullLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BULL_FOREST
-	map BullLeague2F, TILESET_GYM, INDOOR, LANDMARK_BULL_FOREST
-	map BullHouse4, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST
+MapGroup_Blue:
+	map BlueForestRoute1, TILESET_NORTH, ROUTE, LANDMARK_BLUE_FOREST_ROUTE_1
+	map BlueForestRoute2, TILESET_NORTH, ROUTE, LANDMARK_BLUE_FOREST_ROUTE_2
+	map BlueForestRoute3, TILESET_NORTH, ROUTE, LANDMARK_BLUE_FOREST_ROUTE_3
+	map BlueForest, TILESET_NORTH, TOWN, LANDMARK_BLUE_FOREST
+	map BlueForestRoute1House, TILESET_HOUSE, INDOOR, LANDMARK_BLUE_FOREST_ROUTE_1
+	map BlueForestRouteGateStand, TILESET_GATE, GATE, LANDMARK_BLUE_FOREST_ROUTE_2
+	map BlueMart, TILESET_MART, INDOOR, LANDMARK_BLUE_FOREST
+	map BlueHouse1, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_BLUE_FOREST
+	map BlueHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BLUE_FOREST
+	map BlueHouse3, TILESET_HOUSE, INDOOR, LANDMARK_BLUE_FOREST
+	map BluePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BLUE_FOREST
+	map BluePokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BLUE_FOREST
+	map BlueLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BLUE_FOREST
+	map BlueLeague2F, TILESET_GYM, INDOOR, LANDMARK_BLUE_FOREST
+	map BlueHouse4, TILESET_HOUSE, INDOOR, LANDMARK_BLUE_FOREST
 
 MapGroup_Stand:
 	map StandRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_STAND_ROUTE
@@ -267,7 +267,7 @@ MapGroup_South:
 	map SouthHouse2, TILESET_HOUSE, INDOOR, LANDMARK_SOUTH
 
 MapGroup_North:
-	map North, TILESET_BULL_FOREST, TOWN, LANDMARK_NORTH
+	map North, TILESET_NORTH, TOWN, LANDMARK_NORTH
 	map NorthHouse1, TILESET_HOUSE, INDOOR, LANDMARK_NORTH
 	map NorthMart, TILESET_MART, INDOOR, LANDMARK_NORTH
 	map NorthHouse2, TILESET_HOUSE, INDOOR, LANDMARK_NORTH

data/maps/objects/Baadon.asm

@@ -1,36 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/Baadon.asm", ROMX
-
-	map_attributes Baadon, BAADON, NORTH | SOUTH | EAST
-	connection north, FontoRoute4, FONTO_ROUTE_4, 0
-	connection south, BaadonRoute1, BAADON_ROUTE_1, 0
-	connection east, BaadonRoute2, BAADON_ROUTE_2, 0
-
-Baadon_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  3,  4, BAADON_MART, 1, 50
-	warp_event 15,  4, BAADON_POKECENTER_1F, 1, 56
-	warp_event  4,  9, BAADON_HOUSE_1, 1, 83
-	warp_event  3, 13, BAADON_WALLPAPER_HOUSE, 1, 114
-	warp_event  9, 13, BAADON_HOUSE_2, 1, 117
-	warp_event 14, 15, BAADON_LEAGUE_1F, 1, 136
-	warp_event 15, 15, BAADON_LEAGUE_1F, 2, 136
-	warp_event  8,  5, FONTO_ROUTE_GATE_2, 1, 53
-	warp_event  9,  5, FONTO_ROUTE_GATE_2, 2, 53
-
-	def_bg_events
-	bg_event  4,  4, 1
-	bg_event 16,  4, 2
-	bg_event 11, 10, 3
-	bg_event  6, 14, 4
-
-	def_object_events
-	object_event 14,  8, SPRITE_SUPER_NERD, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  9, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10, 14, SPRITE_TWIN, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-Baadon_Blocks::
-INCBIN "maps/Baadon.blk"

data/maps/objects/BaadonHouse1.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BaadonHouse1.asm", ROMX
-
-	map_attributes BaadonHouse1, BAADON_HOUSE_1, 0
-
-BaadonHouse1_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  3,  7, BAADON, 3, 42
-	warp_event  4,  7, BAADON, 3, 43
-
-	def_bg_events
-
-	def_object_events
-	object_event  2,  3, SPRITE_ELDER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-BaadonHouse1_Blocks::
-INCBIN "maps/BaadonHouse1.blk"

data/maps/objects/BaadonHouse2.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BaadonHouse2.asm", ROMX
-
-	map_attributes BaadonHouse2, BAADON_HOUSE_2, 0
-
-BaadonHouse2_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, BAADON, 5, 47
-	warp_event  5,  7, BAADON, 5, 47
-
-	def_bg_events
-
-	def_object_events
-	object_event  7,  5, SPRITE_GRANNY, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-BaadonHouse2_Blocks::
-INCBIN "maps/BaadonHouse2.blk"

data/maps/objects/BaadonRoute1.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BaadonRoute1.asm", ROMX
-
-	map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH
-	connection north, Baadon, BAADON, 0
-	connection south, West, WEST, -5
-
-BaadonRoute1_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event 12, 48, BAADON_ROUTE_GATE_WEST, 3, 407
-	warp_event 13, 48, BAADON_ROUTE_GATE_WEST, 4, 407
-
-	def_bg_events
-
-	def_object_events
-
-BaadonRoute1_Blocks::
-INCBIN "maps/BaadonRoute1.blk"

data/maps/objects/BaadonRoute2.asm

@@ -1,19 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BaadonRoute2.asm", ROMX
-
-	map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST
-	connection west, Baadon, BAADON, 0
-	connection east, BaadonRoute3, BAADON_ROUTE_3, 0
-
-BaadonRoute2_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-
-	def_bg_events
-
-	def_object_events
-
-BaadonRoute2_Blocks::
-INCBIN "maps/BaadonRoute2.blk"

data/maps/objects/BaadonRoute3.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BaadonRoute3.asm", ROMX
-
-	map_attributes BaadonRoute3, BAADON_ROUTE_3, SOUTH | WEST
-	connection south, Route15, ROUTE_15, 0
-	connection west, BaadonRoute2, BAADON_ROUTE_2, 0
-
-BaadonRoute3_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  8, 30, BAADON_ROUTE_GATE_NEWTYPE, 3, 261
-	warp_event  9, 30, BAADON_ROUTE_GATE_NEWTYPE, 4, 261
-
-	def_bg_events
-
-	def_object_events
-
-BaadonRoute3_Blocks::
-INCBIN "maps/BaadonRoute3.blk"

data/maps/objects/BaadonRouteGateNewtype.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BaadonRouteGateNewtype.asm", ROMX
-
-	map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0
-
-BaadonRouteGateNewtype_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, ROUTE_15, 1, 47
-	warp_event  5,  7, ROUTE_15, 2, 47
-	warp_event  4,  0, BAADON_ROUTE_3, 1, 14
-	warp_event  5,  0, BAADON_ROUTE_3, 2, 14
-
-	def_bg_events
-
-	def_object_events
-
-BaadonRouteGateNewtype_Blocks::
-INCBIN "maps/BaadonRouteGateNewtype.blk"

data/maps/objects/BaadonRouteGateWest.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BaadonRouteGateWest.asm", ROMX
-
-	map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0
-
-BaadonRouteGateWest_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, WEST, 11, 47
-	warp_event  5,  7, WEST, 12, 47
-	warp_event  4,  0, BAADON_ROUTE_1, 1, 14
-	warp_event  5,  0, BAADON_ROUTE_1, 2, 14
-
-	def_bg_events
-
-	def_object_events
-
-BaadonRouteGateWest_Blocks::
-INCBIN "maps/BaadonRouteGateWest.blk"

data/maps/objects/BaadonWallpaperHouse.asm

@@ -1,19 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BaadonWallpaperHouse.asm", ROMX
-
-	map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0
-
-BaadonWallpaperHouse_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  2,  7, BAADON, 4, 42
-	warp_event  3,  7, BAADON, 4, 42
-
-	def_bg_events
-
-	def_object_events
-
-BaadonWallpaperHouse_Blocks::
-INCBIN "maps/BaadonWallpaperHouse.blk"

data/maps/objects/Birdon.asm

@@ -0,0 +1,36 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/Birdon.asm", ROMX
+
+	map_attributes Birdon, BIRDON, NORTH | SOUTH | EAST
+	connection north, FontRoute4, FONT_ROUTE_4, 0
+	connection south, BirdonRoute1, BIRDON_ROUTE_1, 0
+	connection east, BirdonRoute2, BIRDON_ROUTE_2, 0
+
+Birdon_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  3,  4, BIRDON_MART, 1, 50
+	warp_event 15,  4, BIRDON_POKECENTER_1F, 1, 56
+	warp_event  4,  9, BIRDON_HOUSE_1, 1, 83
+	warp_event  3, 13, BIRDON_WALLPAPER_HOUSE, 1, 114
+	warp_event  9, 13, BIRDON_HOUSE_2, 1, 117
+	warp_event 14, 15, BIRDON_LEAGUE_1F, 1, 136
+	warp_event 15, 15, BIRDON_LEAGUE_1F, 2, 136
+	warp_event  8,  5, FONT_ROUTE_GATE_2, 1, 53
+	warp_event  9,  5, FONT_ROUTE_GATE_2, 2, 53
+
+	def_bg_events
+	bg_event  4,  4, 1
+	bg_event 16,  4, 2
+	bg_event 11, 10, 3
+	bg_event  6, 14, 4
+
+	def_object_events
+	object_event 14,  8, SPRITE_SUPER_NERD, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  9, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10, 14, SPRITE_TWIN, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+Birdon_Blocks::
+INCBIN "maps/Birdon.blk"

data/maps/objects/BirdonHouse1.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BirdonHouse1.asm", ROMX
+
+	map_attributes BirdonHouse1, BIRDON_HOUSE_1, 0
+
+BirdonHouse1_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  3,  7, BIRDON, 3, 42
+	warp_event  4,  7, BIRDON, 3, 43
+
+	def_bg_events
+
+	def_object_events
+	object_event  2,  3, SPRITE_ELDER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+BirdonHouse1_Blocks::
+INCBIN "maps/BirdonHouse1.blk"

data/maps/objects/BirdonHouse2.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BirdonHouse2.asm", ROMX
+
+	map_attributes BirdonHouse2, BIRDON_HOUSE_2, 0
+
+BirdonHouse2_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, BIRDON, 5, 47
+	warp_event  5,  7, BIRDON, 5, 47
+
+	def_bg_events
+
+	def_object_events
+	object_event  7,  5, SPRITE_GRANNY, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+BirdonHouse2_Blocks::
+INCBIN "maps/BirdonHouse2.blk"

data/maps/objects/BirdonLeague1F.asm

@@ -1,16 +1,16 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BaadonLeague1F.asm", ROMX
+SECTION "data/maps/objects/BirdonLeague1F.asm", ROMX
 
-	map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0
+	map_attributes BirdonLeague1F, BIRDON_LEAGUE_1F, 0
 
-BaadonLeague1F_MapEvents::
+BirdonLeague1F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  3, 15, BAADON, 6, 82
-	warp_event  4, 15, BAADON, 7, 83
-	warp_event  7,  1, BAADON_LEAGUE_2F, 1, 14
+	warp_event  3, 15, BIRDON, 6, 82
+	warp_event  4, 15, BIRDON, 7, 83
+	warp_event  7,  1, BIRDON_LEAGUE_2F, 1, 14
 
 	def_bg_events
 
@@ -21,5 +21,5 @@ BaadonLeague1F_MapEvents::
 	object_event  3,  1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonLeague1F_Blocks::
-INCBIN "maps/BaadonLeague1F.blk"
+BirdonLeague1F_Blocks::
+INCBIN "maps/BirdonLeague1F.blk"

data/maps/objects/BirdonLeague2F.asm

@@ -1,14 +1,14 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BaadonLeague2F.asm", ROMX
+SECTION "data/maps/objects/BirdonLeague2F.asm", ROMX
 
-	map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0
+	map_attributes BirdonLeague2F, BIRDON_LEAGUE_2F, 0
 
-BaadonLeague2F_MapEvents::
+BirdonLeague2F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  7, 15, BAADON_LEAGUE_1F, 3, 92
+	warp_event  7, 15, BIRDON_LEAGUE_1F, 3, 92
 
 	def_bg_events
 
@@ -19,5 +19,5 @@ BaadonLeague2F_MapEvents::
 	object_event  9,  9, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  2, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonLeague2F_Blocks::
-INCBIN "maps/BaadonLeague2F.blk"
+BirdonLeague2F_Blocks::
+INCBIN "maps/BirdonLeague2F.blk"

data/maps/objects/BirdonMart.asm

@@ -1,15 +1,15 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BaadonMart.asm", ROMX
+SECTION "data/maps/objects/BirdonMart.asm", ROMX
 
-	map_attributes BaadonMart, BAADON_MART, 0
+	map_attributes BirdonMart, BIRDON_MART, 0
 
-BaadonMart_MapEvents::
+BirdonMart_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  4,  7, BAADON, 1, 59
-	warp_event  5,  7, BAADON, 1, 59
+	warp_event  4,  7, BIRDON, 1, 59
+	warp_event  5,  7, BIRDON, 1, 59
 
 	def_bg_events
 
@@ -18,5 +18,5 @@ BaadonMart_MapEvents::
 	object_event 10,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  4,  1, SPRITE_TEACHER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonMart_Blocks::
-INCBIN "maps/BaadonMart.blk"
+BirdonMart_Blocks::
+INCBIN "maps/BirdonMart.blk"

data/maps/objects/BirdonPokecenter1F.asm

@@ -1,16 +1,16 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BaadonPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/BirdonPokecenter1F.asm", ROMX
 
-	map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0
+	map_attributes BirdonPokecenter1F, BIRDON_POKECENTER_1F, 0
 
-BaadonPokecenter1F_MapEvents::
+BirdonPokecenter1F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  5,  7, BAADON, 2, 59
-	warp_event  6,  7, BAADON, 2, 60
-	warp_event  0,  7, BAADON_POKECENTER_2F, 1, 57
+	warp_event  5,  7, BIRDON, 2, 59
+	warp_event  6,  7, BIRDON, 2, 60
+	warp_event  0,  7, BIRDON_POKECENTER_2F, 1, 57
 
 	def_bg_events
 
@@ -19,5 +19,5 @@ BaadonPokecenter1F_MapEvents::
 	object_event  2,  5, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10,  1, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonPokecenter1F_Blocks::
-INCBIN "maps/BaadonPokecenter1F.blk"
+BirdonPokecenter1F_Blocks::
+INCBIN "maps/BirdonPokecenter1F.blk"

data/maps/objects/BirdonPokecenter2F.asm

@@ -1,14 +1,14 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BaadonPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/BirdonPokecenter2F.asm", ROMX
 
-	map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0
+	map_attributes BirdonPokecenter2F, BIRDON_POKECENTER_2F, 0
 
-BaadonPokecenter2F_MapEvents::
+BirdonPokecenter2F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  0,  7, BAADON_POKECENTER_1F, 3, 57
+	warp_event  0,  7, BIRDON_POKECENTER_1F, 3, 57
 
 	def_bg_events
 
@@ -17,5 +17,5 @@ BaadonPokecenter2F_MapEvents::
 	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonPokecenter2F_Blocks::
-INCBIN "maps/BaadonPokecenter2F.blk"
+BirdonPokecenter2F_Blocks::
+INCBIN "maps/BirdonPokecenter2F.blk"

data/maps/objects/BirdonRoute1.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BirdonRoute1.asm", ROMX
+
+	map_attributes BirdonRoute1, BIRDON_ROUTE_1, NORTH | SOUTH
+	connection north, Birdon, BIRDON, 0
+	connection south, West, WEST, -5
+
+BirdonRoute1_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event 12, 48, BIRDON_ROUTE_GATE_WEST, 3, 407
+	warp_event 13, 48, BIRDON_ROUTE_GATE_WEST, 4, 407
+
+	def_bg_events
+
+	def_object_events
+
+BirdonRoute1_Blocks::
+INCBIN "maps/BirdonRoute1.blk"

data/maps/objects/BirdonRoute2.asm

@@ -0,0 +1,19 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BirdonRoute2.asm", ROMX
+
+	map_attributes BirdonRoute2, BIRDON_ROUTE_2, WEST | EAST
+	connection west, Birdon, BIRDON, 0
+	connection east, BirdonRoute3, BIRDON_ROUTE_3, 0
+
+BirdonRoute2_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+
+	def_bg_events
+
+	def_object_events
+
+BirdonRoute2_Blocks::
+INCBIN "maps/BirdonRoute2.blk"

data/maps/objects/BirdonRoute3.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BirdonRoute3.asm", ROMX
+
+	map_attributes BirdonRoute3, BIRDON_ROUTE_3, SOUTH | WEST
+	connection south, Route15, ROUTE_15, 0
+	connection west, BirdonRoute2, BIRDON_ROUTE_2, 0
+
+BirdonRoute3_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  8, 30, BIRDON_ROUTE_GATE_NEWTYPE, 3, 261
+	warp_event  9, 30, BIRDON_ROUTE_GATE_NEWTYPE, 4, 261
+
+	def_bg_events
+
+	def_object_events
+
+BirdonRoute3_Blocks::
+INCBIN "maps/BirdonRoute3.blk"

data/maps/objects/BirdonRouteGateNewtype.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BirdonRouteGateNewtype.asm", ROMX
+
+	map_attributes BirdonRouteGateNewtype, BIRDON_ROUTE_GATE_NEWTYPE, 0
+
+BirdonRouteGateNewtype_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, ROUTE_15, 1, 47
+	warp_event  5,  7, ROUTE_15, 2, 47
+	warp_event  4,  0, BIRDON_ROUTE_3, 1, 14
+	warp_event  5,  0, BIRDON_ROUTE_3, 2, 14
+
+	def_bg_events
+
+	def_object_events
+
+BirdonRouteGateNewtype_Blocks::
+INCBIN "maps/BirdonRouteGateNewtype.blk"

data/maps/objects/BirdonRouteGateWest.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BirdonRouteGateWest.asm", ROMX
+
+	map_attributes BirdonRouteGateWest, BIRDON_ROUTE_GATE_WEST, 0
+
+BirdonRouteGateWest_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, WEST, 11, 47
+	warp_event  5,  7, WEST, 12, 47
+	warp_event  4,  0, BIRDON_ROUTE_1, 1, 14
+	warp_event  5,  0, BIRDON_ROUTE_1, 2, 14
+
+	def_bg_events
+
+	def_object_events
+
+BirdonRouteGateWest_Blocks::
+INCBIN "maps/BirdonRouteGateWest.blk"

data/maps/objects/BirdonWallpaperHouse.asm

@@ -0,0 +1,19 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BirdonWallpaperHouse.asm", ROMX
+
+	map_attributes BirdonWallpaperHouse, BIRDON_WALLPAPER_HOUSE, 0
+
+BirdonWallpaperHouse_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  2,  7, BIRDON, 4, 42
+	warp_event  3,  7, BIRDON, 4, 42
+
+	def_bg_events
+
+	def_object_events
+
+BirdonWallpaperHouse_Blocks::
+INCBIN "maps/BirdonWallpaperHouse.blk"

data/maps/objects/BlueForest.asm

@@ -0,0 +1,36 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueForest.asm", ROMX
+
+	map_attributes BlueForest, BLUE_FOREST, NORTH | SOUTH | WEST
+	connection north, BlueForestRoute3, BLUE_FOREST_ROUTE_3, 5
+	connection south, BlueForestRoute2, BLUE_FOREST_ROUTE_2, 5
+	connection west, BlueForestRoute1, BLUE_FOREST_ROUTE_1, 9
+
+BlueForest_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event 25,  6, BLUE_MART, 1, 117
+	warp_event  9,  9, BLUE_HOUSE_1, 1, 135
+	warp_event 27, 11, BLUE_HOUSE_2, 1, 170
+	warp_event 19, 13, BLUE_HOUSE_3, 1, 192
+	warp_event 13, 18, BLUE_POKECENTER_1F, 1, 267
+	warp_event 26, 21, BLUE_LEAGUE_1F, 1, 300
+	warp_event 27, 21, BLUE_LEAGUE_1F, 2, 300
+	warp_event  3, 22, BLUE_HOUSE_4, 1, 314
+
+	def_bg_events
+	bg_event 26,  6, 1
+	bg_event  2, 16, 2
+	bg_event 14, 18, 3
+
+	def_object_events
+	object_event 21,  9, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_X, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 11, 12, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7, 16, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 20, 19, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 20, 29, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+
+BlueForest_Blocks::
+INCBIN "maps/BlueForest.blk"

data/maps/objects/BlueForestRoute1.asm

@@ -0,0 +1,22 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueForestRoute1.asm", ROMX
+
+	map_attributes BlueForestRoute1, BLUE_FOREST_ROUTE_1, SOUTH | EAST
+	connection south, Route18, ROUTE_18, 0
+	connection east, BlueForest, BLUE_FOREST, -9
+
+BlueForestRoute1_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  8, 12, NEWTYPE_ROUTE_GATE, 3, 222
+	warp_event  9, 12, NEWTYPE_ROUTE_GATE, 4, 222
+	warp_event  9,  5, BLUE_FOREST_ROUTE_1_HOUSE, 1, 98
+
+	def_bg_events
+
+	def_object_events
+
+BlueForestRoute1_Blocks::
+INCBIN "maps/BlueForestRoute1.blk"

data/maps/objects/BlueForestRoute1House.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueForestRoute1House.asm", ROMX
+
+	map_attributes BlueForestRoute1House, BLUE_FOREST_ROUTE_1_HOUSE, 0
+
+BlueForestRoute1House_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, BLUE_FOREST_ROUTE_1, 3, 47
+	warp_event  5,  7, BLUE_FOREST_ROUTE_1, 3, 47
+
+	def_bg_events
+
+	def_object_events
+	object_event  1,  5, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+BlueForestRoute1House_Blocks::
+INCBIN "maps/BlueForestRoute1House.blk"

data/maps/objects/BlueForestRoute2.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueForestRoute2.asm", ROMX
+
+	map_attributes BlueForestRoute2, BLUE_FOREST_ROUTE_2, NORTH | SOUTH
+	connection north, BlueForest, BLUE_FOREST, -5
+	connection south, Stand, STAND, -10
+
+BlueForestRoute2_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  8, 48, BLUE_FOREST_ROUTE_GATE_STAND, 3, 405
+	warp_event  9, 48, BLUE_FOREST_ROUTE_GATE_STAND, 4, 405
+
+	def_bg_events
+
+	def_object_events
+
+BlueForestRoute2_Blocks::
+INCBIN "maps/BlueForestRoute2.blk"

data/maps/objects/BlueForestRoute3.asm

@@ -0,0 +1,19 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueForestRoute3.asm", ROMX
+
+	map_attributes BlueForestRoute3, BLUE_FOREST_ROUTE_3, NORTH | SOUTH
+	connection north, North, NORTH, 0
+	connection south, BlueForest, BLUE_FOREST, -5
+
+BlueForestRoute3_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+
+	def_bg_events
+
+	def_object_events
+
+BlueForestRoute3_Blocks::
+INCBIN "maps/BlueForestRoute3.blk"

data/maps/objects/BlueForestRouteGateStand.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueForestRouteGateStand.asm", ROMX
+
+	map_attributes BlueForestRouteGateStand, BLUE_FOREST_ROUTE_GATE_STAND, 0
+
+BlueForestRouteGateStand_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, STAND, 9, 47
+	warp_event  5,  7, STAND, 10, 47
+	warp_event  4,  0, BLUE_FOREST_ROUTE_2, 1, 14
+	warp_event  5,  0, BLUE_FOREST_ROUTE_2, 2, 14
+
+	def_bg_events
+
+	def_object_events
+
+BlueForestRouteGateStand_Blocks::
+INCBIN "maps/BlueForestRouteGateStand.blk"

data/maps/objects/BlueHouse1.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueHouse1.asm", ROMX
+
+	map_attributes BlueHouse1, BLUE_HOUSE_1, 0
+
+BlueHouse1_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  3,  7, BLUE_FOREST, 2, 42
+	warp_event  4,  7, BLUE_FOREST, 2, 43
+
+	def_bg_events
+
+	def_object_events
+	object_event  2,  3, SPRITE_KIKUKO, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+BlueHouse1_Blocks::
+INCBIN "maps/BlueHouse1.blk"

data/maps/objects/BlueHouse2.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueHouse2.asm", ROMX
+
+	map_attributes BlueHouse2, BLUE_HOUSE_2, 0
+
+BlueHouse2_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, BLUE_FOREST, 3, 47
+	warp_event  5,  7, BLUE_FOREST, 3, 47
+
+	def_bg_events
+
+	def_object_events
+	object_event  8,  4, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+
+BlueHouse2_Blocks::
+INCBIN "maps/BlueHouse2.blk"

data/maps/objects/BlueHouse3.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueHouse3.asm", ROMX
+
+	map_attributes BlueHouse3, BLUE_HOUSE_3, 0
+
+BlueHouse3_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, BLUE_FOREST, 4, 47
+	warp_event  5,  7, BLUE_FOREST, 4, 47
+
+	def_bg_events
+
+	def_object_events
+	object_event  4,  3, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+BlueHouse3_Blocks::
+INCBIN "maps/BlueHouse3.blk"

data/maps/objects/BlueHouse4.asm

@@ -0,0 +1,19 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/BlueHouse4.asm", ROMX
+
+	map_attributes BlueHouse4, BLUE_HOUSE_4, 0
+
+BlueHouse4_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, BLUE_FOREST, 8, 47
+	warp_event  5,  7, BLUE_FOREST, 8, 47
+
+	def_bg_events
+
+	def_object_events
+
+BlueHouse4_Blocks::
+INCBIN "maps/BlueHouse4.blk"

data/maps/objects/BlueLeague1F.asm

@@ -1,16 +1,16 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BullLeague1F.asm", ROMX
+SECTION "data/maps/objects/BlueLeague1F.asm", ROMX
 
-	map_attributes BullLeague1F, BULL_LEAGUE_1F, 0
+	map_attributes BlueLeague1F, BLUE_LEAGUE_1F, 0
 
-BullLeague1F_MapEvents::
+BlueLeague1F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  3, 15, BULL_FOREST, 6, 82
-	warp_event  4, 15, BULL_FOREST, 7, 83
-	warp_event  7,  1, BULL_LEAGUE_2F, 1, 14
+	warp_event  3, 15, BLUE_FOREST, 6, 82
+	warp_event  4, 15, BLUE_FOREST, 7, 83
+	warp_event  7,  1, BLUE_LEAGUE_2F, 1, 14
 
 	def_bg_events
 
@@ -21,5 +21,5 @@ BullLeague1F_MapEvents::
 	object_event  3,  1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullLeague1F_Blocks::
-INCBIN "maps/BullLeague1F.blk"
+BlueLeague1F_Blocks::
+INCBIN "maps/BlueLeague1F.blk"

data/maps/objects/BlueLeague2F.asm

@@ -1,14 +1,14 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BullLeague2F.asm", ROMX
+SECTION "data/maps/objects/BlueLeague2F.asm", ROMX
 
-	map_attributes BullLeague2F, BULL_LEAGUE_2F, 0
+	map_attributes BlueLeague2F, BLUE_LEAGUE_2F, 0
 
-BullLeague2F_MapEvents::
+BlueLeague2F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  7, 15, BULL_LEAGUE_1F, 3, 92
+	warp_event  7, 15, BLUE_LEAGUE_1F, 3, 92
 
 	def_bg_events
 
@@ -19,5 +19,5 @@ BullLeague2F_MapEvents::
 	object_event  2, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  7, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullLeague2F_Blocks::
-INCBIN "maps/BullLeague2F.blk"
+BlueLeague2F_Blocks::
+INCBIN "maps/BlueLeague2F.blk"

data/maps/objects/BlueMart.asm

@@ -1,15 +1,15 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BullMart.asm", ROMX
+SECTION "data/maps/objects/BlueMart.asm", ROMX
 
-	map_attributes BullMart, BULL_MART, 0
+	map_attributes BlueMart, BLUE_MART, 0
 
-BullMart_MapEvents::
+BlueMart_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  4,  7, BULL_FOREST, 1, 59
-	warp_event  5,  7, BULL_FOREST, 1, 59
+	warp_event  4,  7, BLUE_FOREST, 1, 59
+	warp_event  5,  7, BLUE_FOREST, 1, 59
 
 	def_bg_events
 
@@ -18,5 +18,5 @@ BullMart_MapEvents::
 	object_event 10,  5, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  4,  1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullMart_Blocks::
-INCBIN "maps/BullMart.blk"
+BlueMart_Blocks::
+INCBIN "maps/BlueMart.blk"

data/maps/objects/BluePokecenter1F.asm

@@ -1,16 +1,16 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BullPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/BluePokecenter1F.asm", ROMX
 
-	map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0
+	map_attributes BluePokecenter1F, BLUE_POKECENTER_1F, 0
 
-BullPokecenter1F_MapEvents::
+BluePokecenter1F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  5,  7, BULL_FOREST, 5, 59
-	warp_event  6,  7, BULL_FOREST, 5, 60
-	warp_event  0,  7, BULL_POKECENTER_2F, 1, 57
+	warp_event  5,  7, BLUE_FOREST, 5, 59
+	warp_event  6,  7, BLUE_FOREST, 5, 60
+	warp_event  0,  7, BLUE_POKECENTER_2F, 1, 57
 
 	def_bg_events
 
@@ -20,5 +20,5 @@ BullPokecenter1F_MapEvents::
 	object_event  2,  5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10,  1, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullPokecenter1F_Blocks::
-INCBIN "maps/BullPokecenter1F.blk"
+BluePokecenter1F_Blocks::
+INCBIN "maps/BluePokecenter1F.blk"

data/maps/objects/BluePokecenter2F.asm

@@ -1,14 +1,14 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/BullPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/BluePokecenter2F.asm", ROMX
 
-	map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0
+	map_attributes BluePokecenter2F, BLUE_POKECENTER_2F, 0
 
-BullPokecenter2F_MapEvents::
+BluePokecenter2F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  0,  7, BULL_POKECENTER_1F, 3, 57
+	warp_event  0,  7, BLUE_POKECENTER_1F, 3, 57
 
 	def_bg_events
 
@@ -17,5 +17,5 @@ BullPokecenter2F_MapEvents::
 	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullPokecenter2F_Blocks::
-INCBIN "maps/BullPokecenter2F.blk"
+BluePokecenter2F_Blocks::
+INCBIN "maps/BluePokecenter2F.blk"

data/maps/objects/BullForest.asm

@@ -1,36 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullForest.asm", ROMX
-
-	map_attributes BullForest, BULL_FOREST, NORTH | SOUTH | WEST
-	connection north, BullForestRoute3, BULL_FOREST_ROUTE_3, 5
-	connection south, BullForestRoute2, BULL_FOREST_ROUTE_2, 5
-	connection west, BullForestRoute1, BULL_FOREST_ROUTE_1, 9
-
-BullForest_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event 25,  6, BULL_MART, 1, 117
-	warp_event  9,  9, BULL_HOUSE_1, 1, 135
-	warp_event 27, 11, BULL_HOUSE_2, 1, 170
-	warp_event 19, 13, BULL_HOUSE_3, 1, 192
-	warp_event 13, 18, BULL_POKECENTER_1F, 1, 267
-	warp_event 26, 21, BULL_LEAGUE_1F, 1, 300
-	warp_event 27, 21, BULL_LEAGUE_1F, 2, 300
-	warp_event  3, 22, BULL_HOUSE_4, 1, 314
-
-	def_bg_events
-	bg_event 26,  6, 1
-	bg_event  2, 16, 2
-	bg_event 14, 18, 3
-
-	def_object_events
-	object_event 21,  9, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_X, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 11, 12, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  7, 16, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 20, 19, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 20, 29, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-
-BullForest_Blocks::
-INCBIN "maps/BullForest.blk"

data/maps/objects/BullForestRoute1.asm

@@ -1,22 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullForestRoute1.asm", ROMX
-
-	map_attributes BullForestRoute1, BULL_FOREST_ROUTE_1, SOUTH | EAST
-	connection south, Route18, ROUTE_18, 0
-	connection east, BullForest, BULL_FOREST, -9
-
-BullForestRoute1_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  8, 12, NEWTYPE_ROUTE_GATE, 3, 222
-	warp_event  9, 12, NEWTYPE_ROUTE_GATE, 4, 222
-	warp_event  9,  5, BULL_FOREST_ROUTE_1_HOUSE, 1, 98
-
-	def_bg_events
-
-	def_object_events
-
-BullForestRoute1_Blocks::
-INCBIN "maps/BullForestRoute1.blk"

data/maps/objects/BullForestRoute1House.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullForestRoute1House.asm", ROMX
-
-	map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0
-
-BullForestRoute1House_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, BULL_FOREST_ROUTE_1, 3, 47
-	warp_event  5,  7, BULL_FOREST_ROUTE_1, 3, 47
-
-	def_bg_events
-
-	def_object_events
-	object_event  1,  5, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-BullForestRoute1House_Blocks::
-INCBIN "maps/BullForestRoute1House.blk"

data/maps/objects/BullForestRoute2.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullForestRoute2.asm", ROMX
-
-	map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH
-	connection north, BullForest, BULL_FOREST, -5
-	connection south, Stand, STAND, -10
-
-BullForestRoute2_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  8, 48, BULL_FOREST_ROUTE_GATE_STAND, 3, 405
-	warp_event  9, 48, BULL_FOREST_ROUTE_GATE_STAND, 4, 405
-
-	def_bg_events
-
-	def_object_events
-
-BullForestRoute2_Blocks::
-INCBIN "maps/BullForestRoute2.blk"

data/maps/objects/BullForestRoute3.asm

@@ -1,19 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullForestRoute3.asm", ROMX
-
-	map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH
-	connection north, North, NORTH, 0
-	connection south, BullForest, BULL_FOREST, -5
-
-BullForestRoute3_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-
-	def_bg_events
-
-	def_object_events
-
-BullForestRoute3_Blocks::
-INCBIN "maps/BullForestRoute3.blk"

data/maps/objects/BullForestRouteGateStand.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullForestRouteGateStand.asm", ROMX
-
-	map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0
-
-BullForestRouteGateStand_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, STAND, 9, 47
-	warp_event  5,  7, STAND, 10, 47
-	warp_event  4,  0, BULL_FOREST_ROUTE_2, 1, 14
-	warp_event  5,  0, BULL_FOREST_ROUTE_2, 2, 14
-
-	def_bg_events
-
-	def_object_events
-
-BullForestRouteGateStand_Blocks::
-INCBIN "maps/BullForestRouteGateStand.blk"

data/maps/objects/BullHouse1.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullHouse1.asm", ROMX
-
-	map_attributes BullHouse1, BULL_HOUSE_1, 0
-
-BullHouse1_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  3,  7, BULL_FOREST, 2, 42
-	warp_event  4,  7, BULL_FOREST, 2, 43
-
-	def_bg_events
-
-	def_object_events
-	object_event  2,  3, SPRITE_KIKUKO, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-BullHouse1_Blocks::
-INCBIN "maps/BullHouse1.blk"

data/maps/objects/BullHouse2.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullHouse2.asm", ROMX
-
-	map_attributes BullHouse2, BULL_HOUSE_2, 0
-
-BullHouse2_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, BULL_FOREST, 3, 47
-	warp_event  5,  7, BULL_FOREST, 3, 47
-
-	def_bg_events
-
-	def_object_events
-	object_event  8,  4, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
-
-BullHouse2_Blocks::
-INCBIN "maps/BullHouse2.blk"

data/maps/objects/BullHouse3.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullHouse3.asm", ROMX
-
-	map_attributes BullHouse3, BULL_HOUSE_3, 0
-
-BullHouse3_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, BULL_FOREST, 4, 47
-	warp_event  5,  7, BULL_FOREST, 4, 47
-
-	def_bg_events
-
-	def_object_events
-	object_event  4,  3, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-BullHouse3_Blocks::
-INCBIN "maps/BullHouse3.blk"

data/maps/objects/BullHouse4.asm

@@ -1,19 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/BullHouse4.asm", ROMX
-
-	map_attributes BullHouse4, BULL_HOUSE_4, 0
-
-BullHouse4_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, BULL_FOREST, 8, 47
-	warp_event  5,  7, BULL_FOREST, 8, 47
-
-	def_bg_events
-
-	def_object_events
-
-BullHouse4_Blocks::
-INCBIN "maps/BullHouse4.blk"

data/maps/objects/Font.asm

@@ -1,21 +1,21 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/Fonto.asm", ROMX
+SECTION "data/maps/objects/Font.asm", ROMX
 
-	map_attributes Fonto, FONTO, NORTH | WEST | EAST
-	connection north, FontoRoute2, FONTO_ROUTE_2, 0
-	connection west, FontoRoute1, FONTO_ROUTE_1, 0
-	connection east, FontoRoute3, FONTO_ROUTE_3, 0
+	map_attributes Font, FONT, NORTH | WEST | EAST
+	connection north, FontRoute2, FONT_ROUTE_2, 0
+	connection west, FontRoute1, FONT_ROUTE_1, 0
+	connection east, FontRoute3, FONT_ROUTE_3, 0
 
-Fonto_MapEvents::
+Font_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  4,  3, FONTO_ROCKET_HOUSE, 1, 35
-	warp_event 15,  4, FONTO_MART, 1, 56
-	warp_event  3,  7, FONTO_HOUSE, 1, 66
-	warp_event  3, 12, FONTO_POKECENTER_1F, 1, 114
-	warp_event 16, 13, FONTO_LAB, 1, 121
+	warp_event  4,  3, FONT_ROCKET_HOUSE, 1, 35
+	warp_event 15,  4, FONT_MART, 1, 56
+	warp_event  3,  7, FONT_HOUSE, 1, 66
+	warp_event  3, 12, FONT_POKECENTER_1F, 1, 114
+	warp_event 16, 13, FONT_LAB, 1, 121
 
 	def_bg_events
 	bg_event 15,  4, 1
@@ -30,5 +30,5 @@ Fonto_MapEvents::
 	object_event  5, 14, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 16,  8, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_XY, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-Fonto_Blocks::
-INCBIN "maps/Fonto.blk"
+Font_Blocks::
+INCBIN "maps/Font.blk"

data/maps/objects/FontHouse.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontHouse.asm", ROMX
+
+	map_attributes FontHouse, FONT_HOUSE, 0
+
+FontHouse_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, FONT, 3, 47
+	warp_event  5,  7, FONT, 3, 47
+
+	def_bg_events
+
+	def_object_events
+	object_event  8,  4, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+
+FontHouse_Blocks::
+INCBIN "maps/FontHouse.blk"

data/maps/objects/FontLab.asm

@@ -1,15 +1,15 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/FontoLab.asm", ROMX
+SECTION "data/maps/objects/FontLab.asm", ROMX
 
-	map_attributes FontoLab, FONTO_LAB, 0
+	map_attributes FontLab, FONT_LAB, 0
 
-FontoLab_MapEvents::
+FontLab_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  3,  7, FONTO, 5, 46
-	warp_event  4,  7, FONTO, 5, 47
+	warp_event  3,  7, FONT, 5, 46
+	warp_event  4,  7, FONT, 5, 47
 
 	def_bg_events
 
@@ -17,5 +17,5 @@ FontoLab_MapEvents::
 	object_event  2,  2, SPRITE_SCIENTIST, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  8,  5, SPRITE_SCIENTIST, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoLab_Blocks::
-INCBIN "maps/FontoLab.blk"
+FontLab_Blocks::
+INCBIN "maps/FontLab.blk"

data/maps/objects/FontMart.asm

@@ -1,15 +1,15 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/FontoMart.asm", ROMX
+SECTION "data/maps/objects/FontMart.asm", ROMX
 
-	map_attributes FontoMart, FONTO_MART, 0
+	map_attributes FontMart, FONT_MART, 0
 
-FontoMart_MapEvents::
+FontMart_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  4,  7, FONTO, 2, 59
-	warp_event  5,  7, FONTO, 2, 59
+	warp_event  4,  7, FONT, 2, 59
+	warp_event  5,  7, FONT, 2, 59
 
 	def_bg_events
 
@@ -18,5 +18,5 @@ FontoMart_MapEvents::
 	object_event 10,  5, SPRITE_GIRL, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  4,  1, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoMart_Blocks::
-INCBIN "maps/FontoMart.blk"
+FontMart_Blocks::
+INCBIN "maps/FontMart.blk"

data/maps/objects/FontPokecenter1F.asm

@@ -1,16 +1,16 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/FontoPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/FontPokecenter1F.asm", ROMX
 
-	map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0
+	map_attributes FontPokecenter1F, FONT_POKECENTER_1F, 0
 
-FontoPokecenter1F_MapEvents::
+FontPokecenter1F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  5,  7, FONTO, 4, 59
-	warp_event  6,  7, FONTO, 4, 60
-	warp_event  0,  7, FONTO_POKECENTER_2F, 1, 57
+	warp_event  5,  7, FONT, 4, 59
+	warp_event  6,  7, FONT, 4, 60
+	warp_event  0,  7, FONT_POKECENTER_2F, 1, 57
 
 	def_bg_events
 
@@ -20,5 +20,5 @@ FontoPokecenter1F_MapEvents::
 	object_event  2,  5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10,  1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoPokecenter1F_Blocks::
-INCBIN "maps/FontoPokecenter1F.blk"
+FontPokecenter1F_Blocks::
+INCBIN "maps/FontPokecenter1F.blk"

data/maps/objects/FontPokecenter2F.asm

@@ -1,14 +1,14 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/FontoPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/FontPokecenter2F.asm", ROMX
 
-	map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0
+	map_attributes FontPokecenter2F, FONT_POKECENTER_2F, 0
 
-FontoPokecenter2F_MapEvents::
+FontPokecenter2F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  0,  7, FONTO_POKECENTER_1F, 3, 57
+	warp_event  0,  7, FONT_POKECENTER_1F, 3, 57
 
 	def_bg_events
 
@@ -17,5 +17,5 @@ FontoPokecenter2F_MapEvents::
 	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoPokecenter2F_Blocks::
-INCBIN "maps/FontoPokecenter2F.blk"
+FontPokecenter2F_Blocks::
+INCBIN "maps/FontPokecenter2F.blk"

data/maps/objects/FontRocketHouse.asm

@@ -1,15 +1,15 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/FontoRocketHouse.asm", ROMX
+SECTION "data/maps/objects/FontRocketHouse.asm", ROMX
 
-	map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0
+	map_attributes FontRocketHouse, FONT_ROCKET_HOUSE, 0
 
-FontoRocketHouse_MapEvents::
+FontRocketHouse_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event 12,  7, FONTO, 1, 63
-	warp_event 13,  7, FONTO, 1, 63
+	warp_event 12,  7, FONT, 1, 63
+	warp_event 13,  7, FONT, 1, 63
 
 	def_bg_events
 
@@ -19,5 +19,5 @@ FontoRocketHouse_MapEvents::
 	object_event 14,  2, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 12,  2, SPRITE_PIDGEY, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoRocketHouse_Blocks::
-INCBIN "maps/FontoRocketHouse.blk"
+FontRocketHouse_Blocks::
+INCBIN "maps/FontRocketHouse.blk"

data/maps/objects/FontRoute1.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRoute1.asm", ROMX
+
+	map_attributes FontRoute1, FONT_ROUTE_1, WEST | EAST
+	connection west, South, SOUTH, 0
+	connection east, Font, FONT, 0
+
+FontRoute1_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  6,  9, FONT_ROUTE_GATE_1, 3, 209
+
+	def_bg_events
+
+	def_object_events
+
+FontRoute1_Blocks::
+INCBIN "maps/FontRoute1.blk"

data/maps/objects/FontRoute2.asm

@@ -0,0 +1,19 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRoute2.asm", ROMX
+
+	map_attributes FontRoute2, FONT_ROUTE_2, SOUTH | WEST
+	connection south, Font, FONT, 0
+	connection west, FontRoute6, FONT_ROUTE_6, 0
+
+FontRoute2_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+
+	def_bg_events
+
+	def_object_events
+
+FontRoute2_Blocks::
+INCBIN "maps/FontRoute2.blk"

data/maps/objects/FontRoute3.asm

@@ -0,0 +1,19 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRoute3.asm", ROMX
+
+	map_attributes FontRoute3, FONT_ROUTE_3, WEST | EAST
+	connection west, Font, FONT, 0
+	connection east, FontRoute4, FONT_ROUTE_4, 0
+
+FontRoute3_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+
+	def_bg_events
+
+	def_object_events
+
+FontRoute3_Blocks::
+INCBIN "maps/FontRoute3.blk"

data/maps/objects/FontRoute4.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRoute4.asm", ROMX
+
+	map_attributes FontRoute4, FONT_ROUTE_4, SOUTH | WEST
+	connection south, Birdon, BIRDON, 0
+	connection west, FontRoute3, FONT_ROUTE_3, 0
+
+FontRoute4_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  8, 30, FONT_ROUTE_GATE_2, 3, 261
+	warp_event  9, 30, FONT_ROUTE_GATE_2, 4, 261
+
+	def_bg_events
+
+	def_object_events
+
+FontRoute4_Blocks::
+INCBIN "maps/FontRoute4.blk"

data/maps/objects/FontRoute5.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRoute5.asm", ROMX
+
+	map_attributes FontRoute5, FONT_ROUTE_5, SOUTH | EAST
+	connection south, South, SOUTH, -10
+	connection east, FontRoute6, FONT_ROUTE_6, 0
+
+FontRoute5_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  8, 30, FONT_ROUTE_GATE_3, 3, 261
+	warp_event  9, 30, FONT_ROUTE_GATE_3, 4, 261
+
+	def_bg_events
+
+	def_object_events
+
+FontRoute5_Blocks::
+INCBIN "maps/FontRoute5.blk"

data/maps/objects/FontRoute6.asm

@@ -0,0 +1,19 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRoute6.asm", ROMX
+
+	map_attributes FontRoute6, FONT_ROUTE_6, WEST | EAST
+	connection west, FontRoute5, FONT_ROUTE_5, 0
+	connection east, FontRoute2, FONT_ROUTE_2, 0
+
+FontRoute6_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+
+	def_bg_events
+
+	def_object_events
+
+FontRoute6_Blocks::
+INCBIN "maps/FontRoute6.blk"

data/maps/objects/FontRouteGate1.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRouteGate1.asm", ROMX
+
+	map_attributes FontRouteGate1, FONT_ROUTE_GATE_1, 0
+
+FontRouteGate1_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  0,  7, SOUTH, 7, 45
+	warp_event  1,  7, SOUTH, 7, 45
+	warp_event  8,  7, FONT_ROUTE_1, 1, 49
+	warp_event  9,  7, FONT_ROUTE_1, 1, 49
+
+	def_bg_events
+
+	def_object_events
+
+FontRouteGate1_Blocks::
+INCBIN "maps/FontRouteGate1.blk"

data/maps/objects/FontRouteGate2.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRouteGate2.asm", ROMX
+
+	map_attributes FontRouteGate2, FONT_ROUTE_GATE_2, 0
+
+FontRouteGate2_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, BIRDON, 8, 47
+	warp_event  5,  7, BIRDON, 9, 47
+	warp_event  4,  0, FONT_ROUTE_4, 1, 14
+	warp_event  5,  0, FONT_ROUTE_4, 2, 14
+
+	def_bg_events
+
+	def_object_events
+
+FontRouteGate2_Blocks::
+INCBIN "maps/FontRouteGate2.blk"

data/maps/objects/FontRouteGate3.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/FontRouteGate3.asm", ROMX
+
+	map_attributes FontRouteGate3, FONT_ROUTE_GATE_3, 0
+
+FontRouteGate3_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, SOUTH, 5, 47
+	warp_event  5,  7, SOUTH, 6, 47
+	warp_event  4,  0, FONT_ROUTE_5, 1, 14
+	warp_event  5,  0, FONT_ROUTE_5, 2, 14
+
+	def_bg_events
+
+	def_object_events
+
+FontRouteGate3_Blocks::
+INCBIN "maps/FontRouteGate3.blk"

data/maps/objects/FontoHouse.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoHouse.asm", ROMX
-
-	map_attributes FontoHouse, FONTO_HOUSE, 0
-
-FontoHouse_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, FONTO, 3, 47
-	warp_event  5,  7, FONTO, 3, 47
-
-	def_bg_events
-
-	def_object_events
-	object_event  8,  4, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
-
-FontoHouse_Blocks::
-INCBIN "maps/FontoHouse.blk"

data/maps/objects/FontoRoute1.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRoute1.asm", ROMX
-
-	map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST
-	connection west, South, SOUTH, 0
-	connection east, Fonto, FONTO, 0
-
-FontoRoute1_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  6,  9, FONTO_ROUTE_GATE_1, 3, 209
-
-	def_bg_events
-
-	def_object_events
-
-FontoRoute1_Blocks::
-INCBIN "maps/FontoRoute1.blk"

data/maps/objects/FontoRoute2.asm

@@ -1,19 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRoute2.asm", ROMX
-
-	map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST
-	connection south, Fonto, FONTO, 0
-	connection west, FontoRoute6, FONTO_ROUTE_6, 0
-
-FontoRoute2_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-
-	def_bg_events
-
-	def_object_events
-
-FontoRoute2_Blocks::
-INCBIN "maps/FontoRoute2.blk"

data/maps/objects/FontoRoute3.asm

@@ -1,19 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRoute3.asm", ROMX
-
-	map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST
-	connection west, Fonto, FONTO, 0
-	connection east, FontoRoute4, FONTO_ROUTE_4, 0
-
-FontoRoute3_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-
-	def_bg_events
-
-	def_object_events
-
-FontoRoute3_Blocks::
-INCBIN "maps/FontoRoute3.blk"

data/maps/objects/FontoRoute4.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRoute4.asm", ROMX
-
-	map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST
-	connection south, Baadon, BAADON, 0
-	connection west, FontoRoute3, FONTO_ROUTE_3, 0
-
-FontoRoute4_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  8, 30, FONTO_ROUTE_GATE_2, 3, 261
-	warp_event  9, 30, FONTO_ROUTE_GATE_2, 4, 261
-
-	def_bg_events
-
-	def_object_events
-
-FontoRoute4_Blocks::
-INCBIN "maps/FontoRoute4.blk"

data/maps/objects/FontoRoute5.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRoute5.asm", ROMX
-
-	map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST
-	connection south, South, SOUTH, -10
-	connection east, FontoRoute6, FONTO_ROUTE_6, 0
-
-FontoRoute5_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  8, 30, FONTO_ROUTE_GATE_3, 3, 261
-	warp_event  9, 30, FONTO_ROUTE_GATE_3, 4, 261
-
-	def_bg_events
-
-	def_object_events
-
-FontoRoute5_Blocks::
-INCBIN "maps/FontoRoute5.blk"

data/maps/objects/FontoRoute6.asm

@@ -1,19 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRoute6.asm", ROMX
-
-	map_attributes FontoRoute6, FONTO_ROUTE_6, WEST | EAST
-	connection west, FontoRoute5, FONTO_ROUTE_5, 0
-	connection east, FontoRoute2, FONTO_ROUTE_2, 0
-
-FontoRoute6_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-
-	def_bg_events
-
-	def_object_events
-
-FontoRoute6_Blocks::
-INCBIN "maps/FontoRoute6.blk"

data/maps/objects/FontoRouteGate1.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRouteGate1.asm", ROMX
-
-	map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0
-
-FontoRouteGate1_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  0,  7, SOUTH, 7, 45
-	warp_event  1,  7, SOUTH, 7, 45
-	warp_event  8,  7, FONTO_ROUTE_1, 1, 49
-	warp_event  9,  7, FONTO_ROUTE_1, 1, 49
-
-	def_bg_events
-
-	def_object_events
-
-FontoRouteGate1_Blocks::
-INCBIN "maps/FontoRouteGate1.blk"

data/maps/objects/FontoRouteGate2.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRouteGate2.asm", ROMX
-
-	map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0
-
-FontoRouteGate2_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, BAADON, 8, 47
-	warp_event  5,  7, BAADON, 9, 47
-	warp_event  4,  0, FONTO_ROUTE_4, 1, 14
-	warp_event  5,  0, FONTO_ROUTE_4, 2, 14
-
-	def_bg_events
-
-	def_object_events
-
-FontoRouteGate2_Blocks::
-INCBIN "maps/FontoRouteGate2.blk"

data/maps/objects/FontoRouteGate3.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/FontoRouteGate3.asm", ROMX
-
-	map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0
-
-FontoRouteGate3_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, SOUTH, 5, 47
-	warp_event  5,  7, SOUTH, 6, 47
-	warp_event  4,  0, FONTO_ROUTE_5, 1, 14
-	warp_event  5,  0, FONTO_ROUTE_5, 2, 14
-
-	def_bg_events
-
-	def_object_events
-
-FontoRouteGate3_Blocks::
-INCBIN "maps/FontoRouteGate3.blk"

data/maps/objects/HaitekuHouse1.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/HaitekuHouse1.asm", ROMX
-
-	map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0
-
-HaitekuHouse1_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, HAITEKU, 5, 47
-	warp_event  5,  7, HAITEKU, 5, 47
-
-	def_bg_events
-
-	def_object_events
-	object_event  7,  3, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-HaitekuHouse1_Blocks::
-INCBIN "maps/HaitekuHouse1.blk"

data/maps/objects/HaitekuHouse2.asm

@@ -1,20 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/HaitekuHouse2.asm", ROMX
-
-	map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0
-
-HaitekuHouse2_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, HAITEKU, 6, 47
-	warp_event  5,  7, HAITEKU, 6, 47
-
-	def_bg_events
-
-	def_object_events
-	object_event  7,  3, SPRITE_SAILOR, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-HaitekuHouse2_Blocks::
-INCBIN "maps/HaitekuHouse2.blk"

data/maps/objects/HaitekuImposterOakHouse.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/HaitekuImposterOakHouse.asm", ROMX
-
-	map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0
-
-HaitekuImposterOakHouse_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, HAITEKU, 7, 47
-	warp_event  5,  7, HAITEKU, 7, 47
-
-	def_bg_events
-
-	def_object_events
-	object_event  7,  3, SPRITE_EVIL_OKIDO, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  2, SPRITE_POKEFAN_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
-
-HaitekuImposterOakHouse_Blocks::
-INCBIN "maps/HaitekuImposterOakHouse.blk"

data/maps/objects/HaitekuWestRoute.asm

@@ -1,19 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/HaitekuWestRoute.asm", ROMX
-
-	map_attributes HaitekuWestRoute, HAITEKU_WEST_ROUTE, WEST | EAST
-	connection west, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, -18
-	connection east, Haiteku, HAITEKU, 0
-
-HaitekuWestRoute_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-
-	def_bg_events
-
-	def_object_events
-
-HaitekuWestRoute_Blocks::
-INCBIN "maps/HaitekuWestRoute.blk"

data/maps/objects/HaitekuWestRouteGate.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/HaitekuWestRouteGate.asm", ROMX
-
-	map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0
-
-HaitekuWestRouteGate_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event  4,  7, HAITEKU_WEST_ROUTE_OCEAN, 1, 47
-	warp_event  5,  7, HAITEKU_WEST_ROUTE_OCEAN, 2, 47
-	warp_event  4,  0, SOUTH, 8, 14
-	warp_event  5,  0, SOUTH, 9, 14
-
-	def_bg_events
-
-	def_object_events
-
-HaitekuWestRouteGate_Blocks::
-INCBIN "maps/HaitekuWestRouteGate.blk"

data/maps/objects/HaitekuWestRouteOcean.asm

@@ -1,21 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/objects/HaitekuWestRouteOcean.asm", ROMX
-
-	map_attributes HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, NORTH | EAST
-	connection north, South, SOUTH, -10
-	connection east, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 18
-
-HaitekuWestRouteOcean_MapEvents::
-	dw $4000 ; unknown
-
-	def_warp_events
-	warp_event 10,  9, HAITEKU_WEST_ROUTE_GATE, 1, 86
-	warp_event 11,  9, HAITEKU_WEST_ROUTE_GATE, 2, 86
-
-	def_bg_events
-
-	def_object_events
-
-HaitekuWestRouteOcean_Blocks::
-INCBIN "maps/HaitekuWestRouteOcean.blk"

data/maps/objects/HighTech.asm

@@ -1,23 +1,23 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/Haiteku.asm", ROMX
+SECTION "data/maps/objects/HighTech.asm", ROMX
 
-	map_attributes Haiteku, HAITEKU, WEST
-	connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0
+	map_attributes HighTech, HIGHTECH, WEST
+	connection west, HighTechWestRoute, HIGHTECH_WEST_ROUTE, 0
 
-Haiteku_MapEvents::
+HighTech_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event 31, 10, HAITEKU_POKECENTER_1F, 1, 172
-	warp_event 10, 11, HAITEKU_LEAGUE_1F, 1, 162
-	warp_event 11, 11, HAITEKU_LEAGUE_1F, 2, 162
-	warp_event 31, 16, HAITEKU_MART, 1, 250
-	warp_event  7, 17, HAITEKU_HOUSE_1, 1, 238
-	warp_event 15, 17, HAITEKU_HOUSE_2, 1, 242
-	warp_event 33, 20, HAITEKU_IMPOSTER_OAK_HOUSE, 1, 303
-	warp_event  6, 27, HAITEKU_AQUARIUM_1F, 1, 368
-	warp_event  7, 27, HAITEKU_AQUARIUM_1F, 2, 368
+	warp_event 31, 10, HIGHTECH_POKECENTER_1F, 1, 172
+	warp_event 10, 11, HIGHTECH_LEAGUE_1F, 1, 162
+	warp_event 11, 11, HIGHTECH_LEAGUE_1F, 2, 162
+	warp_event 31, 16, HIGHTECH_MART, 1, 250
+	warp_event  7, 17, HIGHTECH_HOUSE_1, 1, 238
+	warp_event 15, 17, HIGHTECH_HOUSE_2, 1, 242
+	warp_event 33, 20, HIGHTECH_IMPOSTER_OAK_HOUSE, 1, 303
+	warp_event  6, 27, HIGHTECH_AQUARIUM_1F, 1, 368
+	warp_event  7, 27, HIGHTECH_AQUARIUM_1F, 2, 368
 
 	def_bg_events
 	bg_event 24,  7, 1
@@ -36,5 +36,5 @@ Haiteku_MapEvents::
 	object_event 26, 10, SPRITE_SAILOR, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 14, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Haiteku_Blocks::
-INCBIN "maps/Haiteku.blk"
+HighTech_Blocks::
+INCBIN "maps/HighTech.blk"

data/maps/objects/HighTechAquarium1F.asm

@@ -1,16 +1,16 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/HaitekuAquarium1F.asm", ROMX
+SECTION "data/maps/objects/HighTechAquarium1F.asm", ROMX
 
-	map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0
+	map_attributes HighTechAquarium1F, HIGHTECH_AQUARIUM_1F, 0
 
-HaitekuAquarium1F_MapEvents::
+HighTechAquarium1F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event 12,  7, HAITEKU, 8, 63
-	warp_event 13,  7, HAITEKU, 9, 63
-	warp_event  0,  7, HAITEKU_AQUARIUM_2F, 1, 57
+	warp_event 12,  7, HIGHTECH, 8, 63
+	warp_event 13,  7, HIGHTECH, 9, 63
+	warp_event  0,  7, HIGHTECH_AQUARIUM_2F, 1, 57
 
 	def_bg_events
 
@@ -19,5 +19,5 @@ HaitekuAquarium1F_MapEvents::
 	object_event 12,  2, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  4,  5, SPRITE_LASS, SPRITEMOVEFN_RANDOM_WALK_XY, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuAquarium1F_Blocks::
-INCBIN "maps/HaitekuAquarium1F.blk"
+HighTechAquarium1F_Blocks::
+INCBIN "maps/HighTechAquarium1F.blk"

data/maps/objects/HighTechAquarium2F.asm

@@ -1,14 +1,14 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/HaitekuAquarium2F.asm", ROMX
+SECTION "data/maps/objects/HighTechAquarium2F.asm", ROMX
 
-	map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0
+	map_attributes HighTechAquarium2F, HIGHTECH_AQUARIUM_2F, 0
 
-HaitekuAquarium2F_MapEvents::
+HighTechAquarium2F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  0,  7, HAITEKU_AQUARIUM_1F, 3, 57
+	warp_event  0,  7, HIGHTECH_AQUARIUM_1F, 3, 57
 
 	def_bg_events
 
@@ -16,5 +16,5 @@ HaitekuAquarium2F_MapEvents::
 	object_event  7,  6, SPRITE_POKEFAN_M, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10,  4, SPRITE_TEACHER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuAquarium2F_Blocks::
-INCBIN "maps/HaitekuAquarium2F.blk"
+HighTechAquarium2F_Blocks::
+INCBIN "maps/HighTechAquarium2F.blk"

data/maps/objects/HighTechHouse1.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/HighTechHouse1.asm", ROMX
+
+	map_attributes HighTechHouse1, HIGHTECH_HOUSE_1, 0
+
+HighTechHouse1_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, HIGHTECH, 5, 47
+	warp_event  5,  7, HIGHTECH, 5, 47
+
+	def_bg_events
+
+	def_object_events
+	object_event  7,  3, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+HighTechHouse1_Blocks::
+INCBIN "maps/HighTechHouse1.blk"

data/maps/objects/HighTechHouse2.asm

@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/HighTechHouse2.asm", ROMX
+
+	map_attributes HighTechHouse2, HIGHTECH_HOUSE_2, 0
+
+HighTechHouse2_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, HIGHTECH, 6, 47
+	warp_event  5,  7, HIGHTECH, 6, 47
+
+	def_bg_events
+
+	def_object_events
+	object_event  7,  3, SPRITE_SAILOR, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+HighTechHouse2_Blocks::
+INCBIN "maps/HighTechHouse2.blk"

data/maps/objects/HighTechImposterOakHouse.asm

@@ -0,0 +1,21 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/HighTechImposterOakHouse.asm", ROMX
+
+	map_attributes HighTechImposterOakHouse, HIGHTECH_IMPOSTER_OAK_HOUSE, 0
+
+HighTechImposterOakHouse_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+	warp_event  4,  7, HIGHTECH, 7, 47
+	warp_event  5,  7, HIGHTECH, 7, 47
+
+	def_bg_events
+
+	def_object_events
+	object_event  7,  3, SPRITE_EVIL_OKIDO, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  2, SPRITE_POKEFAN_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+
+HighTechImposterOakHouse_Blocks::
+INCBIN "maps/HighTechImposterOakHouse.blk"

data/maps/objects/HighTechLeague1F.asm

@@ -1,16 +1,16 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/HaitekuLeague1F.asm", ROMX
+SECTION "data/maps/objects/HighTechLeague1F.asm", ROMX
 
-	map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0
+	map_attributes HighTechLeague1F, HIGHTECH_LEAGUE_1F, 0
 
-HaitekuLeague1F_MapEvents::
+HighTechLeague1F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  3, 15, HAITEKU, 2, 82
-	warp_event  4, 15, HAITEKU, 3, 83
-	warp_event  7,  1, HAITEKU_LEAGUE_2F, 1, 14
+	warp_event  3, 15, HIGHTECH, 2, 82
+	warp_event  4, 15, HIGHTECH, 3, 83
+	warp_event  7,  1, HIGHTECH_LEAGUE_2F, 1, 14
 
 	def_bg_events
 
@@ -21,5 +21,5 @@ HaitekuLeague1F_MapEvents::
 	object_event  3,  1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuLeague1F_Blocks::
-INCBIN "maps/HaitekuLeague1F.blk"
+HighTechLeague1F_Blocks::
+INCBIN "maps/HighTechLeague1F.blk"

data/maps/objects/HighTechLeague2F.asm

@@ -1,14 +1,14 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/HaitekuLeague2F.asm", ROMX
+SECTION "data/maps/objects/HighTechLeague2F.asm", ROMX
 
-	map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0
+	map_attributes HighTechLeague2F, HIGHTECH_LEAGUE_2F, 0
 
-HaitekuLeague2F_MapEvents::
+HighTechLeague2F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  7, 15, HAITEKU_LEAGUE_1F, 3, 92
+	warp_event  7, 15, HIGHTECH_LEAGUE_1F, 3, 92
 
 	def_bg_events
 
@@ -19,5 +19,5 @@ HaitekuLeague2F_MapEvents::
 	object_event  2, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  7,  7, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuLeague2F_Blocks::
-INCBIN "maps/HaitekuLeague2F.blk"
+HighTechLeague2F_Blocks::
+INCBIN "maps/HighTechLeague2F.blk"

data/maps/objects/HighTechMart.asm

@@ -1,15 +1,15 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/HaitekuMart.asm", ROMX
+SECTION "data/maps/objects/HighTechMart.asm", ROMX
 
-	map_attributes HaitekuMart, HAITEKU_MART, 0
+	map_attributes HighTechMart, HIGHTECH_MART, 0
 
-HaitekuMart_MapEvents::
+HighTechMart_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  4,  7, HAITEKU, 4, 51
-	warp_event  5,  7, HAITEKU, 4, 51
+	warp_event  4,  7, HIGHTECH, 4, 51
+	warp_event  5,  7, HIGHTECH, 4, 51
 
 	def_bg_events
 
@@ -18,5 +18,5 @@ HaitekuMart_MapEvents::
 	object_event 10,  5, SPRITE_POKEFAN_M, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  4,  1, SPRITE_SAILOR, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuMart_Blocks::
-INCBIN "maps/HaitekuMart.blk"
+HighTechMart_Blocks::
+INCBIN "maps/HighTechMart.blk"

data/maps/objects/HighTechPokecenter1F.asm

@@ -1,16 +1,16 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/HaitekuPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/HighTechPokecenter1F.asm", ROMX
 
-	map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0
+	map_attributes HighTechPokecenter1F, HIGHTECH_POKECENTER_1F, 0
 
-HaitekuPokecenter1F_MapEvents::
+HighTechPokecenter1F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  5,  7, HAITEKU, 1, 59
-	warp_event  6,  7, HAITEKU, 1, 60
-	warp_event  0,  7, HAITEKU_POKECENTER_2F, 1, 57
+	warp_event  5,  7, HIGHTECH, 1, 59
+	warp_event  6,  7, HIGHTECH, 1, 60
+	warp_event  0,  7, HIGHTECH_POKECENTER_2F, 1, 57
 
 	def_bg_events
 
@@ -20,5 +20,5 @@ HaitekuPokecenter1F_MapEvents::
 	object_event  2,  5, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10,  1, SPRITE_SAILOR, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuPokecenter1F_Blocks::
-INCBIN "maps/HaitekuPokecenter1F.blk"
+HighTechPokecenter1F_Blocks::
+INCBIN "maps/HighTechPokecenter1F.blk"

data/maps/objects/HighTechPokecenter2F.asm

@@ -1,14 +1,14 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/objects/HaitekuPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/HighTechPokecenter2F.asm", ROMX
 
-	map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0
+	map_attributes HighTechPokecenter2F, HIGHTECH_POKECENTER_2F, 0
 
-HaitekuPokecenter2F_MapEvents::
+HighTechPokecenter2F_MapEvents::
 	dw $4000 ; unknown
 
 	def_warp_events
-	warp_event  0,  7, HAITEKU_POKECENTER_1F, 3, 57
+	warp_event  0,  7, HIGHTECH_POKECENTER_1F, 3, 57
 
 	def_bg_events
 
@@ -17,5 +17,5 @@ HaitekuPokecenter2F_MapEvents::
 	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuPokecenter2F_Blocks::
-INCBIN "maps/HaitekuPokecenter2F.blk"
+HighTechPokecenter2F_Blocks::
+INCBIN "maps/HighTechPokecenter2F.blk"

data/maps/objects/HighTechWestRoute.asm

@@ -0,0 +1,19 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/HighTechWestRoute.asm", ROMX
+
+	map_attributes HighTechWestRoute, HIGHTECH_WEST_ROUTE, WEST | EAST
+	connection west, HighTechWestRouteOcean, HIGHTECH_WEST_ROUTE_OCEAN, -18
+	connection east, HighTech, HIGHTECH, 0
+
+HighTechWestRoute_MapEvents::
+	dw $4000 ; unknown
+
+	def_warp_events
+
+	def_bg_events
+
+	def_object_events
+
+HighTechWestRoute_Blocks::
+INCBIN "maps/HighTechWestRoute.blk"