3228 files changed, 140483 insertions, 8178 deletions

diff --git a/data/bag/bag_window_pal.pal b/data/bag/bag_window_pal.pal
new file mode 100644
index 000000000..426ea279e
--- /dev/null
+++ b/data/bag/bag_window_pal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+0 0 0
+0 0 0
+0 0 0
+255 156 148
+255 255 255
+189 90 82
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index bb0c1883c..944275acc 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -1,4 +1,3126 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+	.include "asm/macros/battle_ai_script.inc"
+
 	.section script_data, "aw", %progbits
 
 BattleAIs:: @ 81D9BF4
-	.incbin "baserom.gba", 0x1D9BF4, 0x20FC
+	.4byte AI_CheckBadMove
+	.4byte AI_TryToFaint
+	.4byte AI_CheckViability
+	.4byte AI_SetupFirstTurn
+	.4byte AI_Risky
+	.4byte AI_PreferStrongestMove
+	.4byte AI_PreferBatonPass
+	.4byte AI_DoubleBattle
+	.4byte AI_HPAware
+	.4byte AI_Unknown
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Ret
+	.4byte AI_Roaming
+	.4byte AI_Safari
+	.4byte AI_FirstBattle
+
+AI_CheckBadMove:: @ 81D9C74
+	is_most_powerful_move
+	if_equal 0, AI_sub_81D9CE0
+	if_damage_bonus 0, AI_sub_81DA433
+	get_ability 0
+	if_equal 10, AI_sub_81D9CA6
+	if_equal 11, AI_sub_81D9CB3
+	if_equal 18, AI_sub_81D9CC0
+	if_equal 25, AI_sub_81D9CCD
+	if_equal 26, AI_sub_81D9CD8
+	jump AI_sub_81D9CE0
+
+AI_sub_81D9CA6:: @ 81D9CA6
+	get_type 4
+	if_arg_equal 13, AI_sub_81DA436
+	jump AI_sub_81D9CE0
+
+AI_sub_81D9CB3:: @ 81D9CB3
+	get_type 4
+	if_arg_equal 11, AI_sub_81DA436
+	jump AI_sub_81D9CE0
+
+AI_sub_81D9CC0:: @ 81D9CC0
+	get_type 4
+	if_arg_equal 10, AI_sub_81DA436
+	jump AI_sub_81D9CE0
+
+AI_sub_81D9CCD:: @ 81D9CCD
+	if_damage_bonus 80, AI_sub_81D9CE0
+	jump AI_sub_81DA433
+
+AI_sub_81D9CD8:: @ 81D9CD8
+	get_type 4
+	if_arg_equal 4, AI_sub_81DA433
+
+AI_sub_81D9CE0:: @ 81D9CE0
+	get_ability 0
+	if_not_equal 43, AI_sub_81D9D27
+	if_move 45, AI_sub_81DA433
+	if_move 46, AI_sub_81DA433
+	if_move 47, AI_sub_81DA433
+	if_move 48, AI_sub_81DA433
+	if_move 103, AI_sub_81DA433
+	if_move 173, AI_sub_81DA433
+	if_move 253, AI_sub_81DA433
+	if_move 319, AI_sub_81DA433
+	if_move 320, AI_sub_81DA433
+
+AI_sub_81D9D27:: @ 81D9D27
+	if_effect 1, AI_sub_81D9FB6
+	if_effect 7, AI_sub_81D9FCF
+	if_effect 8, AI_sub_81DA008
+	if_effect 10, AI_sub_81DA020
+	if_effect 11, AI_sub_81DA029
+	if_effect 12, AI_sub_81DA032
+	if_effect 13, AI_sub_81DA03B
+	if_effect 14, AI_sub_81DA044
+	if_effect 15, AI_sub_81DA04D
+	if_effect 16, AI_sub_81DA056
+	if_effect 18, AI_sub_81DA05F
+	if_effect 19, AI_sub_81DA074
+	if_effect 20, AI_sub_81DA081
+	if_effect 21, AI_sub_81DA08E
+	if_effect 22, AI_sub_81DA09B
+	if_effect 23, AI_sub_81DA0A8
+	if_effect 24, AI_sub_81DA0BD
+	if_effect 25, AI_sub_81DA0D4
+	if_effect 26, AI_sub_81DA1B2
+	if_effect 28, AI_sub_81DA14A
+	if_effect 33, AI_sub_81DA15B
+	if_effect 35, AI_sub_81DA18A
+	if_effect 38, AI_sub_81DA195
+	if_effect 39, AI_sub_81DA1B2
+	if_effect 40, AI_sub_81DA1B2
+	if_effect 46, AI_sub_81DA1CC
+	if_effect 47, AI_sub_81DA1D7
+	if_effect 49, AI_sub_81DA1E2
+	if_effect 50, AI_sub_81DA020
+	if_effect 51, AI_sub_81DA029
+	if_effect 52, AI_sub_81DA032
+	if_effect 53, AI_sub_81DA03B
+	if_effect 54, AI_sub_81DA044
+	if_effect 55, AI_sub_81DA04D
+	if_effect 56, AI_sub_81DA056
+	if_effect 58, AI_sub_81DA05F
+	if_effect 59, AI_sub_81DA074
+	if_effect 60, AI_sub_81DA081
+	if_effect 61, AI_sub_81DA08E
+	if_effect 62, AI_sub_81DA09B
+	if_effect 63, AI_sub_81DA0A8
+	if_effect 64, AI_sub_81DA0BD
+	if_effect 65, AI_sub_81DA1F5
+	if_effect 66, AI_sub_81DA15B
+	if_effect 67, AI_sub_81DA200
+	if_effect 79, AI_sub_81DA219
+	if_effect 80, AI_sub_81DA1B2
+	if_effect 84, AI_sub_81DA22B
+	if_effect 86, AI_sub_81DA246
+	if_effect 87, AI_sub_81DA1B2
+	if_effect 88, AI_sub_81DA1B2
+	if_effect 89, AI_sub_81DA1B2
+	if_effect 90, AI_sub_81DA24E
+	if_effect 92, AI_sub_81DA256
+	if_effect 97, AI_sub_81DA256
+	if_effect 99, AI_sub_81DA1B2
+	if_effect 106, AI_sub_81DA261
+	if_effect 107, AI_sub_81D9FF3
+	if_effect 108, AI_sub_81DA056
+	if_effect 109, AI_sub_81DA26C
+	if_effect 112, AI_sub_81DA27D
+	if_effect 113, AI_sub_81DA288
+	if_effect 114, AI_sub_81DA293
+	if_effect 115, AI_sub_81DA29E
+	if_effect 118, AI_sub_81DA1E2
+	if_effect 120, AI_sub_81DA2A6
+	if_effect 121, AI_sub_81DA1B2
+	if_effect 122, AI_sub_81DA1B2
+	if_effect 123, AI_sub_81DA1B2
+	if_effect 124, AI_sub_81DA2E6
+	if_effect 126, AI_sub_81DA1AA
+	if_effect 127, AI_sub_81DA301
+	if_effect -126, AI_sub_81DA1B2
+	if_effect -120, AI_sub_81DA30A
+	if_effect -119, AI_sub_81DA312
+	if_effect -114, AI_sub_81DA019
+	if_effect -113, AI_sub_81DA0D4
+	if_effect -112, AI_sub_81DA1B2
+	if_effect -111, AI_sub_81DA1B2
+	if_effect -108, AI_sub_81DA31A
+	if_effect -103, AI_sub_81DA433
+	if_effect -100, AI_sub_81DA029
+	if_effect -98, AI_sub_81DA325
+	if_effect -96, AI_sub_81DA32E
+	if_effect -95, AI_sub_81DA337
+	if_effect -94, AI_sub_81DA337
+	if_effect -92, AI_sub_81DA346
+	if_effect -91, AI_sub_81DA34E
+	if_effect -90, AI_sub_81DA1E2
+	if_effect -89, AI_sub_81DA359
+	if_effect -88, AI_sub_81DA2F1
+	if_effect -86, AI_sub_81DA1B2
+	if_effect -80, AI_sub_81DA37E
+	if_effect -79, AI_sub_81DA386
+	if_effect -75, AI_sub_81DA38F
+	if_effect -74, AI_sub_81DA1B2
+	if_effect -72, AI_sub_81DA39A
+	if_effect -68, AI_sub_81DA386
+	if_effect -67, AI_sub_81DA1B2
+	if_effect -64, AI_sub_81DA3A3
+	if_effect -63, AI_sub_81DA3AE
+	if_effect -60, AI_sub_81DA1B2
+	if_effect -55, AI_sub_81DA3B9
+	if_effect -51, AI_sub_81DA3C4
+	if_effect -50, AI_sub_81DA3D5
+	if_effect -48, AI_sub_81DA3E6
+	if_effect -46, AI_sub_81DA3F7
+	if_effect -45, AI_sub_81DA402
+	if_effect -44, AI_sub_81DA413
+	end
+
+AI_sub_81D9FB6:: @ 81D9FB6
+	get_ability 0
+	if_equal 15, AI_sub_81DA433
+	if_equal 72, AI_sub_81DA433
+	if_status 0, 255, AI_sub_81DA433
+	end
+
+AI_sub_81D9FCF:: @ 81D9FCF
+	if_damage_bonus 0, AI_sub_81DA433
+	get_ability 0
+	if_equal 6, AI_sub_81DA433
+	count_alive_pokemon 1
+	if_not_equal 0, AI_sub_81D9FF2
+	count_alive_pokemon 0
+	if_not_equal 0, AI_sub_81DA433
+	jump AI_sub_81DA424
+
+AI_sub_81D9FF2:: @ 81D9FF2
+	end
+
+AI_sub_81D9FF3:: @ 81D9FF3
+	if_status2 0, 0x8000000, AI_sub_81DA433
+	if_not_status 0, 7, AI_sub_81DA430
+	end
+
+AI_sub_81DA008:: @ 81DA008
+	if_not_status 0, 7, AI_sub_81DA430
+	if_damage_bonus 0, AI_sub_81DA433
+	end
+
+AI_sub_81DA019:: @ 81DA019
+	if_hp_less_than 1, 51, AI_sub_81DA433
+
+AI_sub_81DA020:: @ 81DA020
+	if_stat_level_equal 1, 1, 12, AI_sub_81DA433
+	end
+
+AI_sub_81DA029:: @ 81DA029
+	if_stat_level_equal 1, 2, 12, AI_sub_81DA433
+	end
+
+AI_sub_81DA032:: @ 81DA032
+	if_stat_level_equal 1, 3, 12, AI_sub_81DA433
+	end
+
+AI_sub_81DA03B:: @ 81DA03B
+	if_stat_level_equal 1, 4, 12, AI_sub_81DA433
+	end
+
+AI_sub_81DA044:: @ 81DA044
+	if_stat_level_equal 1, 5, 12, AI_sub_81DA433
+	end
+
+AI_sub_81DA04D:: @ 81DA04D
+	if_stat_level_equal 1, 6, 12, AI_sub_81DA433
+	end
+
+AI_sub_81DA056:: @ 81DA056
+	if_stat_level_equal 1, 7, 12, AI_sub_81DA433
+	end
+
+AI_sub_81DA05F:: @ 81DA05F
+	if_stat_level_equal 0, 1, 0, AI_sub_81DA433
+	get_ability 0
+	if_equal 52, AI_sub_81DA433
+	jump AI_sub_81DA0C5
+
+AI_sub_81DA074:: @ 81DA074
+	if_stat_level_equal 0, 2, 0, AI_sub_81DA433
+	jump AI_sub_81DA0C5
+
+AI_sub_81DA081:: @ 81DA081
+	if_stat_level_equal 0, 3, 0, AI_sub_81DA433
+	jump AI_sub_81DA0C5
+
+AI_sub_81DA08E:: @ 81DA08E
+	if_stat_level_equal 0, 4, 0, AI_sub_81DA433
+	jump AI_sub_81DA0C5
+
+AI_sub_81DA09B:: @ 81DA09B
+	if_stat_level_equal 0, 5, 0, AI_sub_81DA433
+	jump AI_sub_81DA0C5
+
+AI_sub_81DA0A8:: @ 81DA0A8
+	if_stat_level_equal 0, 6, 0, AI_sub_81DA433
+	get_ability 0
+	if_equal 51, AI_sub_81DA433
+	jump AI_sub_81DA0C5
+
+AI_sub_81DA0BD:: @ 81DA0BD
+	if_stat_level_equal 0, 7, 0, AI_sub_81DA433
+
+AI_sub_81DA0C5:: @ 81DA0C5
+	get_ability 0
+	if_equal 29, AI_sub_81DA433
+	if_equal 73, AI_sub_81DA433
+	end
+
+AI_sub_81DA0D4:: @ 81DA0D4
+	if_stat_level_less_than 1, 1, 6, AI_sub_81DA149
+	if_stat_level_less_than 1, 2, 6, AI_sub_81DA149
+	if_stat_level_less_than 1, 3, 6, AI_sub_81DA149
+	if_stat_level_less_than 1, 4, 6, AI_sub_81DA149
+	if_stat_level_less_than 1, 5, 6, AI_sub_81DA149
+	if_stat_level_less_than 1, 6, 6, AI_sub_81DA149
+	if_stat_level_less_than 1, 7, 6, AI_sub_81DA149
+	if_stat_level_more_than 0, 1, 6, AI_sub_81DA149
+	if_stat_level_more_than 0, 2, 6, AI_sub_81DA149
+	if_stat_level_more_than 0, 3, 6, AI_sub_81DA149
+	if_stat_level_more_than 0, 4, 6, AI_sub_81DA149
+	if_stat_level_more_than 0, 5, 6, AI_sub_81DA149
+	if_stat_level_more_than 0, 6, 6, AI_sub_81DA149
+	if_stat_level_more_than 0, 7, 6, AI_sub_81DA149
+	jump AI_sub_81DA433
+
+AI_sub_81DA149:: @ 81DA149
+	end
+
+AI_sub_81DA14A:: @ 81DA14A
+	count_alive_pokemon 0
+	if_equal 0, AI_sub_81DA433
+	get_ability 0
+	if_equal 21, AI_sub_81DA433
+	end
+
+AI_sub_81DA15B:: @ 81DA15B
+	get_type 0
+	if_equal 8, AI_sub_81DA433
+	if_equal 3, AI_sub_81DA433
+	get_type 2
+	if_equal 8, AI_sub_81DA433
+	if_equal 3, AI_sub_81DA433
+	get_ability 0
+	if_equal 17, AI_sub_81DA433
+	if_status 0, 255, AI_sub_81DA433
+	end
+
+AI_sub_81DA18A:: @ 81DA18A
+	if_status4 1, 2, AI_sub_81DA430
+	end
+
+AI_sub_81DA195:: @ 81DA195
+	if_damage_bonus 0, AI_sub_81DA433
+	get_ability 0
+	if_equal 5, AI_sub_81DA433
+	if_level_cond 1, AI_sub_81DA433
+	end
+
+AI_sub_81DA1AA:: @ 81DA1AA
+	get_ability 0
+	if_equal 26, AI_sub_81DA433
+
+AI_sub_81DA1B2:: @ 81DA1B2
+	if_damage_bonus 0, AI_sub_81DA433
+	get_ability 0
+	if_not_equal 25, AI_sub_81DA1CB
+	if_damage_bonus 80, AI_sub_81DA1CB
+	jump AI_sub_81DA433
+
+AI_sub_81DA1CB:: @ 81DA1CB
+	end
+
+AI_sub_81DA1CC:: @ 81DA1CC
+	if_status4 1, 256, AI_sub_81DA430
+	end
+
+AI_sub_81DA1D7:: @ 81DA1D7
+	if_status2 1, 1048576, AI_sub_81DA433
+	end
+
+AI_sub_81DA1E2:: @ 81DA1E2
+	if_status2 0, 7, AI_sub_81DA42D
+	get_ability 0
+	if_equal 20, AI_sub_81DA433
+	end
+
+AI_sub_81DA1F5:: @ 81DA1F5
+	if_status4 1, 1, AI_sub_81DA430
+	end
+
+AI_sub_81DA200:: @ 81DA200
+	if_damage_bonus 0, AI_sub_81DA433
+	get_ability 0
+	if_equal 7, AI_sub_81DA433
+	if_status 0, 255, AI_sub_81DA433
+	end
+
+AI_sub_81DA219:: @ 81DA219
+	if_status2 1, 16777216, AI_sub_81DA430
+	if_hp_less_than 1, 26, AI_sub_81DA433
+	end
+
+AI_sub_81DA22B:: @ 81DA22B
+	if_status3 0, 4, AI_sub_81DA433
+	get_type 0
+	if_equal 12, AI_sub_81DA433
+	get_type 2
+	if_equal 12, AI_sub_81DA433
+	end
+
+AI_sub_81DA246:: @ 81DA246
+	if_last_move_did_damage 0, 0, AI_sub_81DA430
+	end
+
+AI_sub_81DA24E:: @ 81DA24E
+	if_last_move_did_damage 0, 1, AI_sub_81DA430
+	end
+
+AI_sub_81DA256:: @ 81DA256
+	if_not_status 1, 7, AI_sub_81DA430
+	end
+
+AI_sub_81DA261:: @ 81DA261
+	if_status2 0, 67108864, AI_sub_81DA433
+	end
+
+AI_sub_81DA26C:: @ 81DA26C
+	if_stat_level_equal 1, 1, 12, AI_sub_81DA433
+	if_stat_level_equal 1, 2, 12, AI_sub_81DA430
+	end
+
+AI_sub_81DA27D:: @ 81DA27D
+	if_status4 0, 16, AI_sub_81DA433
+	end
+
+AI_sub_81DA288:: @ 81DA288
+	if_status2 0, 536870912, AI_sub_81DA433
+	end
+
+AI_sub_81DA293:: @ 81DA293
+	if_status3 0, 32, AI_sub_81DA433
+	end
+
+AI_sub_81DA29E:: @ 81DA29E
+	get_weather
+	if_equal 2, AI_sub_81DA430
+	end
+
+AI_sub_81DA2A6:: @ 81DA2A6
+	if_status2 0, 983040, AI_sub_81DA433
+	get_ability 0
+	if_equal 12, AI_sub_81DA433
+	get_gender 1
+	if_equal 0, AI_sub_81DA2CB
+	if_equal -2, AI_sub_81DA2D8
+	jump AI_sub_81DA433
+
+AI_sub_81DA2CB:: @ 81DA2CB
+	get_gender 0
+	if_equal -2, AI_sub_81DA2E5
+	jump AI_sub_81DA433
+
+AI_sub_81DA2D8:: @ 81DA2D8
+	get_gender 0
+	if_equal 0, AI_sub_81DA2E5
+	jump AI_sub_81DA433
+
+AI_sub_81DA2E5:: @ 81DA2E5
+	end
+
+AI_sub_81DA2E6:: @ 81DA2E6
+	if_status4 1, 32, AI_sub_81DA430
+	end
+
+AI_sub_81DA2F1:: @ 81DA2F1
+	if_stat_level_equal 0, 1, 0, AI_sub_81DA433
+	if_stat_level_equal 0, 4, 0, AI_sub_81DA430
+
+AI_sub_81DA301:: @ 81DA301
+	count_alive_pokemon 1
+	if_equal 0, AI_sub_81DA433
+	end
+
+AI_sub_81DA30A:: @ 81DA30A
+	get_weather
+	if_equal 1, AI_sub_81DA430
+	end
+
+AI_sub_81DA312:: @ 81DA312
+	get_weather
+	if_equal 0, AI_sub_81DA430
+	end
+
+AI_sub_81DA31A:: @ 81DA31A
+	if_status4 0, 64, AI_sub_81DA433
+	end
+
+AI_sub_81DA325:: @ 81DA325
+	is_first_turn 1
+	if_equal 0, AI_sub_81DA433
+	end
+
+AI_sub_81DA32E:: @ 81DA32E
+	get_stockpile_count 1
+	if_equal 3, AI_sub_81DA433
+	end
+
+AI_sub_81DA337:: @ 81DA337
+	if_damage_bonus 0, AI_sub_81DA433
+	get_stockpile_count 1
+	if_equal 0, AI_sub_81DA433
+	end
+
+AI_sub_81DA346:: @ 81DA346
+	get_weather
+	if_equal 3, AI_sub_81DA430
+	end
+
+AI_sub_81DA34E:: @ 81DA34E
+	if_status2 0, -2147483648, AI_sub_81DA433
+	end
+
+AI_sub_81DA359:: @ 81DA359
+	get_ability 0
+	if_equal 41, AI_sub_81DA433
+	if_status 0, 255, AI_sub_81DA433
+	if_damage_bonus 0, AI_sub_81DA433
+	if_damage_bonus 20, AI_sub_81DA433
+	if_damage_bonus 10, AI_sub_81DA433
+	end
+
+AI_sub_81DA37E:: @ 81DA37E
+	is_double_battle
+	if_equal 0, AI_sub_81DA433
+	end
+
+AI_sub_81DA386:: @ 81DA386
+	get_ability 0
+	if_equal 60, AI_sub_81DA433
+	end
+
+AI_sub_81DA38F:: @ 81DA38F
+	if_status3 1, 1024, AI_sub_81DA433
+	end
+
+AI_sub_81DA39A:: @ 81DA39A
+	get_item 1
+	if_equal 0, AI_sub_81DA433
+	end
+
+AI_sub_81DA3A3:: @ 81DA3A3
+	if_status3 1, 8192, AI_sub_81DA433
+	end
+
+AI_sub_81DA3AE:: @ 81DA3AE
+	if_not_status 1, 216, AI_sub_81DA433
+	end
+
+AI_sub_81DA3B9:: @ 81DA3B9
+	if_status3 1, 65536, AI_sub_81DA433
+	end
+
+AI_sub_81DA3C4:: @ 81DA3C4
+	if_stat_level_equal 0, 1, 0, AI_sub_81DA433
+	if_stat_level_equal 0, 2, 0, AI_sub_81DA430
+	end
+
+AI_sub_81DA3D5:: @ 81DA3D5
+	if_stat_level_equal 1, 2, 12, AI_sub_81DA433
+	if_stat_level_equal 1, 5, 12, AI_sub_81DA430
+	end
+
+AI_sub_81DA3E6:: @ 81DA3E6
+	if_stat_level_equal 1, 1, 12, AI_sub_81DA433
+	if_stat_level_equal 1, 2, 12, AI_sub_81DA430
+	end
+
+AI_sub_81DA3F7:: @ 81DA3F7
+	if_status3 1, 131072, AI_sub_81DA433
+	end
+
+AI_sub_81DA402:: @ 81DA402
+	if_stat_level_equal 1, 4, 12, AI_sub_81DA433
+	if_stat_level_equal 1, 5, 12, AI_sub_81DA430
+	end
+
+AI_sub_81DA413:: @ 81DA413
+	if_stat_level_equal 1, 1, 12, AI_sub_81DA433
+	if_stat_level_equal 1, 3, 12, AI_sub_81DA430
+	end
+
+AI_sub_81DA424:: @ 81DA424
+	score -1
+	end
+
+AI_sub_81DA427:: @ 81DA427
+	score -2
+	end
+
+AI_sub_81DA42A:: @ 81DA42A
+	score -3
+	end
+
+AI_sub_81DA42D:: @ 81DA42D
+	score -5
+	end
+
+AI_sub_81DA430:: @ 81DA430
+	score -8
+	end
+
+AI_sub_81DA433:: @ 81DA433
+	score -10
+	end
+
+AI_sub_81DA436:: @ 81DA436
+	score -12
+	end
+	score 1
+	end
+	score 2
+	end
+	score 3
+	end
+	score 5
+	end
+
+AI_TryToFaint:: @ 81DA445
+	if_effect 1, AI_sub_81DA71C
+	if_effect 3, AI_sub_81DA738
+	if_effect 7, AI_sub_81DA752
+	if_effect 8, AI_sub_81DA7B0
+	if_effect 9, AI_sub_81DA7C4
+	if_effect 10, AI_sub_81DA848
+	if_effect 11, AI_sub_81DA883
+	if_effect 12, AI_sub_81DA8E9
+	if_effect 13, AI_sub_81DA8FF
+	if_effect 14, AI_sub_81DA93A
+	if_effect 15, AI_sub_81DA9A0
+	if_effect 16, AI_sub_81DA9BA
+	if_effect 17, AI_sub_81DAA54
+	if_effect 18, AI_sub_81DAA84
+	if_effect 19, AI_sub_81DAAD6
+	if_effect 20, AI_sub_81DAB0D
+	if_effect 21, AI_sub_81DAB23
+	if_effect 22, AI_sub_81DAB77
+	if_effect 23, AI_sub_81DAB98
+	if_effect 24, AI_sub_81DAC2C
+	if_effect 25, AI_sub_81DAC4D
+	if_effect 26, AI_sub_81DAD10
+	if_effect 28, AI_sub_81DAD1A
+	if_effect 30, AI_sub_81DAD52
+	if_effect 32, AI_sub_81DAD83
+	if_effect 33, AI_sub_81DADDC
+	if_effect 35, AI_sub_81DAE1B
+	if_effect 37, AI_sub_81DAE4A
+	if_effect 38, AI_sub_81DAEAA
+	if_effect 39, AI_sub_81DB645
+	if_effect 40, AI_sub_81DAEAB
+	if_effect 42, AI_sub_81DAEB5
+	if_effect 43, AI_sub_81DAEEB
+	if_effect 49, AI_sub_81DAF1A
+	if_effect 50, AI_sub_81DA848
+	if_effect 51, AI_sub_81DA883
+	if_effect 52, AI_sub_81DA8E9
+	if_effect 53, AI_sub_81DA8FF
+	if_effect 54, AI_sub_81DA93A
+	if_effect 55, AI_sub_81DA9A0
+	if_effect 56, AI_sub_81DA9BA
+	if_effect 58, AI_sub_81DAA84
+	if_effect 59, AI_sub_81DAAD6
+	if_effect 60, AI_sub_81DAB0D
+	if_effect 61, AI_sub_81DAB23
+	if_effect 62, AI_sub_81DAB77
+	if_effect 63, AI_sub_81DAB98
+	if_effect 64, AI_sub_81DAC2C
+	if_effect 65, AI_sub_81DAF3C
+	if_effect 66, AI_sub_81DAF6C
+	if_effect 67, AI_sub_81DAF7D
+	if_effect 70, AI_sub_81DAAF7
+	if_effect 75, AI_sub_81DB645
+	if_effect 78, AI_sub_81DAF9A
+	if_effect 79, AI_sub_81DAFBD
+	if_effect 80, AI_sub_81DB053
+	if_effect 84, AI_sub_81DADDC
+	if_effect 86, AI_sub_81DB07B
+	if_effect 89, AI_sub_81DB09A
+	if_effect 90, AI_sub_81DB13B
+	if_effect 91, AI_sub_81DB1A3
+	if_effect 92, AI_sub_81DB1CF
+	if_effect 94, AI_sub_81DB1D2
+	if_effect 97, AI_sub_81DB1DB
+	if_effect 98, AI_sub_81DB1DE
+	if_effect 99, AI_sub_81DB214
+	if_effect 102, AI_sub_81DB259
+	if_effect 105, AI_sub_81DB270
+	if_effect 106, AI_sub_81DAEB5
+	if_effect 108, AI_sub_81DA9BA
+	if_effect 109, AI_sub_81DB293
+	if_effect 111, AI_sub_81DB2E2
+	if_effect 113, AI_sub_81DB3A3
+	if_effect 116, AI_sub_81DB3D1
+	if_effect 127, AI_sub_81DB3EF
+	if_effect -128, AI_sub_81DB48B
+	if_effect -124, AI_sub_81DAD69
+	if_effect -123, AI_sub_81DAD69
+	if_effect -122, AI_sub_81DAD69
+	if_effect -120, AI_sub_81DB4C1
+	if_effect -119, AI_sub_81DB500
+	if_effect -114, AI_sub_81DB529
+	if_effect -113, AI_sub_81DB538
+	if_effect -112, AI_sub_81DB5A5
+	if_effect -111, AI_sub_81DB645
+	if_effect -105, AI_sub_81DB645
+	if_effect -101, AI_sub_81DB669
+	if_effect -99, AI_sub_81DAD83
+	if_effect -98, AI_sub_81DB6F3
+	if_effect -95, AI_sub_81DB6F6
+	if_effect -94, AI_sub_81DAD83
+	if_effect -92, AI_sub_81DB707
+	if_effect -90, AI_sub_81DAF12
+	if_effect -88, AI_sub_81DA752
+	if_effect -87, AI_sub_81DB730
+	if_effect -86, AI_sub_81DB73D
+	if_effect -85, AI_sub_81DB78C
+	if_effect -79, AI_sub_81DB79E
+	if_effect -78, AI_sub_81DB7E9
+	if_effect -74, AI_sub_81DB820
+	if_effect -73, AI_sub_81DB850
+	if_effect -72, AI_sub_81DB883
+	if_effect -71, AI_sub_81DB8A2
+	if_effect -70, AI_sub_81DB8D0
+	if_effect -68, AI_sub_81DB8E2
+	if_effect -67, AI_sub_81DB8FA
+	if_effect -66, AI_sub_81DB926
+	if_effect -65, AI_sub_81DB7E9
+	if_effect -64, AI_sub_81DB94E
+	if_effect -63, AI_sub_81DB95F
+	if_effect -61, AI_sub_81DB96E
+	if_effect -56, AI_sub_81DAEEB
+	if_effect -55, AI_sub_81DB9D8
+	if_effect -52, AI_sub_81DB9FE
+	if_effect -51, AI_sub_81DAAD6
+	if_effect -50, AI_sub_81DA93A
+	if_effect -48, AI_sub_81DA883
+	if_effect -47, AI_sub_81DAEEB
+	if_effect -46, AI_sub_81DBA26
+	if_effect -45, AI_sub_81DA93A
+	if_effect -44, AI_sub_81DBA4C
+	end
+
+AI_sub_81DA71C:: @ 81DA71C
+	if_move_effect 0, 8, AI_sub_81DA72F
+	if_move_effect 0, 107, AI_sub_81DA72F
+	jump AI_sub_81DA737
+
+AI_sub_81DA72F:: @ 81DA72F
+	if_random_less_than -128, AI_sub_81DA737
+	score 1
+
+AI_sub_81DA737:: @ 81DA737
+	end
+
+AI_sub_81DA738:: @ 81DA738
+	if_damage_bonus 20, AI_sub_81DA749
+	if_damage_bonus 10, AI_sub_81DA749
+	jump AI_sub_81DA751
+
+AI_sub_81DA749:: @ 81DA749
+	if_random_less_than 50, AI_sub_81DA751
+	score -3
+
+AI_sub_81DA751:: @ 81DA751
+	end
+
+AI_sub_81DA752:: @ 81DA752
+	if_stat_level_less_than 0, 7, 7, AI_sub_81DA76C
+	score -1
+	if_stat_level_less_than 0, 7, 10, AI_sub_81DA76C
+	if_random_less_than -128, AI_sub_81DA76C
+	score -1
+
+AI_sub_81DA76C:: @ 81DA76C
+	if_hp_less_than 1, 80, AI_sub_81DA784
+	if_would_go_first 1, AI_sub_81DA784
+	if_random_less_than 50, AI_sub_81DA7AF
+	jump AI_sub_81DA42A
+
+AI_sub_81DA784:: @ 81DA784
+	if_hp_more_than 1, 50, AI_sub_81DA7A7
+	if_random_less_than -128, AI_sub_81DA793
+	score 1
+
+AI_sub_81DA793:: @ 81DA793
+	if_hp_more_than 1, 30, AI_sub_81DA7AF
+	if_random_less_than 50, AI_sub_81DA7AF
+	score 1
+	jump AI_sub_81DA7AF
+
+AI_sub_81DA7A7:: @ 81DA7A7
+	if_random_less_than 50, AI_sub_81DA7AF
+	score -1
+
+AI_sub_81DA7AF:: @ 81DA7AF
+	end
+
+AI_sub_81DA7B0:: @ 81DA7B0
+	if_damage_bonus 10, AI_sub_81DA7C1
+	if_damage_bonus 20, AI_sub_81DA7C1
+	jump AI_sub_81DA7C3
+
+AI_sub_81DA7C1:: @ 81DA7C1
+	score -1
+
+AI_sub_81DA7C3:: @ 81DA7C3
+	end
+
+AI_sub_81DA7C4:: @ 81DA7C4
+	if_would_go_first 1, AI_sub_81DA7E2
+	get_move 0
+	if_not_in_words AI_words_81DA7F8, AI_sub_81DA7E2
+	if_random_less_than -128, AI_sub_81DA7F5
+	score 2
+	jump AI_sub_81DA7F5
+
+AI_sub_81DA7E2:: @ 81DA7E2
+	get_move 0
+	if_in_words AI_words_81DA7F8, AI_sub_81DA7F5
+	if_random_less_than 80, AI_sub_81DA7F5
+	score -1
+
+AI_sub_81DA7F5:: @ 81DA7F5
+	end
+	.space 2
+
+AI_words_81DA7F8:: @ 81DA7F8
+	.align 1
+	.2byte 0x4F
+	.2byte 0x8E
+	.2byte 0x93
+	.2byte 0x5F
+	.2byte 0x2F
+	.2byte 0x140
+	.2byte 0x145
+	.2byte 0x1C
+	.2byte 0x6C
+	.2byte 0x5C
+	.2byte 0xC
+	.2byte 0x20
+	.2byte 0x5A
+	.2byte 0x149
+	.2byte 0xEE
+	.2byte 0xB1
+	.2byte 0x6D
+	.2byte 0xBA
+	.2byte 0x67
+	.2byte 0xB2
+	.2byte 0xB8
+	.2byte 0x139
+	.2byte 0x13F
+	.2byte 0x56
+	.2byte 0x89
+	.2byte 0x4D
+	.2byte 0xF7
+	.2byte 0xDF
+	.2byte 0x3F
+	.2byte 0xF5
+	.2byte 0xA8
+	.2byte 0x157
+	.2byte 0xD5
+	.2byte 0xCF
+	.2byte 0x103
+	.2byte 0x104
+	.2byte 0x10F
+	.2byte 0x114
+	.2byte 0x11D
+	.2byte 0xFFFF
+
+AI_sub_81DA848:: @ 81DA848
+	if_stat_level_less_than 1, 1, 9, AI_sub_81DA85D
+	if_random_less_than 100, AI_sub_81DA86C
+	score -1
+	jump AI_sub_81DA86C
+
+AI_sub_81DA85D:: @ 81DA85D
+	if_hp_not_equal 1, 100, AI_sub_81DA86C
+	if_random_less_than -128, AI_sub_81DA86C
+	score 2
+
+AI_sub_81DA86C:: @ 81DA86C
+	if_hp_more_than 1, 70, AI_sub_81DA882
+	if_hp_less_than 1, 40, AI_sub_81DA880
+	if_random_less_than 40, AI_sub_81DA882
+
+AI_sub_81DA880:: @ 81DA880
+	score -2
+
+AI_sub_81DA882:: @ 81DA882
+	end
+
+AI_sub_81DA883:: @ 81DA883
+	if_stat_level_less_than 1, 2, 9, AI_sub_81DA898
+	if_random_less_than 100, AI_sub_81DA8A7
+	score -1
+	jump AI_sub_81DA8A7
+
+AI_sub_81DA898:: @ 81DA898
+	if_hp_not_equal 1, 100, AI_sub_81DA8A7
+	if_random_less_than -128, AI_sub_81DA8A7
+	score 2
+
+AI_sub_81DA8A7:: @ 81DA8A7
+	if_hp_less_than 1, 70, AI_sub_81DA8B4
+	if_random_less_than -56, AI_sub_81DA8DE
+
+AI_sub_81DA8B4:: @ 81DA8B4
+	if_hp_less_than 1, 40, AI_sub_81DA8DC
+	get_move 0
+	get_move_power_from_result
+	if_equal 0, AI_sub_81DA8D6
+	get_move 0
+	get_move_type_from_result
+	if_not_in_bytes AI_bytes_81DA8DF, AI_sub_81DA8DC
+	if_random_less_than 60, AI_sub_81DA8DE
+
+AI_sub_81DA8D6:: @ 81DA8D6
+	if_random_less_than 60, AI_sub_81DA8DE
+
+AI_sub_81DA8DC:: @ 81DA8DC
+	score -2
+
+AI_sub_81DA8DE:: @ 81DA8DE
+	end
+
+AI_bytes_81DA8DF:: @ 81DA8DF
+	.byte 0
+	.byte 1
+	.byte 3
+	.byte 4
+	.byte 2
+	.byte 5
+	.byte 6
+	.byte 7
+	.byte 8
+	.byte 0xFF
+
+AI_sub_81DA8E9:: @ 81DA8E9
+	if_would_go_first 1, AI_sub_81DA8F6
+	score -3
+	jump AI_sub_81DA8FE
+
+AI_sub_81DA8F6:: @ 81DA8F6
+	if_random_less_than 70, AI_sub_81DA8FE
+	score 3
+
+AI_sub_81DA8FE:: @ 81DA8FE
+	end
+
+AI_sub_81DA8FF:: @ 81DA8FF
+	if_stat_level_less_than 1, 4, 9, AI_sub_81DA914
+	if_random_less_than 100, AI_sub_81DA923
+	score -1
+	jump AI_sub_81DA923
+
+AI_sub_81DA914:: @ 81DA914
+	if_hp_not_equal 1, 100, AI_sub_81DA923
+	if_random_less_than -128, AI_sub_81DA923
+	score 2
+
+AI_sub_81DA923:: @ 81DA923
+	if_hp_more_than 1, 70, AI_sub_81DA939
+	if_hp_less_than 1, 40, AI_sub_81DA937
+	if_random_less_than 70, AI_sub_81DA939
+
+AI_sub_81DA937:: @ 81DA937
+	score -2
+
+AI_sub_81DA939:: @ 81DA939
+	end
+
+AI_sub_81DA93A:: @ 81DA93A
+	if_stat_level_less_than 1, 5, 9, AI_sub_81DA94F
+	if_random_less_than 100, AI_sub_81DA95E
+	score -1
+	jump AI_sub_81DA95E
+
+AI_sub_81DA94F:: @ 81DA94F
+	if_hp_not_equal 1, 100, AI_sub_81DA95E
+	if_random_less_than -128, AI_sub_81DA95E
+	score 2
+
+AI_sub_81DA95E:: @ 81DA95E
+	if_hp_less_than 1, 70, AI_sub_81DA96B
+	if_random_less_than -56, AI_sub_81DA995
+
+AI_sub_81DA96B:: @ 81DA96B
+	if_hp_less_than 1, 40, AI_sub_81DA993
+	get_move 0
+	get_move_power_from_result
+	if_equal 0, AI_sub_81DA98D
+	get_move 0
+	get_move_type_from_result
+	if_in_bytes AI_bytes_81DA996, AI_sub_81DA993
+	if_random_less_than 60, AI_sub_81DA995
+
+AI_sub_81DA98D:: @ 81DA98D
+	if_random_less_than 60, AI_sub_81DA995
+
+AI_sub_81DA993:: @ 81DA993
+	score -2
+
+AI_sub_81DA995:: @ 81DA995
+	end
+
+AI_bytes_81DA996:: @ 81DA996
+	.byte 0
+	.byte 1
+	.byte 3
+	.byte 4
+	.byte 2
+	.byte 5
+	.byte 6
+	.byte 7
+	.byte 8
+	.byte 0xFF
+
+AI_sub_81DA9A0:: @ 81DA9A0
+	if_stat_level_less_than 1, 6, 9, AI_sub_81DA9B0
+	if_random_less_than 50, AI_sub_81DA9B0
+	score -2
+
+AI_sub_81DA9B0:: @ 81DA9B0
+	if_hp_more_than 1, 70, AI_sub_81DA9B9
+	score -2
+
+AI_sub_81DA9B9:: @ 81DA9B9
+	end
+
+AI_sub_81DA9BA:: @ 81DA9BA
+	if_hp_less_than 1, 90, AI_sub_81DA9C9
+	if_random_less_than 100, AI_sub_81DA9C9
+	score 3
+
+AI_sub_81DA9C9:: @ 81DA9C9
+	if_stat_level_less_than 1, 7, 9, AI_sub_81DA9D9
+	if_random_less_than -128, AI_sub_81DA9D9
+	score -1
+
+AI_sub_81DA9D9:: @ 81DA9D9
+	if_not_status 0, 128, AI_sub_81DA9F8
+	if_hp_more_than 1, 50, AI_sub_81DA9F0
+	if_random_less_than 80, AI_sub_81DA9F8
+
+AI_sub_81DA9F0:: @ 81DA9F0
+	if_random_less_than 50, AI_sub_81DA9F8
+	score 3
+
+AI_sub_81DA9F8:: @ 81DA9F8
+	if_not_status3 0, 4, AI_sub_81DAA0A
+	if_random_less_than 70, AI_sub_81DAA0A
+	score 3
+
+AI_sub_81DAA0A:: @ 81DAA0A
+	if_not_status3 1, 1024, AI_sub_81DAA1C
+	if_random_less_than -128, AI_sub_81DAA1C
+	score 2
+
+AI_sub_81DAA1C:: @ 81DAA1C
+	if_not_status2 0, 268435456, AI_sub_81DAA2E
+	if_random_less_than 70, AI_sub_81DAA2E
+	score 3
+
+AI_sub_81DAA2E:: @ 81DAA2E
+	if_hp_more_than 1, 70, AI_sub_81DAA53
+	if_stat_level_equal 1, 7, 6, AI_sub_81DAA53
+	if_hp_less_than 1, 40, AI_sub_81DAA51
+	if_hp_less_than 0, 40, AI_sub_81DAA51
+	if_random_less_than 70, AI_sub_81DAA53
+
+AI_sub_81DAA51:: @ 81DAA51
+	score -2
+
+AI_sub_81DAA53:: @ 81DAA53
+	end
+
+AI_sub_81DAA54:: @ 81DAA54
+	if_stat_level_more_than 0, 7, 10, AI_sub_81DAA79
+	if_stat_level_less_than 1, 6, 2, AI_sub_81DAA79
+	if_stat_level_more_than 0, 7, 8, AI_sub_81DAA7B
+	if_stat_level_less_than 1, 6, 4, AI_sub_81DAA7B
+	jump AI_sub_81DAA83
+
+AI_sub_81DAA79:: @ 81DAA79
+	score 1
+
+AI_sub_81DAA7B:: @ 81DAA7B
+	if_random_less_than 100, AI_sub_81DAA83
+	score 1
+
+AI_sub_81DAA83:: @ 81DAA83
+	end
+
+AI_sub_81DAA84:: @ 81DAA84
+	if_stat_level_equal 0, 1, 6, AI_sub_81DAAA7
+	score -1
+	if_hp_more_than 1, 90, AI_sub_81DAA97
+	score -1
+
+AI_sub_81DAA97:: @ 81DAA97
+	if_stat_level_more_than 0, 1, 3, AI_sub_81DAAA7
+	if_random_less_than 50, AI_sub_81DAAA7
+	score -2
+
+AI_sub_81DAAA7:: @ 81DAAA7
+	if_hp_more_than 0, 70, AI_sub_81DAAB0
+	score -2
+
+AI_sub_81DAAB0:: @ 81DAAB0
+	get_type 0
+	if_in_bytes AI_bytes_81DAACF, AI_sub_81DAACE
+	get_type 2
+	if_in_bytes AI_bytes_81DAACF, AI_sub_81DAACE
+	if_random_less_than 50, AI_sub_81DAACE
+	score -2
+
+AI_sub_81DAACE:: @ 81DAACE
+	end
+
+AI_bytes_81DAACF:: @ 81DAACF
+	.byte 0
+	.byte 1
+	.byte 4
+	.byte 5
+	.byte 6
+	.byte 8
+	.byte 0xFF
+
+AI_sub_81DAAD6:: @ 81DAAD6
+	if_hp_less_than 1, 70, AI_sub_81DAAE5
+	if_stat_level_more_than 0, 2, 3, AI_sub_81DAAED
+
+AI_sub_81DAAE5:: @ 81DAAE5
+	if_random_less_than 50, AI_sub_81DAAED
+	score -2
+
+AI_sub_81DAAED:: @ 81DAAED
+	if_hp_more_than 0, 70, AI_sub_81DAAF6
+	score -2
+
+AI_sub_81DAAF6:: @ 81DAAF6
+	end
+
+AI_sub_81DAAF7:: @ 81DAAF7
+	if_move 196, AI_sub_81DAB0D
+	if_move 317, AI_sub_81DAB0D
+	if_move 341, AI_sub_81DAB0D
+	end
+
+AI_sub_81DAB0D:: @ 81DAB0D
+	if_would_go_first 1, AI_sub_81DAB1A
+	score -3
+	jump AI_sub_81DAB22
+
+AI_sub_81DAB1A:: @ 81DAB1A
+	if_random_less_than 70, AI_sub_81DAB22
+	score 2
+
+AI_sub_81DAB22:: @ 81DAB22
+	end
+
+AI_sub_81DAB23:: @ 81DAB23
+	if_stat_level_equal 0, 1, 6, AI_sub_81DAB46
+	score -1
+	if_hp_more_than 1, 90, AI_sub_81DAB36
+	score -1
+
+AI_sub_81DAB36:: @ 81DAB36
+	if_stat_level_more_than 0, 4, 3, AI_sub_81DAB46
+	if_random_less_than 50, AI_sub_81DAB46
+	score -2
+
+AI_sub_81DAB46:: @ 81DAB46
+	if_hp_more_than 0, 70, AI_sub_81DAB4F
+	score -2
+
+AI_sub_81DAB4F:: @ 81DAB4F
+	get_type 0
+	if_in_bytes AI_bytes_81DAB6E, AI_sub_81DAB6D
+	get_type 2
+	if_in_bytes AI_bytes_81DAB6E, AI_sub_81DAB6D
+	if_random_less_than 50, AI_sub_81DAB6D
+	score -2
+
+AI_sub_81DAB6D:: @ 81DAB6D
+	end
+
+AI_bytes_81DAB6E:: @ 81DAB6E
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 15
+	.byte 16
+	.byte 17
+	.byte 0xFF
+
+AI_sub_81DAB77:: @ 81DAB77
+	if_hp_less_than 1, 70, AI_sub_81DAB86
+	if_stat_level_more_than 0, 5, 3, AI_sub_81DAB8E
+
+AI_sub_81DAB86:: @ 81DAB86
+	if_random_less_than 50, AI_sub_81DAB8E
+	score -2
+
+AI_sub_81DAB8E:: @ 81DAB8E
+	if_hp_more_than 0, 70, AI_sub_81DAB97
+	score -2
+
+AI_sub_81DAB97:: @ 81DAB97
+	end
+
+AI_sub_81DAB98:: @ 81DAB98
+	if_hp_less_than 1, 70, AI_sub_81DABA6
+	if_hp_more_than 0, 70, AI_sub_81DABAE
+
+AI_sub_81DABA6:: @ 81DABA6
+	if_random_less_than 100, AI_sub_81DABAE
+	score -1
+
+AI_sub_81DABAE:: @ 81DABAE
+	if_stat_level_more_than 1, 6, 4, AI_sub_81DABBE
+	if_random_less_than 80, AI_sub_81DABBE
+	score -2
+
+AI_sub_81DABBE:: @ 81DABBE
+	if_not_status 0, 128, AI_sub_81DABD0
+	if_random_less_than 70, AI_sub_81DABD0
+	score 2
+
+AI_sub_81DABD0:: @ 81DABD0
+	if_not_status3 0, 4, AI_sub_81DABE2
+	if_random_less_than 70, AI_sub_81DABE2
+	score 2
+
+AI_sub_81DABE2:: @ 81DABE2
+	if_not_status3 1, 1024, AI_sub_81DABF4
+	if_random_less_than -128, AI_sub_81DABF4
+	score 1
+
+AI_sub_81DABF4:: @ 81DABF4
+	if_not_status2 0, 268435456, AI_sub_81DAC06
+	if_random_less_than 70, AI_sub_81DAC06
+	score 2
+
+AI_sub_81DAC06:: @ 81DAC06
+	if_hp_more_than 1, 70, AI_sub_81DAC2B
+	if_stat_level_equal 0, 6, 6, AI_sub_81DAC2B
+	if_hp_less_than 1, 40, AI_sub_81DAC29
+	if_hp_less_than 0, 40, AI_sub_81DAC29
+	if_random_less_than 70, AI_sub_81DAC2B
+
+AI_sub_81DAC29:: @ 81DAC29
+	score -2
+
+AI_sub_81DAC2B:: @ 81DAC2B
+	end
+
+AI_sub_81DAC2C:: @ 81DAC2C
+	if_hp_less_than 1, 70, AI_sub_81DAC3B
+	if_stat_level_more_than 0, 7, 3, AI_sub_81DAC43
+
+AI_sub_81DAC3B:: @ 81DAC3B
+	if_random_less_than 50, AI_sub_81DAC43
+	score -2
+
+AI_sub_81DAC43:: @ 81DAC43
+	if_hp_more_than 0, 70, AI_sub_81DAC4C
+	score -2
+
+AI_sub_81DAC4C:: @ 81DAC4C
+	end
+
+AI_sub_81DAC4D:: @ 81DAC4D
+	if_stat_level_more_than 1, 1, 8, AI_sub_81DACA2
+	if_stat_level_more_than 1, 2, 8, AI_sub_81DACA2
+	if_stat_level_more_than 1, 4, 8, AI_sub_81DACA2
+	if_stat_level_more_than 1, 5, 8, AI_sub_81DACA2
+	if_stat_level_more_than 1, 7, 8, AI_sub_81DACA2
+	if_stat_level_less_than 0, 1, 4, AI_sub_81DACA2
+	if_stat_level_less_than 0, 2, 4, AI_sub_81DACA2
+	if_stat_level_less_than 0, 4, 4, AI_sub_81DACA2
+	if_stat_level_less_than 0, 5, 4, AI_sub_81DACA2
+	if_stat_level_less_than 0, 6, 4, AI_sub_81DACA2
+	jump AI_sub_81DACAA
+
+AI_sub_81DACA2:: @ 81DACA2
+	if_random_less_than 50, AI_sub_81DACAA
+	score -3
+
+AI_sub_81DACAA:: @ 81DACAA
+	if_stat_level_more_than 0, 1, 8, AI_sub_81DAD07
+	if_stat_level_more_than 0, 2, 8, AI_sub_81DAD07
+	if_stat_level_more_than 0, 4, 8, AI_sub_81DAD07
+	if_stat_level_more_than 0, 5, 8, AI_sub_81DAD07
+	if_stat_level_more_than 0, 7, 8, AI_sub_81DAD07
+	if_stat_level_less_than 1, 1, 4, AI_sub_81DAD07
+	if_stat_level_less_than 1, 2, 4, AI_sub_81DAD07
+	if_stat_level_less_than 1, 4, 4, AI_sub_81DAD07
+	if_stat_level_less_than 1, 5, 4, AI_sub_81DAD07
+	if_stat_level_less_than 1, 6, 4, AI_sub_81DAD07
+	if_random_less_than 50, AI_sub_81DAD0F
+	score -1
+	jump AI_sub_81DAD0F
+
+AI_sub_81DAD07:: @ 81DAD07
+	if_random_less_than 50, AI_sub_81DAD0F
+	score 3
+
+AI_sub_81DAD0F:: @ 81DAD0F
+	end
+
+AI_sub_81DAD10:: @ 81DAD10
+	if_hp_more_than 1, 90, AI_sub_81DAD19
+	score -2
+
+AI_sub_81DAD19:: @ 81DAD19
+	end
+
+AI_sub_81DAD1A:: @ 81DAD1A
+	if_stat_level_more_than 0, 1, 8, AI_sub_81DAD49
+	if_stat_level_more_than 0, 2, 8, AI_sub_81DAD49
+	if_stat_level_more_than 0, 4, 8, AI_sub_81DAD49
+	if_stat_level_more_than 0, 5, 8, AI_sub_81DAD49
+	if_stat_level_more_than 0, 7, 8, AI_sub_81DAD49
+	score -3
+	jump AI_sub_81DAD51
+
+AI_sub_81DAD49:: @ 81DAD49
+	if_random_less_than -128, AI_sub_81DAD51
+	score 2
+
+AI_sub_81DAD51:: @ 81DAD51
+	end
+
+AI_sub_81DAD52:: @ 81DAD52
+	if_hp_more_than 1, 90, AI_sub_81DAD5B
+	score -2
+
+AI_sub_81DAD5B:: @ 81DAD5B
+	get_turn_count
+	if_equal 0, AI_sub_81DAD68
+	if_random_less_than -56, AI_sub_81DA427
+
+AI_sub_81DAD68:: @ 81DAD68
+	end
+
+AI_sub_81DAD69:: @ 81DAD69
+	get_weather
+	if_equal 3, AI_sub_81DAD81
+	if_equal 1, AI_sub_81DAD81
+	if_equal 2, AI_sub_81DAD81
+	jump AI_sub_81DAD83
+
+AI_sub_81DAD81:: @ 81DAD81
+	score -2
+
+AI_sub_81DAD83:: @ 81DAD83
+	if_hp_equal 1, 100, AI_sub_81DADAB
+	if_would_go_first 1, AI_sub_81DADB2
+	score -8
+	jump AI_sub_81DADDB
+	if_hp_less_than 1, 50, AI_sub_81DADC6
+	if_hp_more_than 1, 80, AI_sub_81DADAB
+	if_random_less_than 70, AI_sub_81DADC6
+
+AI_sub_81DADAB:: @ 81DADAB
+	score -3
+	jump AI_sub_81DADDB
+
+AI_sub_81DADB2:: @ 81DADB2
+	if_hp_less_than 1, 70, AI_sub_81DADC6
+	if_random_less_than 30, AI_sub_81DADC6
+	score -3
+	jump AI_sub_81DADDB
+
+AI_sub_81DADC6:: @ 81DADC6
+	if_not_move_effect 0, -61, AI_sub_81DADD3
+	if_random_less_than 100, AI_sub_81DADDB
+
+AI_sub_81DADD3:: @ 81DADD3
+	if_random_less_than 20, AI_sub_81DADDB
+	score 2
+
+AI_sub_81DADDB:: @ 81DADDB
+	end
+
+AI_sub_81DADDC:: @ 81DADDC
+	if_user_cant_damage AI_sub_81DADFF
+	if_hp_more_than 1, 50, AI_sub_81DADF0
+	if_random_less_than 50, AI_sub_81DADF0
+	score -3
+
+AI_sub_81DADF0:: @ 81DADF0
+	if_hp_more_than 0, 50, AI_sub_81DADFF
+	if_random_less_than 50, AI_sub_81DADFF
+	score -3
+
+AI_sub_81DADFF:: @ 81DADFF
+	if_move_effect 1, 14, AI_sub_81DAE12
+	if_move_effect 1, 111, AI_sub_81DAE12
+	jump AI_sub_81DAE1A
+
+AI_sub_81DAE12:: @ 81DAE12
+	if_random_less_than 60, AI_sub_81DAE1A
+	score 2
+
+AI_sub_81DAE1A:: @ 81DAE1A
+	end
+
+AI_sub_81DAE1B:: @ 81DAE1B
+	if_hp_less_than 1, 50, AI_sub_81DAE3E
+	get_type 0
+	if_in_bytes AI_bytes_81DAE41, AI_sub_81DAE40
+	get_type 2
+	if_in_bytes AI_bytes_81DAE41, AI_sub_81DAE40
+	if_random_less_than 50, AI_sub_81DAE40
+
+AI_sub_81DAE3E:: @ 81DAE3E
+	score -2
+
+AI_sub_81DAE40:: @ 81DAE40
+	end
+
+AI_bytes_81DAE41:: @ 81DAE41
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 15
+	.byte 16
+	.byte 17
+	.byte 0xFF
+
+AI_sub_81DAE4A:: @ 81DAE4A
+	if_would_go_first 1, AI_sub_81DAE79
+	if_hp_not_equal 1, 100, AI_sub_81DAE5E
+	score -8
+	jump AI_sub_81DAEA9
+
+AI_sub_81DAE5E:: @ 81DAE5E
+	if_hp_less_than 1, 40, AI_sub_81DAE94
+	if_hp_more_than 1, 50, AI_sub_81DAE72
+	if_random_less_than 70, AI_sub_81DAE94
+
+AI_sub_81DAE72:: @ 81DAE72
+	score -3
+	jump AI_sub_81DAEA9
+
+AI_sub_81DAE79:: @ 81DAE79
+	if_hp_less_than 1, 60, AI_sub_81DAE94
+	if_hp_more_than 1, 70, AI_sub_81DAE8D
+	if_random_less_than 50, AI_sub_81DAE94
+
+AI_sub_81DAE8D:: @ 81DAE8D
+	score -3
+	jump AI_sub_81DAEA9
+
+AI_sub_81DAE94:: @ 81DAE94
+	if_not_move_effect 0, -61, AI_sub_81DAEA1
+	if_random_less_than 50, AI_sub_81DAEA9
+
+AI_sub_81DAEA1:: @ 81DAEA1
+	if_random_less_than 10, AI_sub_81DAEA9
+	score 3
+
+AI_sub_81DAEA9:: @ 81DAEA9
+	end
+
+AI_sub_81DAEAA:: @ 81DAEAA
+	end
+
+AI_sub_81DAEAB:: @ 81DAEAB
+	if_hp_more_than 0, 50, AI_sub_81DAEB4
+	score -1
+
+AI_sub_81DAEB4:: @ 81DAEB4
+	end
+
+AI_sub_81DAEB5:: @ 81DAEB5
+	if_status 0, 128, AI_sub_81DAEE2
+	if_status2 0, 268435456, AI_sub_81DAEE2
+	if_status3 0, 32, AI_sub_81DAEE2
+	if_status2 0, 983040, AI_sub_81DAEE2
+	jump AI_sub_81DAEEA
+
+AI_sub_81DAEE2:: @ 81DAEE2
+	if_random_less_than -128, AI_sub_81DAEEA
+	score 1
+
+AI_sub_81DAEEA:: @ 81DAEEA
+	end
+
+AI_sub_81DAEEB:: @ 81DAEEB
+	if_damage_bonus 10, AI_sub_81DAF11
+	if_damage_bonus 20, AI_sub_81DAF11
+	if_damage_bonus 80, AI_sub_81DAF09
+	if_damage_bonus -96, AI_sub_81DAF09
+	if_random_less_than -128, AI_sub_81DAF11
+
+AI_sub_81DAF09:: @ 81DAF09
+	if_random_less_than -128, AI_sub_81DAF11
+	score 1
+
+AI_sub_81DAF11:: @ 81DAF11
+	end
+
+AI_sub_81DAF12:: @ 81DAF12
+	if_random_less_than -128, AI_sub_81DAF1A
+	score 1
+
+AI_sub_81DAF1A:: @ 81DAF1A
+	if_hp_more_than 0, 70, AI_sub_81DAF3B
+	if_random_less_than -128, AI_sub_81DAF29
+	score -1
+
+AI_sub_81DAF29:: @ 81DAF29
+	if_hp_more_than 0, 50, AI_sub_81DAF3B
+	score -1
+	if_hp_more_than 0, 30, AI_sub_81DAF3B
+	score -1
+
+AI_sub_81DAF3B:: @ 81DAF3B
+	end
+
+AI_sub_81DAF3C:: @ 81DAF3C
+	if_hp_less_than 1, 50, AI_sub_81DAF5F
+	get_type 0
+	if_in_bytes AI_bytes_81DAF62, AI_sub_81DAF61
+	get_type 2
+	if_in_bytes AI_bytes_81DAF62, AI_sub_81DAF61
+	if_random_less_than 50, AI_sub_81DAF61
+
+AI_sub_81DAF5F:: @ 81DAF5F
+	score -2
+
+AI_sub_81DAF61:: @ 81DAF61
+	end
+
+AI_bytes_81DAF62:: @ 81DAF62
+	.byte 0
+	.byte 1
+	.byte 2
+	.byte 3
+	.byte 4
+	.byte 5
+	.byte 6
+	.byte 7
+	.byte 8
+	.byte 0xFF
+
+AI_sub_81DAF6C:: @ 81DAF6C
+	if_hp_less_than 1, 50, AI_sub_81DAF7A
+	if_hp_more_than 0, 50, AI_sub_81DAF7C
+
+AI_sub_81DAF7A:: @ 81DAF7A
+	score -1
+
+AI_sub_81DAF7C:: @ 81DAF7C
+	end
+
+AI_sub_81DAF7D:: @ 81DAF7D
+	if_would_go_first 1, AI_sub_81DAF91
+	if_hp_more_than 1, 70, AI_sub_81DAF99
+	score -1
+	jump AI_sub_81DAF99
+
+AI_sub_81DAF91:: @ 81DAF91
+	if_random_less_than 20, AI_sub_81DAF99
+	score 3
+
+AI_sub_81DAF99:: @ 81DAF99
+	end
+
+AI_sub_81DAF9A:: @ 81DAF9A
+	if_would_go_first 1, AI_sub_81DAFBC
+	if_hp_more_than 1, 60, AI_sub_81DAFBC
+	if_hp_less_than 1, 40, AI_sub_81DAFB4
+	if_random_less_than -76, AI_sub_81DAFBC
+
+AI_sub_81DAFB4:: @ 81DAFB4
+	if_random_less_than 50, AI_sub_81DAFBC
+	score -1
+
+AI_sub_81DAFBC:: @ 81DAFBC
+	end
+
+AI_sub_81DAFBD:: @ 81DAFBD
+	if_hp_more_than 1, 90, AI_sub_81DAFEA
+	if_hp_more_than 1, 70, AI_sub_81DAFE2
+	if_hp_more_than 1, 50, AI_sub_81DAFDA
+	if_random_less_than 100, AI_sub_81DAFDA
+	score -1
+
+AI_sub_81DAFDA:: @ 81DAFDA
+	if_random_less_than 100, AI_sub_81DAFE2
+	score -1
+
+AI_sub_81DAFE2:: @ 81DAFE2
+	if_random_less_than 100, AI_sub_81DAFEA
+	score -1
+
+AI_sub_81DAFEA:: @ 81DAFEA
+	if_would_go_first 1, AI_sub_81DB052
+	get_move 0
+	get_move_effect_from_result
+	if_equal 1, AI_sub_81DB022
+	if_equal 33, AI_sub_81DB022
+	if_equal 66, AI_sub_81DB022
+	if_equal 67, AI_sub_81DB022
+	if_equal -89, AI_sub_81DB022
+	if_equal 49, AI_sub_81DB031
+	if_equal 84, AI_sub_81DB040
+	jump AI_sub_81DB052
+
+AI_sub_81DB022:: @ 81DB022
+	if_not_status 0, 255, AI_sub_81DB04A
+	jump AI_sub_81DB052
+
+AI_sub_81DB031:: @ 81DB031
+	if_not_status2 0, 7, AI_sub_81DB04A
+	jump AI_sub_81DB052
+
+AI_sub_81DB040:: @ 81DB040
+	if_status3 0, 4, AI_sub_81DB052
+
+AI_sub_81DB04A:: @ 81DB04A
+	if_random_less_than 100, AI_sub_81DB052
+	score 1
+
+AI_sub_81DB052:: @ 81DB052
+	end
+
+AI_sub_81DB053:: @ 81DB053
+	if_damage_bonus 10, AI_sub_81DB078
+	if_damage_bonus 20, AI_sub_81DB078
+	if_would_go_first 1, AI_sub_81DB071
+	if_hp_more_than 1, 40, AI_sub_81DB078
+	jump AI_sub_81DB07A
+
+AI_sub_81DB071:: @ 81DB071
+	if_hp_less_than 1, 60, AI_sub_81DB07A
+
+AI_sub_81DB078:: @ 81DB078
+	score -1
+
+AI_sub_81DB07A:: @ 81DB07A
+	end
+
+AI_sub_81DB07B:: @ 81DB07B
+	if_would_go_first 1, AI_sub_81DB099
+	get_move 0
+	get_move_power_from_result
+	if_equal 0, AI_sub_81DB091
+	score 1
+	jump AI_sub_81DB099
+
+AI_sub_81DB091:: @ 81DB091
+	if_random_less_than 100, AI_sub_81DB099
+	score -1
+
+AI_sub_81DB099:: @ 81DB099
+	end
+
+AI_sub_81DB09A:: @ 81DB09A
+	if_status 0, 7, AI_sub_81DB12E
+	if_status2 0, 983040, AI_sub_81DB12E
+	if_status2 0, 7, AI_sub_81DB12E
+	if_hp_more_than 1, 30, AI_sub_81DB0C7
+	if_random_less_than 10, AI_sub_81DB0C7
+	score -1
+
+AI_sub_81DB0C7:: @ 81DB0C7
+	if_hp_more_than 1, 50, AI_sub_81DB0D6
+	if_random_less_than 100, AI_sub_81DB0D6
+	score -1
+
+AI_sub_81DB0D6:: @ 81DB0D6
+	get_move 0
+	get_move_power_from_result
+	if_equal 0, AI_sub_81DB105
+	if_not_taunted AI_sub_81DB0EC
+	if_random_less_than 100, AI_sub_81DB0EC
+	score 1
+
+AI_sub_81DB0EC:: @ 81DB0EC
+	get_move 0
+	get_move_type_from_result
+	if_not_in_bytes AI_bytes_81DB131, AI_sub_81DB12E
+	if_random_less_than 100, AI_sub_81DB130
+	score 1
+	jump AI_sub_81DB130
+
+AI_sub_81DB105:: @ 81DB105
+	if_not_taunted AI_sub_81DB112
+	if_random_less_than 100, AI_sub_81DB112
+	score 1
+
+AI_sub_81DB112:: @ 81DB112
+	get_type 0
+	if_in_bytes AI_bytes_81DB131, AI_sub_81DB130
+	get_type 2
+	if_in_bytes AI_bytes_81DB131, AI_sub_81DB130
+	if_random_less_than 50, AI_sub_81DB130
+
+AI_sub_81DB12E:: @ 81DB12E
+	score -1
+
+AI_sub_81DB130:: @ 81DB130
+	end
+
+AI_bytes_81DB131:: @ 81DB131
+	.byte 0
+	.byte 1
+	.byte 2
+	.byte 3
+	.byte 4
+	.byte 5
+	.byte 6
+	.byte 7
+	.byte 8
+	.byte 0xFF
+
+AI_sub_81DB13B:: @ 81DB13B
+	if_last_move_did_damage 0, 0, AI_sub_81DB154
+	if_would_go_first 1, AI_sub_81DB161
+	get_move 0
+	get_move_effect_from_result
+	if_not_in_bytes AI_bytes_81DB164, AI_sub_81DB161
+
+AI_sub_81DB154:: @ 81DB154
+	if_random_less_than 30, AI_sub_81DB163
+	score 3
+	jump AI_sub_81DB163
+
+AI_sub_81DB161:: @ 81DB161
+	score -2
+
+AI_sub_81DB163:: @ 81DB163
+	end
+
+AI_bytes_81DB164:: @ 81DB164
+	.byte 8
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 25
+	.byte 28
+	.byte 30
+	.byte 33
+	.byte 35
+	.byte 37
+	.byte 40
+	.byte 54
+	.byte 49
+	.byte 66
+	.byte 67
+	.byte 84
+	.byte 85
+	.byte 50
+	.byte 90
+	.byte 93
+	.byte 94
+	.byte 102
+	.byte 106
+	.byte 107
+	.byte 111
+	.byte 191
+	.byte 113
+	.byte 114
+	.byte 115
+	.byte 116
+	.byte 118
+	.byte 120
+	.byte 124
+	.byte 136
+	.byte 137
+	.byte 142
+	.byte 143
+	.byte 148
+	.byte 158
+	.byte 160
+	.byte 161
+	.byte 162
+	.byte 164
+	.byte 165
+	.byte 167
+	.byte 172
+	.byte 174
+	.byte 177
+	.byte 178
+	.byte 181
+	.byte 184
+	.byte 188
+	.byte 191
+	.byte 192
+	.byte 193
+	.byte 194
+	.byte 199
+	.byte 201
+	.byte 210
+	.byte 212
+	.byte 213
+	.byte 0xFF
+
+AI_sub_81DB1A3:: @ 81DB1A3
+	if_hp_less_than 0, 80, AI_sub_81DB1CC
+	if_would_go_first 1, AI_sub_81DB1BE
+	if_hp_more_than 1, 40, AI_sub_81DB1CC
+	score 1
+	jump AI_sub_81DB1CE
+
+AI_sub_81DB1BE:: @ 81DB1BE
+	if_hp_more_than 1, 60, AI_sub_81DB1CC
+	score 1
+	jump AI_sub_81DB1CE
+
+AI_sub_81DB1CC:: @ 81DB1CC
+	score -1
+
+AI_sub_81DB1CE:: @ 81DB1CE
+	end
+
+AI_sub_81DB1CF:: @ 81DB1CF
+	score 2
+	end
+
+AI_sub_81DB1D2:: @ 81DB1D2
+	if_random_less_than -128, AI_sub_81DB1DA
+	score 2
+
+AI_sub_81DB1DA:: @ 81DB1DA
+	end
+
+AI_sub_81DB1DB:: @ 81DB1DB
+	score 2
+	end
+
+AI_sub_81DB1DE:: @ 81DB1DE
+	score -1
+	if_would_go_first 1, AI_sub_81DB213
+	if_hp_more_than 1, 70, AI_sub_81DB213
+	if_random_less_than -128, AI_sub_81DB1F5
+	score 1
+
+AI_sub_81DB1F5:: @ 81DB1F5
+	if_hp_more_than 1, 50, AI_sub_81DB213
+	if_random_less_than -128, AI_sub_81DB204
+	score 1
+
+AI_sub_81DB204:: @ 81DB204
+	if_hp_more_than 1, 30, AI_sub_81DB213
+	if_random_less_than 100, AI_sub_81DB213
+	score 2
+
+AI_sub_81DB213:: @ 81DB213
+	end
+
+AI_sub_81DB214:: @ 81DB214
+	if_would_go_first 1, AI_sub_81DB234
+	if_hp_more_than 1, 33, AI_sub_81DB256
+	if_hp_more_than 1, 20, AI_sub_81DB258
+	if_hp_less_than 1, 8, AI_sub_81DB247
+	jump AI_sub_81DB249
+
+AI_sub_81DB234:: @ 81DB234
+	if_hp_more_than 1, 60, AI_sub_81DB256
+	if_hp_more_than 1, 40, AI_sub_81DB258
+	jump AI_sub_81DB249
+
+AI_sub_81DB247:: @ 81DB247
+	score 1
+
+AI_sub_81DB249:: @ 81DB249
+	if_random_less_than 100, AI_sub_81DB258
+	score 1
+	jump AI_sub_81DB258
+
+AI_sub_81DB256:: @ 81DB256
+	score -1
+
+AI_sub_81DB258:: @ 81DB258
+	end
+
+AI_sub_81DB259:: @ 81DB259
+	if_status 0, 255, AI_sub_81DB26F
+	if_status_in_party 0, 255, AI_sub_81DB26F
+	score -5
+
+AI_sub_81DB26F:: @ 81DB26F
+	end
+
+AI_sub_81DB270:: @ 81DB270
+	get_hold_effect 0
+	if_not_in_bytes AI_bytes_81DB28B, AI_sub_81DB288
+	if_random_less_than 50, AI_sub_81DB28A
+	score 1
+	jump AI_sub_81DB28A
+
+AI_sub_81DB288:: @ 81DB288
+	score -2
+
+AI_sub_81DB28A:: @ 81DB28A
+	end
+
+AI_bytes_81DB28B:: @ 81DB28B
+	.byte 3
+	.byte 9
+	.byte 1
+	.byte 22
+	.byte 43
+	.byte 45
+	.byte 65
+	.byte 0xFF
+
+AI_sub_81DB293:: @ 81DB293
+	get_type 1
+	if_equal 7, AI_sub_81DB2D8
+	get_type 3
+	if_equal 7, AI_sub_81DB2D8
+	if_stat_level_more_than 1, 2, 9, AI_sub_81DB2E1
+	if_random_less_than -128, AI_sub_81DB2B3
+	score 1
+
+AI_sub_81DB2B3:: @ 81DB2B3
+	if_stat_level_more_than 1, 2, 7, AI_sub_81DB2E1
+	if_random_less_than -128, AI_sub_81DB2C3
+	score 1
+
+AI_sub_81DB2C3:: @ 81DB2C3
+	if_stat_level_more_than 1, 2, 6, AI_sub_81DB2E1
+	if_random_less_than -128, AI_sub_81DB2E1
+	score 1
+	jump AI_sub_81DB2E1
+
+AI_sub_81DB2D8:: @ 81DB2D8
+	if_hp_more_than 1, 80, AI_sub_81DB2E1
+	score -1
+
+AI_sub_81DB2E1:: @ 81DB2E1
+	end
+
+AI_sub_81DB2E2:: @ 81DB2E2
+	get_protect_count 1
+	if_more_than 1, AI_sub_81DB3A0
+	if_status 1, 128, AI_sub_81DB397
+	if_status2 1, 268435456, AI_sub_81DB397
+	if_status3 1, 32, AI_sub_81DB397
+	if_status2 1, 983040, AI_sub_81DB397
+	if_status3 1, 4, AI_sub_81DB397
+	if_status3 1, 6144, AI_sub_81DB397
+	if_move_effect 0, 32, AI_sub_81DB397
+	if_move_effect 0, -100, AI_sub_81DB397
+	if_status 0, 128, AI_sub_81DB37E
+	if_status2 0, 268435456, AI_sub_81DB37E
+	if_status3 0, 32, AI_sub_81DB37E
+	if_status2 0, 983040, AI_sub_81DB37E
+	if_status3 0, 4, AI_sub_81DB37E
+	if_status3 0, 6144, AI_sub_81DB37E
+	get_move 0
+	get_move_effect_from_result
+	if_not_equal 94, AI_sub_81DB37E
+	jump AI_sub_81DB380
+
+AI_sub_81DB37E:: @ 81DB37E
+	score 2
+
+AI_sub_81DB380:: @ 81DB380
+	get_protect_count 1
+	if_equal 0, AI_sub_81DB3A2
+	score -1
+	if_random_less_than -128, AI_sub_81DB3A2
+	score -1
+	jump AI_sub_81DB3A2
+
+AI_sub_81DB397:: @ 81DB397
+	get_move 0
+	get_move_effect_from_result
+	if_not_equal 94, AI_sub_81DB3A2
+
+AI_sub_81DB3A0:: @ 81DB3A0
+	score -2
+
+AI_sub_81DB3A2:: @ 81DB3A2
+	end
+
+AI_sub_81DB3A3:: @ 81DB3A3
+	get_type 1
+	if_equal 7, AI_sub_81DB3C2
+	get_type 3
+	if_equal 7, AI_sub_81DB3C2
+	if_stat_level_more_than 1, 7, 8, AI_sub_81DB3C8
+	score -2
+	jump AI_sub_81DB3D0
+
+AI_sub_81DB3C2:: @ 81DB3C2
+	if_random_less_than 80, AI_sub_81DB3D0
+
+AI_sub_81DB3C8:: @ 81DB3C8
+	if_random_less_than 80, AI_sub_81DB3D0
+	score 2
+
+AI_sub_81DB3D0:: @ 81DB3D0
+	end
+
+AI_sub_81DB3D1:: @ 81DB3D1
+	if_hp_less_than 1, 4, AI_sub_81DB3DF
+	if_hp_less_than 1, 35, AI_sub_81DB3E6
+
+AI_sub_81DB3DF:: @ 81DB3DF
+	score -1
+	jump AI_sub_81DB3EE
+
+AI_sub_81DB3E6:: @ 81DB3E6
+	if_random_less_than 70, AI_sub_81DB3EE
+	score 1
+
+AI_sub_81DB3EE:: @ 81DB3EE
+	end
+
+AI_sub_81DB3EF:: @ 81DB3EF
+	if_stat_level_more_than 1, 1, 8, AI_sub_81DB41C
+	if_stat_level_more_than 1, 2, 8, AI_sub_81DB41C
+	if_stat_level_more_than 1, 4, 8, AI_sub_81DB41C
+	if_stat_level_more_than 1, 5, 8, AI_sub_81DB41C
+	if_stat_level_more_than 1, 7, 8, AI_sub_81DB41C
+	jump AI_sub_81DB442
+
+AI_sub_81DB41C:: @ 81DB41C
+	if_would_go_first 1, AI_sub_81DB42E
+	if_hp_more_than 1, 60, AI_sub_81DB48A
+	jump AI_sub_81DB435
+
+AI_sub_81DB42E:: @ 81DB42E
+	if_hp_more_than 1, 70, AI_sub_81DB48A
+
+AI_sub_81DB435:: @ 81DB435
+	if_random_less_than 80, AI_sub_81DB48A
+	score 2
+	jump AI_sub_81DB48A
+
+AI_sub_81DB442:: @ 81DB442
+	if_stat_level_more_than 1, 1, 7, AI_sub_81DB46F
+	if_stat_level_more_than 1, 2, 7, AI_sub_81DB46F
+	if_stat_level_more_than 1, 4, 7, AI_sub_81DB46F
+	if_stat_level_more_than 1, 5, 7, AI_sub_81DB46F
+	if_stat_level_more_than 1, 7, 7, AI_sub_81DB46F
+	jump AI_sub_81DB488
+
+AI_sub_81DB46F:: @ 81DB46F
+	if_would_go_first 1, AI_sub_81DB481
+	if_hp_more_than 1, 60, AI_sub_81DB488
+	jump AI_sub_81DB48A
+
+AI_sub_81DB481:: @ 81DB481
+	if_hp_less_than 1, 70, AI_sub_81DB48A
+
+AI_sub_81DB488:: @ 81DB488
+	score -2
+
+AI_sub_81DB48A:: @ 81DB48A
+	end
+
+AI_sub_81DB48B:: @ 81DB48B
+	is_first_turn 1
+	if_not_equal 0, AI_sub_81DB4C0
+	get_type 0
+	if_equal 7, AI_sub_81DB4B8
+	get_type 0
+	if_equal 14, AI_sub_81DB4B8
+	get_type 2
+	if_equal 7, AI_sub_81DB4B8
+	get_type 2
+	if_equal 14, AI_sub_81DB4B8
+	jump AI_sub_81DB4C0
+
+AI_sub_81DB4B8:: @ 81DB4B8
+	if_random_less_than -128, AI_sub_81DB4C0
+	score 1
+
+AI_sub_81DB4C0:: @ 81DB4C0
+	end
+
+AI_sub_81DB4C1:: @ 81DB4C1
+	if_would_go_first 0, AI_sub_81DB4CF
+	get_ability 1
+	if_equal 33, AI_sub_81DB4F6
+
+AI_sub_81DB4CF:: @ 81DB4CF
+	if_hp_less_than 1, 40, AI_sub_81DB4FD
+	get_weather
+	if_equal 3, AI_sub_81DB4F6
+	if_equal 0, AI_sub_81DB4F6
+	if_equal 2, AI_sub_81DB4F6
+	get_ability 1
+	if_equal 44, AI_sub_81DB4F6
+	jump AI_sub_81DB4FF
+
+AI_sub_81DB4F6:: @ 81DB4F6
+	score 1
+	jump AI_sub_81DB4FF
+
+AI_sub_81DB4FD:: @ 81DB4FD
+	score -1
+
+AI_sub_81DB4FF:: @ 81DB4FF
+	end
+
+AI_sub_81DB500:: @ 81DB500
+	if_hp_less_than 1, 40, AI_sub_81DB526
+	get_weather
+	if_equal 3, AI_sub_81DB51F
+	if_equal 1, AI_sub_81DB51F
+	if_equal 2, AI_sub_81DB51F
+	jump AI_sub_81DB528
+
+AI_sub_81DB51F:: @ 81DB51F
+	score 1
+	jump AI_sub_81DB528
+
+AI_sub_81DB526:: @ 81DB526
+	score -1
+
+AI_sub_81DB528:: @ 81DB528
+	end
+
+AI_sub_81DB529:: @ 81DB529
+	if_hp_less_than 1, 90, AI_sub_81DB535
+	jump AI_sub_81DB537
+
+AI_sub_81DB535:: @ 81DB535
+	score -2
+
+AI_sub_81DB537:: @ 81DB537
+	end
+
+AI_sub_81DB538:: @ 81DB538
+	if_stat_level_more_than 0, 1, 8, AI_sub_81DB565
+	if_stat_level_more_than 0, 2, 8, AI_sub_81DB565
+	if_stat_level_more_than 0, 4, 8, AI_sub_81DB565
+	if_stat_level_more_than 0, 5, 8, AI_sub_81DB565
+	if_stat_level_more_than 0, 7, 8, AI_sub_81DB565
+	jump AI_sub_81DB5A2
+
+AI_sub_81DB565:: @ 81DB565
+	if_stat_level_less_than 1, 1, 7, AI_sub_81DB59A
+	if_stat_level_less_than 1, 2, 7, AI_sub_81DB59A
+	if_stat_level_less_than 1, 4, 7, AI_sub_81DB59A
+	if_stat_level_less_than 1, 5, 7, AI_sub_81DB59A
+	if_stat_level_less_than 1, 7, 7, AI_sub_81DB598
+	if_random_less_than 50, AI_sub_81DB5A4
+	jump AI_sub_81DB5A2
+
+AI_sub_81DB598:: @ 81DB598
+	score 1
+
+AI_sub_81DB59A:: @ 81DB59A
+	if_random_less_than -128, AI_sub_81DB5A4
+	score 1
+
+AI_sub_81DB5A2:: @ 81DB5A2
+	score -2
+
+AI_sub_81DB5A4:: @ 81DB5A4
+	end
+
+AI_sub_81DB5A5:: @ 81DB5A5
+	if_status 0, 7, AI_sub_81DB639
+	if_status2 0, 983040, AI_sub_81DB639
+	if_status2 0, 7, AI_sub_81DB639
+	if_hp_more_than 1, 30, AI_sub_81DB5D2
+	if_random_less_than 10, AI_sub_81DB5D2
+	score -1
+
+AI_sub_81DB5D2:: @ 81DB5D2
+	if_hp_more_than 1, 50, AI_sub_81DB5E1
+	if_random_less_than 100, AI_sub_81DB5E1
+	score -1
+
+AI_sub_81DB5E1:: @ 81DB5E1
+	get_move 0
+	get_move_power_from_result
+	if_equal 0, AI_sub_81DB610
+	if_not_taunted AI_sub_81DB5F7
+	if_random_less_than 100, AI_sub_81DB5F7
+	score 1
+
+AI_sub_81DB5F7:: @ 81DB5F7
+	get_move 0
+	get_move_type_from_result
+	if_not_in_bytes AI_bytes_81DB63C, AI_sub_81DB639
+	if_random_less_than 100, AI_sub_81DB63B
+	score 1
+	jump AI_sub_81DB63B
+
+AI_sub_81DB610:: @ 81DB610
+	if_not_taunted AI_sub_81DB61D
+	if_random_less_than 100, AI_sub_81DB61D
+	score 1
+
+AI_sub_81DB61D:: @ 81DB61D
+	get_type 0
+	if_in_bytes AI_bytes_81DB63C, AI_sub_81DB63B
+	get_type 2
+	if_in_bytes AI_bytes_81DB63C, AI_sub_81DB63B
+	if_random_less_than 50, AI_sub_81DB63B
+
+AI_sub_81DB639:: @ 81DB639
+	score -1
+
+AI_sub_81DB63B:: @ 81DB63B
+	end
+
+AI_bytes_81DB63C:: @ 81DB63C
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 15
+	.byte 16
+	.byte 17
+	.byte 0xFF
+
+AI_sub_81DB645:: @ 81DB645
+	if_damage_bonus 10, AI_sub_81DB666
+	if_damage_bonus 20, AI_sub_81DB666
+	if_move_effect 0, 111, AI_sub_81DB666
+	if_hp_more_than 1, 38, AI_sub_81DB668
+	score -1
+	jump AI_sub_81DB668
+
+AI_sub_81DB666:: @ 81DB666
+	score -2
+
+AI_sub_81DB668:: @ 81DB668
+	end
+
+AI_sub_81DB669:: @ 81DB669
+	if_not_move_effect 0, 111, AI_sub_81DB677
+	score -1
+	jump AI_sub_81DB6EE
+
+AI_sub_81DB677:: @ 81DB677
+	if_status 0, 128, AI_sub_81DB6E6
+	if_status2 0, 268435456, AI_sub_81DB6E6
+	if_status3 0, 4, AI_sub_81DB6E6
+	get_weather
+	if_equal 3, AI_sub_81DB6A7
+	if_equal 2, AI_sub_81DB6C2
+	jump AI_sub_81DB6D2
+
+AI_sub_81DB6A7:: @ 81DB6A7
+	get_type 1
+	if_in_bytes AI_bytes_81DB6EF, AI_sub_81DB6E6
+	get_type 3
+	if_in_bytes AI_bytes_81DB6EF, AI_sub_81DB6E6
+	jump AI_sub_81DB6D2
+
+AI_sub_81DB6C2:: @ 81DB6C2
+	get_type 1
+	if_equal 15, AI_sub_81DB6E6
+	get_type 3
+	if_equal 15, AI_sub_81DB6E6
+
+AI_sub_81DB6D2:: @ 81DB6D2
+	if_would_go_first 1, AI_sub_81DB6EE
+	get_move 0
+	get_move_effect_from_result
+	if_not_equal 94, AI_sub_81DB6E6
+	jump AI_sub_81DB6EE
+
+AI_sub_81DB6E6:: @ 81DB6E6
+	if_random_less_than 80, AI_sub_81DB6EE
+	score 1
+
+AI_sub_81DB6EE:: @ 81DB6EE
+	end
+
+AI_bytes_81DB6EF:: @ 81DB6EF
+	.byte 4
+	.byte 5
+	.byte 8
+	.byte 0xFF
+
+AI_sub_81DB6F3:: @ 81DB6F3
+	score 2
+	end
+
+AI_sub_81DB6F6:: @ 81DB6F6
+	get_stockpile_count 1
+	if_less_than 2, AI_sub_81DB706
+	if_random_less_than 80, AI_sub_81DB706
+	score 2
+
+AI_sub_81DB706:: @ 81DB706
+	end
+
+AI_sub_81DB707:: @ 81DB707
+	if_hp_less_than 1, 40, AI_sub_81DB72D
+	get_weather
+	if_equal 0, AI_sub_81DB726
+	if_equal 1, AI_sub_81DB726
+	if_equal 2, AI_sub_81DB726
+	jump AI_sub_81DB72F
+
+AI_sub_81DB726:: @ 81DB726
+	score 1
+	jump AI_sub_81DB72F
+
+AI_sub_81DB72D:: @ 81DB72D
+	score -1
+
+AI_sub_81DB72F:: @ 81DB72F
+	end
+
+AI_sub_81DB730:: @ 81DB730
+	if_not_status 0, 216, AI_sub_81DB73C
+	score 1
+
+AI_sub_81DB73C:: @ 81DB73C
+	end
+
+AI_sub_81DB73D:: @ 81DB73D
+	if_damage_bonus 10, AI_sub_81DB77C
+	if_damage_bonus 20, AI_sub_81DB77C
+	if_status 0, 7, AI_sub_81DB789
+	if_status2 0, 983040, AI_sub_81DB783
+	if_status2 0, 7, AI_sub_81DB783
+	is_first_turn 1
+	if_not_equal 0, AI_sub_81DB78B
+	if_random_less_than 100, AI_sub_81DB78B
+	score 1
+	jump AI_sub_81DB78B
+
+AI_sub_81DB77C:: @ 81DB77C
+	score -1
+	jump AI_sub_81DB78B
+
+AI_sub_81DB783:: @ 81DB783
+	if_random_less_than 100, AI_sub_81DB78B
+
+AI_sub_81DB789:: @ 81DB789
+	score 1
+
+AI_sub_81DB78B:: @ 81DB78B
+	end
+
+AI_sub_81DB78C:: @ 81DB78C
+	if_status 0, 64, AI_sub_81DB79B
+	jump AI_sub_81DB79D
+
+AI_sub_81DB79B:: @ 81DB79B
+	score 1
+
+AI_sub_81DB79D:: @ 81DB79D
+	end
+
+AI_sub_81DB79E:: @ 81DB79E
+	get_hold_effect 1
+	if_in_bytes AI_bytes_81DB7E7, AI_sub_81DB7B9
+	if_in_bytes AI_bytes_81DB7DF, AI_sub_81DB7CB
+
+AI_sub_81DB7B2:: @ 81DB7B2
+	score -3
+	jump AI_sub_81DB7DE
+
+AI_sub_81DB7B9:: @ 81DB7B9
+	get_hold_effect 0
+	if_in_bytes AI_bytes_81DB7E7, AI_sub_81DB7B2
+	score 5
+	jump AI_sub_81DB7DE
+
+AI_sub_81DB7CB:: @ 81DB7CB
+	get_hold_effect 0
+	if_in_bytes AI_bytes_81DB7DF, AI_sub_81DB7B2
+	if_random_less_than 50, AI_sub_81DB7DE
+	score 2
+
+AI_sub_81DB7DE:: @ 81DB7DE
+	end
+
+AI_bytes_81DB7DF:: @ 81DB7DF
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 24
+	.byte 29
+	.byte 0xFF
+
+AI_bytes_81DB7E7:: @ 81DB7E7
+	.byte 29
+	.byte 0xFF
+
+AI_sub_81DB7E9:: @ 81DB7E9
+	get_ability 1
+	if_in_bytes AI_bytes_81DB80F, AI_sub_81DB7FF
+	get_ability 0
+	if_in_bytes AI_bytes_81DB80F, AI_sub_81DB806
+
+AI_sub_81DB7FF:: @ 81DB7FF
+	score -1
+	jump AI_sub_81DB80E
+
+AI_sub_81DB806:: @ 81DB806
+	if_random_less_than 50, AI_sub_81DB80E
+	score 2
+
+AI_sub_81DB80E:: @ 81DB80E
+	end
+
+AI_bytes_81DB80F:: @ 81DB80F
+	.byte 3
+	.byte 4
+	.byte 8
+	.byte 9
+	.byte 18
+	.byte 25
+	.byte 27
+	.byte 33
+	.byte 37
+	.byte 44
+	.byte 56
+	.byte 61
+	.byte 63
+	.byte 74
+	.byte 34
+	.byte 19
+	.byte 0xFF
+
+AI_sub_81DB820:: @ 81DB820
+	if_damage_bonus 10, AI_sub_81DB84D
+	if_damage_bonus 20, AI_sub_81DB84D
+	if_stat_level_less_than 1, 1, 6, AI_sub_81DB84D
+	if_would_go_first 1, AI_sub_81DB846
+	if_hp_more_than 1, 40, AI_sub_81DB84D
+	jump AI_sub_81DB84F
+
+AI_sub_81DB846:: @ 81DB846
+	if_hp_less_than 1, 60, AI_sub_81DB84F
+
+AI_sub_81DB84D:: @ 81DB84D
+	score -1
+
+AI_sub_81DB84F:: @ 81DB84F
+	end
+
+AI_sub_81DB850:: @ 81DB850
+	if_hp_more_than 0, 30, AI_sub_81DB85F
+	if_random_less_than 100, AI_sub_81DB85F
+	score -1
+
+AI_sub_81DB85F:: @ 81DB85F
+	is_first_turn 1
+	if_equal 0, AI_sub_81DB87A
+	if_random_less_than -106, AI_sub_81DB882
+	score 1
+	jump AI_sub_81DB882
+	if_random_less_than 50, AI_sub_81DB882
+
+AI_sub_81DB87A:: @ 81DB87A
+	if_random_less_than 30, AI_sub_81DB882
+	score -1
+
+AI_sub_81DB882:: @ 81DB882
+	end
+
+AI_sub_81DB883:: @ 81DB883
+	get_item 1
+	if_not_in_bytes AI_bytes_81DB89E, AI_sub_81DB89B
+	if_random_less_than 50, AI_sub_81DB89D
+	score 1
+	jump AI_sub_81DB89D
+
+AI_sub_81DB89B:: @ 81DB89B
+	score -2
+
+AI_sub_81DB89D:: @ 81DB89D
+	end
+
+AI_bytes_81DB89E:: @ 81DB89E
+	.byte 134
+	.byte 141
+	.byte 174
+	.byte 0xFF
+
+AI_sub_81DB8A2:: @ 81DB8A2
+	if_status 0, 7, AI_sub_81DB8CD
+	if_status2 0, 983040, AI_sub_81DB8CD
+	if_status2 0, 7, AI_sub_81DB8CD
+	if_random_less_than -76, AI_sub_81DB8CD
+	score 2
+	jump AI_sub_81DB8CF
+
+AI_sub_81DB8CD:: @ 81DB8CD
+	score -2
+
+AI_sub_81DB8CF:: @ 81DB8CF
+	end
+
+AI_sub_81DB8D0:: @ 81DB8D0
+	if_status4 0, 1, AI_sub_81DB8DF
+	jump AI_sub_81DB8E1
+
+AI_sub_81DB8DF:: @ 81DB8DF
+	score 1
+
+AI_sub_81DB8E1:: @ 81DB8E1
+	end
+
+AI_sub_81DB8E2:: @ 81DB8E2
+	if_hp_less_than 0, 30, AI_sub_81DB8F9
+	is_first_turn 1
+	if_more_than 0, AI_sub_81DB8F9
+	if_random_less_than -76, AI_sub_81DB8F9
+	score 1
+
+AI_sub_81DB8F9:: @ 81DB8F9
+	end
+
+AI_sub_81DB8FA:: @ 81DB8FA
+	if_hp_less_than 0, 70, AI_sub_81DB923
+	if_would_go_first 1, AI_sub_81DB915
+	if_hp_more_than 1, 40, AI_sub_81DB923
+	score 1
+	jump AI_sub_81DB925
+
+AI_sub_81DB915:: @ 81DB915
+	if_hp_more_than 1, 50, AI_sub_81DB923
+	score 1
+	jump AI_sub_81DB925
+
+AI_sub_81DB923:: @ 81DB923
+	score -1
+
+AI_sub_81DB925:: @ 81DB925
+	end
+
+AI_sub_81DB926:: @ 81DB926
+	if_damage_bonus 10, AI_sub_81DB94B
+	if_damage_bonus 20, AI_sub_81DB94B
+	if_would_go_first 1, AI_sub_81DB944
+	if_hp_more_than 0, 50, AI_sub_81DB94D
+	jump AI_sub_81DB94B
+
+AI_sub_81DB944:: @ 81DB944
+	if_hp_more_than 0, 70, AI_sub_81DB94D
+
+AI_sub_81DB94B:: @ 81DB94B
+	score -1
+
+AI_sub_81DB94D:: @ 81DB94D
+	end
+
+AI_sub_81DB94E:: @ 81DB94E
+	is_first_turn 1
+	if_more_than 0, AI_sub_81DB95E
+	if_random_less_than 100, AI_sub_81DB95E
+	score 2
+
+AI_sub_81DB95E:: @ 81DB95E
+	end
+
+AI_sub_81DB95F:: @ 81DB95F
+	if_hp_less_than 0, 50, AI_sub_81DB96B
+	jump AI_sub_81DB96D
+
+AI_sub_81DB96B:: @ 81DB96B
+	score -1
+
+AI_sub_81DB96D:: @ 81DB96D
+	end
+
+AI_sub_81DB96E:: @ 81DB96E
+	is_first_turn 1
+	if_equal 1, AI_sub_81DB9B5
+	if_random_less_than 30, AI_sub_81DB9D7
+	if_would_go_first 1, AI_sub_81DB99B
+	if_hp_not_equal 1, 100, AI_sub_81DB9CF
+	if_hp_less_than 0, 70, AI_sub_81DB9CF
+	if_random_less_than 60, AI_sub_81DB9D7
+	jump AI_sub_81DB9CF
+
+AI_sub_81DB99B:: @ 81DB99B
+	if_hp_more_than 0, 25, AI_sub_81DB9CF
+	if_move_effect 0, 32, AI_sub_81DB9B5
+	if_move_effect 0, -100, AI_sub_81DB9B5
+	jump AI_sub_81DB9C2
+
+AI_sub_81DB9B5:: @ 81DB9B5
+	if_random_less_than -106, AI_sub_81DB9D7
+	score 2
+	jump AI_sub_81DB9D7
+
+AI_sub_81DB9C2:: @ 81DB9C2
+	if_random_less_than -26, AI_sub_81DB9CF
+	score 1
+	jump AI_sub_81DB9D7
+
+AI_sub_81DB9CF:: @ 81DB9CF
+	if_random_less_than 30, AI_sub_81DB9D7
+	score -2
+
+AI_sub_81DB9D7:: @ 81DB9D7
+	end
+
+AI_sub_81DB9D8:: @ 81DB9D8
+	if_hp_less_than 1, 50, AI_sub_81DB9FB
+	get_type 0
+	if_equal 13, AI_sub_81DB9F4
+	get_type 2
+	if_equal 13, AI_sub_81DB9F4
+	jump AI_sub_81DB9FB
+
+AI_sub_81DB9F4:: @ 81DB9F4
+	score 1
+	jump AI_sub_81DB9FD
+
+AI_sub_81DB9FB:: @ 81DB9FB
+	score -1
+
+AI_sub_81DB9FD:: @ 81DB9FD
+	end
+
+AI_sub_81DB9FE:: @ 81DB9FE
+	if_damage_bonus 10, AI_sub_81DBA23
+	if_damage_bonus 20, AI_sub_81DBA23
+	if_would_go_first 1, AI_sub_81DBA1C
+	if_hp_more_than 1, 60, AI_sub_81DBA25
+	jump AI_sub_81DBA23
+
+AI_sub_81DBA1C:: @ 81DBA1C
+	if_hp_more_than 1, 80, AI_sub_81DBA25
+
+AI_sub_81DBA23:: @ 81DBA23
+	score -1
+
+AI_sub_81DBA25:: @ 81DBA25
+	end
+
+AI_sub_81DBA26:: @ 81DBA26
+	if_hp_less_than 1, 50, AI_sub_81DBA49
+	get_type 0
+	if_equal 10, AI_sub_81DBA42
+	get_type 2
+	if_equal 10, AI_sub_81DBA42
+	jump AI_sub_81DBA49
+
+AI_sub_81DBA42:: @ 81DBA42
+	score 1
+	jump AI_sub_81DBA4B
+
+AI_sub_81DBA49:: @ 81DBA49
+	score -1
+
+AI_sub_81DBA4B:: @ 81DBA4B
+	end
+
+AI_sub_81DBA4C:: @ 81DBA4C
+	if_would_go_first 1, AI_sub_81DBA66
+	if_hp_more_than 1, 50, AI_sub_81DBA6E
+	if_random_less_than 70, AI_sub_81DBA6E
+	score -1
+	jump AI_sub_81DBA6E
+
+AI_sub_81DBA66:: @ 81DBA66
+	if_random_less_than -128, AI_sub_81DBA6E
+	score 1
+
+AI_sub_81DBA6E:: @ 81DBA6E
+	end
+
+AI_CheckViability:: @ 81DBA6F
+	if_can_faint AI_sub_81DBA7C
+	is_most_powerful_move
+	if_equal 1, AI_sub_81DA424
+	end
+
+AI_sub_81DBA7C:: @ 81DBA7C
+	if_effect 7, AI_sub_81DBA8C
+	if_not_effect 103, AI_sub_81DBA8A
+	score 2
+
+AI_sub_81DBA8A:: @ 81DBA8A
+	score 4
+
+AI_sub_81DBA8C:: @ 81DBA8C
+	end
+
+AI_SetupFirstTurn:: @ 81DBA8D
+	get_turn_count
+	if_not_equal 0, AI_sub_81DBAA6
+	get_effect
+	if_not_in_bytes AI_bytes_81DBAA7, AI_sub_81DBAA6
+	if_random_less_than 80, AI_sub_81DBAA6
+	score 2
+
+AI_sub_81DBAA6:: @ 81DBAA6
+	end
+
+AI_bytes_81DBAA7:: @ 81DBAA7
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 15
+	.byte 16
+	.byte 18
+	.byte 19
+	.byte 20
+	.byte 21
+	.byte 22
+	.byte 23
+	.byte 24
+	.byte 30
+	.byte 35
+	.byte 54
+	.byte 47
+	.byte 49
+	.byte 50
+	.byte 51
+	.byte 52
+	.byte 53
+	.byte 54
+	.byte 55
+	.byte 56
+	.byte 58
+	.byte 59
+	.byte 60
+	.byte 61
+	.byte 62
+	.byte 63
+	.byte 64
+	.byte 65
+	.byte 66
+	.byte 67
+	.byte 79
+	.byte 84
+	.byte 108
+	.byte 109
+	.byte 118
+	.byte 213
+	.byte 187
+	.byte 156
+	.byte 165
+	.byte 166
+	.byte 167
+	.byte 181
+	.byte 192
+	.byte 199
+	.byte 205
+	.byte 206
+	.byte 208
+	.byte 211
+	.byte 213
+	.byte 0xFF
+
+AI_PreferStrongestMove:: @ 81DBADF
+	is_most_powerful_move
+	if_not_equal 0, AI_sub_81DBAEE
+	if_random_less_than 100, AI_sub_81DBAEE
+	score 2
+
+AI_sub_81DBAEE:: @ 81DBAEE
+	end
+
+AI_Risky:: @ 81DBAEF
+	get_effect
+	if_not_in_bytes AI_bytes_81DBB02, AI_sub_81DBB01
+	if_random_less_than -128, AI_sub_81DBB01
+	score 2
+
+AI_sub_81DBB01:: @ 81DBB01
+	end
+
+AI_bytes_81DBB02:: @ 81DBB02
+	.byte 1
+	.byte 7
+	.byte 9
+	.byte 38
+	.byte 43
+	.byte 49
+	.byte 83
+	.byte 88
+	.byte 89
+	.byte 98
+	.byte 118
+	.byte 120
+	.byte 122
+	.byte 140
+	.byte 142
+	.byte 144
+	.byte 170
+	.byte 185
+	.byte 199
+	.byte 0xFF
+
+AI_PreferBatonPass:: @ 81DBB16
+	count_alive_pokemon 1
+	if_equal 0, AI_sub_81DBB3A
+	is_most_powerful_move
+	if_not_equal 0, AI_sub_81DBB3A
+	if_move_effect 1, 127, AI_sub_81DBB32
+	if_random_less_than 80, AI_sub_81DBB01
+
+AI_sub_81DBB32:: @ 81DBB32
+	if_random_less_than 20, AI_sub_81DBB01
+	score 3
+
+AI_sub_81DBB3A:: @ 81DBB3A
+	end
+
+AI_DoubleBattle:: @ 81DBB3B
+	end
+
+AI_HPAware:: @ 81DBB3C
+	if_hp_more_than 1, 70, AI_sub_81DBB59
+	if_hp_more_than 1, 30, AI_sub_81DBB68
+	get_effect
+	if_in_bytes AI_bytes_81DBBFC, AI_sub_81DBB77
+	jump AI_sub_81DBB7F
+
+AI_sub_81DBB59:: @ 81DBB59
+	get_effect
+	if_in_bytes AI_bytes_81DBBC3, AI_sub_81DBB77
+	jump AI_sub_81DBB7F
+
+AI_sub_81DBB68:: @ 81DBB68
+	get_effect
+	if_in_bytes AI_bytes_81DBBD1, AI_sub_81DBB77
+	jump AI_sub_81DBB7F
+
+AI_sub_81DBB77:: @ 81DBB77
+	if_random_less_than 50, AI_sub_81DBB7F
+	score -2
+
+AI_sub_81DBB7F:: @ 81DBB7F
+	if_hp_more_than 0, 70, AI_sub_81DBB9C
+	if_hp_more_than 0, 30, AI_sub_81DBBAB
+	get_effect
+	if_in_bytes AI_bytes_81DBC55, AI_sub_81DBBBA
+	jump AI_sub_81DBBC2
+
+AI_sub_81DBB9C:: @ 81DBB9C
+	get_effect
+	if_in_bytes AI_bytes_81DBC2C, AI_sub_81DBBBA
+	jump AI_sub_81DBBC2
+
+AI_sub_81DBBAB:: @ 81DBBAB
+	get_effect
+	if_in_bytes AI_bytes_81DBC2D, AI_sub_81DBBBA
+	jump AI_sub_81DBBC2
+
+AI_sub_81DBBBA:: @ 81DBBBA
+	if_random_less_than 50, AI_sub_81DBBC2
+	score -2
+
+AI_sub_81DBBC2:: @ 81DBBC2
+	end
+
+AI_bytes_81DBBC3:: @ 81DBBC3
+	.byte 7
+	.byte 32
+	.byte 37
+	.byte 98
+	.byte 99
+	.byte 116
+	.byte 132
+	.byte 133
+	.byte 134
+	.byte 157
+	.byte 168
+	.byte 194
+	.byte 204
+	.byte 0xFF
+
+AI_bytes_81DBBD1:: @ 81DBBD1
+	.byte 7
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 15
+	.byte 16
+	.byte 18
+	.byte 19
+	.byte 20
+	.byte 21
+	.byte 22
+	.byte 23
+	.byte 24
+	.byte 26
+	.byte 30
+	.byte 35
+	.byte 46
+	.byte 47
+	.byte 50
+	.byte 51
+	.byte 52
+	.byte 53
+	.byte 54
+	.byte 55
+	.byte 56
+	.byte 58
+	.byte 59
+	.byte 60
+	.byte 61
+	.byte 62
+	.byte 63
+	.byte 64
+	.byte 93
+	.byte 124
+	.byte 142
+	.byte 205
+	.byte 206
+	.byte 208
+	.byte 211
+	.byte 212
+	.byte 0xFF
+
+AI_bytes_81DBBFC:: @ 81DBBFC
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 15
+	.byte 16
+	.byte 18
+	.byte 19
+	.byte 20
+	.byte 21
+	.byte 22
+	.byte 23
+	.byte 24
+	.byte 26
+	.byte 30
+	.byte 35
+	.byte 46
+	.byte 47
+	.byte 50
+	.byte 51
+	.byte 52
+	.byte 53
+	.byte 54
+	.byte 55
+	.byte 56
+	.byte 58
+	.byte 59
+	.byte 60
+	.byte 61
+	.byte 62
+	.byte 63
+	.byte 64
+	.byte 81
+	.byte 93
+	.byte 94
+	.byte 124
+	.byte 142
+	.byte 143
+	.byte 144
+	.byte 151
+	.byte 190
+	.byte 205
+	.byte 206
+	.byte 208
+	.byte 211
+	.byte 212
+	.byte 0xFF
+
+AI_bytes_81DBC2C:: @ 81DBC2C
+	.byte 0xFF
+
+AI_bytes_81DBC2D:: @ 81DBC2D
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 15
+	.byte 16
+	.byte 18
+	.byte 19
+	.byte 20
+	.byte 21
+	.byte 22
+	.byte 23
+	.byte 24
+	.byte 46
+	.byte 47
+	.byte 50
+	.byte 51
+	.byte 52
+	.byte 53
+	.byte 54
+	.byte 55
+	.byte 56
+	.byte 58
+	.byte 59
+	.byte 60
+	.byte 61
+	.byte 62
+	.byte 63
+	.byte 64
+	.byte 66
+	.byte 91
+	.byte 114
+	.byte 124
+	.byte 205
+	.byte 206
+	.byte 208
+	.byte 211
+	.byte 212
+	.byte 0xFF
+
+AI_bytes_81DBC55:: @ 81DBC55
+	.byte 1
+	.byte 7
+	.byte 10
+	.byte 11
+	.byte 12
+	.byte 13
+	.byte 14
+	.byte 15
+	.byte 16
+	.byte 18
+	.byte 19
+	.byte 20
+	.byte 21
+	.byte 22
+	.byte 23
+	.byte 24
+	.byte 26
+	.byte 30
+	.byte 33
+	.byte 35
+	.byte 38
+	.byte 40
+	.byte 40
+	.byte 46
+	.byte 47
+	.byte 49
+	.byte 50
+	.byte 51
+	.byte 52
+	.byte 53
+	.byte 54
+	.byte 55
+	.byte 56
+	.byte 58
+	.byte 59
+	.byte 60
+	.byte 61
+	.byte 62
+	.byte 63
+	.byte 64
+	.byte 66
+	.byte 67
+	.byte 91
+	.byte 93
+	.byte 94
+	.byte 100
+	.byte 114
+	.byte 118
+	.byte 119
+	.byte 120
+	.byte 124
+	.byte 143
+	.byte 144
+	.byte 167
+	.byte 205
+	.byte 206
+	.byte 208
+	.byte 211
+	.byte 212
+	.byte 0xFF
+
+AI_Unknown:: @ 81DBC91
+	if_not_effect -119, AI_sub_81DBCA7
+	if_equal 0, AI_sub_81DBCA7
+	is_first_turn 1
+	if_equal 0, AI_sub_81DBCA7
+	score 5
+
+AI_sub_81DBCA7:: @ 81DBCA7
+	end
+
+AI_Roaming:: @ 81DBCA8
+	if_status2 1, 57344, AI_sub_81DBCD5
+	if_status2 1, 67108864, AI_sub_81DBCD5
+	get_ability 0
+	if_equal 23, AI_sub_81DBCD5
+	get_ability 1
+	if_equal 26, AI_sub_81DBCD4
+	get_ability 0
+	if_equal 71, AI_sub_81DBCD5
+
+AI_sub_81DBCD4:: @ 81DBCD4
+	flee
+
+AI_sub_81DBCD5:: @ 81DBCD5
+	end
+
+AI_Safari:: @ 81DBCD6
+	if_random_100 AI_sub_81DBCDC
+	watch
+
+AI_sub_81DBCDC:: @ 81DBCDC
+	flee
+
+AI_FirstBattle:: @ 81DBCDD
+	if_hp_equal 0, 20, AI_sub_81DBCEC
+	if_hp_less_than 0, 20, AI_sub_81DBCEC
+	end
+
+AI_sub_81DBCEC:: @ 81DBCEC
+	flee
+
+AI_Ret:: @ 81DBCED
+	end
diff --git a/data/battle_anim.s b/data/battle_anim.s
new file mode 100644
index 000000000..3fae69431
--- /dev/null
+++ b/data/battle_anim.s
@@ -0,0 +1,262 @@
+	.section .rodata
+	.align 2
+gOamData_83AC9C8::
+	.4byte 0x00000000, 0x00000800
+
+gOamData_83AC9D0::
+	.4byte 0x40000000, 0x00000800
+
+gOamData_83AC9D8::
+	.4byte 0x80000000, 0x00000800
+
+gOamData_83AC9E0::
+	.4byte 0xc0000000, 0x00000800
+
+gOamData_83AC9E8::
+	.4byte 0x00004000, 0x00000800
+
+gOamData_83AC9F0::
+	.4byte 0x40004000, 0x00000800
+
+gOamData_83AC9F8::
+	.4byte 0x80004000, 0x00000800
+
+gOamData_83ACA00::
+	.4byte 0xc0004000, 0x00000800
+
+gOamData_83ACA08::
+	.4byte 0x00008000, 0x00000800
+
+gOamData_83ACA10::
+	.4byte 0x40008000, 0x00000800
+
+gOamData_83ACA18::
+	.4byte 0x80008000, 0x00000800
+
+gOamData_83ACA20::
+	.4byte 0xc0008000, 0x00000800
+
+gOamData_83ACA28::
+	.4byte 0x00000100, 0x00000800
+
+gOamData_83ACA30::
+	.4byte 0x40000100, 0x00000800
+
+gOamData_83ACA38::
+	.4byte 0x80000100, 0x00000800
+
+gOamData_83ACA40::
+	.4byte 0xc0000100, 0x00000800
+
+gOamData_83ACA48::
+	.4byte 0x00004100, 0x00000800
+
+gOamData_83ACA50::
+	.4byte 0x40004100, 0x00000800
+
+gOamData_83ACA58::
+	.4byte 0x80004100, 0x00000800
+
+gOamData_83ACA60::
+	.4byte 0xc0004100, 0x00000800
+
+gOamData_83ACA68::
+	.4byte 0x00008100, 0x00000800
+
+gOamData_83ACA70::
+	.4byte 0x40008100, 0x00000800
+
+gOamData_83ACA78::
+	.4byte 0x80008100, 0x00000800
+
+gOamData_83ACA80::
+	.4byte 0xc0008100, 0x00000800
+
+gOamData_83ACA88::
+	.4byte 0x00000300, 0x00000800
+
+gOamData_83ACA90::
+	.4byte 0x40000300, 0x00000800
+
+gOamData_83ACA98::
+	.4byte 0x80000300, 0x00000800
+
+gOamData_83ACAA0::
+	.4byte 0xc0000300, 0x00000800
+
+gOamData_83ACAA8::
+	.4byte 0x00004300, 0x00000800
+
+gOamData_83ACAB0::
+	.4byte 0x40004300, 0x00000800
+
+gOamData_83ACAB8::
+	.4byte 0x80004300, 0x00000800
+
+gOamData_83ACAC0::
+	.4byte 0xc0004300, 0x00000800
+
+gOamData_83ACAC8::
+	.4byte 0x00008300, 0x00000800
+
+gOamData_83ACAD0::
+	.4byte 0x40008300, 0x00000800
+
+gOamData_83ACAD8::
+	.4byte 0x80008300, 0x00000800
+
+gOamData_83ACAE0::
+	.4byte 0xc0008300, 0x00000800
+
+gOamData_83ACAE8::
+	.4byte 0x00000400, 0x00000800
+
+gOamData_83ACAF0::
+	.4byte 0x40000400, 0x00000800
+
+gOamData_83ACAF8::
+	.4byte 0x80000400, 0x00000800
+
+gOamData_83ACB00::
+	.4byte 0xc0000400, 0x00000800
+
+gOamData_83ACB08::
+	.4byte 0x00004400, 0x00000800
+
+gOamData_83ACB10::
+	.4byte 0x40004400, 0x00000800
+
+gOamData_83ACB18::
+	.4byte 0x80004400, 0x00000800
+
+gOamData_83ACB20::
+	.4byte 0xc0004400, 0x00000800
+
+gOamData_83ACB28::
+	.4byte 0x00008400, 0x00000800
+
+gOamData_83ACB30::
+	.4byte 0x40008400, 0x00000800
+
+gOamData_83ACB38::
+	.4byte 0x80008400, 0x00000800
+
+gOamData_83ACB40::
+	.4byte 0xc0008400, 0x00000800
+
+gOamData_83ACB48::
+	.4byte 0x00000500, 0x00000800
+
+gOamData_83ACB50::
+	.4byte 0x40000500, 0x00000800
+
+gOamData_83ACB58::
+	.4byte 0x80000500, 0x00000800
+
+gOamData_83ACB60::
+	.4byte 0xc0000500, 0x00000800
+
+gOamData_83ACB68::
+	.4byte 0x00004500, 0x00000800
+
+gOamData_83ACB70::
+	.4byte 0x40004500, 0x00000800
+
+gOamData_83ACB78::
+	.4byte 0x80004500, 0x00000800
+
+gOamData_83ACB80::
+	.4byte 0xc0004500, 0x00000800
+
+gOamData_83ACB88::
+	.4byte 0x00008500, 0x00000800
+
+gOamData_83ACB90::
+	.4byte 0x40008500, 0x00000800
+
+gOamData_83ACB98::
+	.4byte 0x80008500, 0x00000800
+
+gOamData_83ACBA0::
+	.4byte 0xc0008500, 0x00000800
+
+gOamData_83ACBA8::
+	.4byte 0x00000700, 0x00000800
+
+gOamData_83ACBB0::
+	.4byte 0x40000700, 0x00000800
+
+gOamData_83ACBB8::
+	.4byte 0x80000700, 0x00000800
+
+gOamData_83ACBC0::
+	.4byte 0xc0000700, 0x00000800
+
+gOamData_83ACBC8::
+	.4byte 0x00004700, 0x00000800
+
+gOamData_83ACBD0::
+	.4byte 0x40004700, 0x00000800
+
+gOamData_83ACBD8::
+	.4byte 0x80004700, 0x00000800
+
+gOamData_83ACBE0::
+	.4byte 0xc0004700, 0x00000800
+
+gOamData_83ACBE8::
+	.4byte 0x00008700, 0x00000800
+
+gOamData_83ACBF0::
+	.4byte 0x40008700, 0x00000800
+
+gOamData_83ACBF8::
+	.4byte 0x80008700, 0x00000800
+
+gOamData_83ACC00::
+	.4byte 0xc0008700, 0x00000800
+
+gUnknown_83ACC08:: @ 83ACC08
+	.incbin "baserom.gba", 0x3ACC08, 0x440
+
+gUnknown_83AD048:: @ 83AD048
+	.incbin "baserom.gba", 0x3AD048, 0x308
+
+gUnknown_83AD350:: @ 83AD350
+	.incbin "baserom.gba", 0x3AD350, 0x120
+
+gUnknown_83AD470:: @ 83AD470
+	.incbin "baserom.gba", 0x3AD470, 0x4E0
+
+gUnknown_83AD950:: @ 83AD950
+	.incbin "baserom.gba", 0x3AD950, 0x308
+
+gUnknown_83ADC58:: @ 83ADC58
+	.incbin "baserom.gba", 0x3ADC58, 0x120
+
+gUnknown_83ADD78:: @ 83ADD78
+	.incbin "baserom.gba", 0x3ADD78, 0xA0
+
+gUnknown_83ADE18:: @ 83ADE18
+	.incbin "baserom.gba", 0x3ADE18, 0x144
+
+gUnknown_83ADF5C:: @ 83ADF5C
+	.incbin "baserom.gba", 0x3ADF5C, 0xC0
+
+gUnknown_83AE01C:: @ 83AE01C
+	.incbin "baserom.gba", 0x3AE01C, 0x20
+
+gUnknown_83AE03C:: @ 83AE03C
+	.incbin "baserom.gba", 0x3AE03C, 0x10
+
+gUnknown_83AE04C:: @ 83AE04C
+	.incbin "baserom.gba", 0x3AE04C, 0x4
+
+gUnknown_83AE050:: @ 83AE050
+	.incbin "baserom.gba", 0x3AE050, 0x4
+
+gUnknown_83AE054:: @ 83AE054
+	.incbin "baserom.gba", 0x3AE054, 0x30
+
+gUnknown_83AE084:: @ 0x83AE084
+	.incbin "baserom.gba", 0x3AE084, 0x10
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 78267e5ea..3d1de8ac5 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1,4 +1,5 @@
 	.section script_data, "aw", %progbits
+	.align 2
 
 gUnknown_81C68EC:: @ 81C68EC
 	.incbin "baserom.gba", 0x1C68EC, 0x8
diff --git a/data/battle_anim_status_effects.s b/data/battle_anim_status_effects.s
new file mode 100644
index 000000000..738553830
--- /dev/null
+++ b/data/battle_anim_status_effects.s
@@ -0,0 +1,14 @@
+	.section .rodata
+	.align 2
+
+gUnknown_83BF3E0:: @ 83BF3DC
+    .incbin "baserom.gba", 0x3BF3E0, 0x174
+
+gUnknown_83BF554:: @ 83BF554
+	.incbin "baserom.gba", 0x3BF554, 0x8
+
+gUnknown_83BF55C:: @ 83BF55C
+	.incbin "baserom.gba", 0x3BF55C, 0x18
+
+gUnknown_83BF574:: @ 83BF574
+	.incbin "baserom.gba", 0x3BF574, 0x18
diff --git a/data/berry_pouch.s b/data/berry_pouch.s
new file mode 100644
index 000000000..172443b5e
--- /dev/null
+++ b/data/berry_pouch.s
@@ -0,0 +1,59 @@
+	.section .rodata
+	.align 2
+
+gUnknown_846434C:: @ 846434C
+	.incbin "baserom.gba", 0x46434C, 0xC
+
+gUnknown_8464358:: @ 8464358
+	.incbin "baserom.gba", 0x464358, 0x14
+
+gUnknown_846436C:: @ 846436C
+	.incbin "baserom.gba", 0x46436C, 0x8
+
+gUnknown_8464374:: @ 8464374
+	.incbin "baserom.gba", 0x464374, 0x8
+
+gUnknown_846437C:: @ 846437C
+	.incbin "baserom.gba", 0x46437C, 0x28
+
+gUnknown_84643A4:: @ 84643A4
+	.incbin "baserom.gba", 0x4643A4, 0x4
+
+gUnknown_84643A8:: @ 84643A8
+	.incbin "baserom.gba", 0x4643A8, 0x4
+
+gUnknown_84643AC:: @ 84643AC
+	.incbin "baserom.gba", 0x4643AC, 0x4
+
+gUnknown_84643B0:: @ 84643B0
+	.incbin "baserom.gba", 0x4643B0, 0x4
+
+gUnknown_84643B4:: @ 84643B4
+	.incbin "baserom.gba", 0x4643B4, 0x4
+
+gUnknown_84643B8:: @ 84643B8
+	.incbin "baserom.gba", 0x4643B8, 0x20
+
+gUnknown_84643D8:: @ 84643D8
+	.incbin "baserom.gba", 0x4643D8, 0x18
+
+gUnknown_84643F0:: @ 84643F0
+	.incbin "baserom.gba", 0x4643F0, 0x8
+
+gUnknown_84643F8:: @ 84643F8
+	.incbin "baserom.gba", 0x4643F8, 0x8
+
+gUnknown_8464400:: @ 8464400
+	.incbin "baserom.gba", 0x464400, 0x48
+
+gUnknown_8464448:: @ 8464448
+	.incbin "baserom.gba", 0x464448, 0x60
+
+gUnknown_84644A8:: @ 84644A8
+	.incbin "baserom.gba", 0x4644A8, 0x8
+
+gUnknown_84644B0:: @ 84644B0
+	.incbin "baserom.gba", 0x4644B0, 0x8
+
+gUnknown_84644B8:: @ 84644B8
+	.incbin "baserom.gba", 0x4644B8, 0x32C
diff --git a/data/buy_menu_helpers.s b/data/buy_menu_helpers.s
new file mode 100644
index 000000000..a59b8e069
--- /dev/null
+++ b/data/buy_menu_helpers.s
@@ -0,0 +1,14 @@
+	.section .rodata
+	.align 2
+
+gUnknown_8464804:: @ 8464804
+	.incbin "baserom.gba", 0x464804, 0x38
+
+gUnknown_846483C:: @ 846483C
+	.incbin "baserom.gba", 0x46483C, 0x40
+
+gUnknown_846487C:: @ 846487C
+	.incbin "baserom.gba", 0x46487C, 0x8
+
+gUnknown_8464884:: @ 8464884
+	.incbin "baserom.gba", 0x464884, 0xC
diff --git a/data/data.s b/data/data.s
index 505dde2c1..499e3c9db 100644
--- a/data/data.s
+++ b/data/data.s
@@ -1,5 +1,8 @@
 #include "constants/region_map.h"
 #include "constants/trainer_classes.h"
+#include "constants/songs.h"
+#include "constants/region_map.h"
+	.set NULL, 0
 
 	.section .rodata
 
@@ -73,7 +76,7 @@ gUnknown_82349BC:: @ 82349BC
 gUnknown_82349CC:: @ 82349CC
 	.incbin "baserom.gba", 0x2349CC, 0x6E0
 
-gUnknown_82350AC:: @ 82350AC
+gMonFrontPicTable:: @ 82350AC
 	.incbin "baserom.gba", 0x2350AC, 0xE8
 
 gUnknown_8235194:: @ 8235194
@@ -82,7 +85,7 @@ gUnknown_8235194:: @ 8235194
 gUnknown_8235E6C:: @ 8235E6C
 	.incbin "baserom.gba", 0x235E6C, 0x6E0
 
-gUnknown_823654C:: @ 823654C
+gMonBackPicTable:: @ 823654C
 	.incbin "baserom.gba", 0x23654C, 0xDC0
 
 gMonPaletteTable:: @ 823730C
@@ -100,10 +103,10 @@ gTrainerFrontAnimsPtrTable:: @ 82390DC
 gUnknown_823932C:: @ 823932C
 	.incbin "baserom.gba", 0x23932C, 0x250
 
-gUnknown_823957C:: @ 823957C
+gTrainerFrontPicTable:: @ 823957C
 	.incbin "baserom.gba", 0x23957C, 0x4A0
 
-gUnknown_8239A1C:: @ 8239A1C
+gTrainerFrontPicPaletteTable:: @ 8239A1C
 	.incbin "baserom.gba", 0x239A1C, 0x558
 
 gTrainerBackAnimsPtrTable:: @ 8239F74
@@ -112,7 +115,7 @@ gTrainerBackAnimsPtrTable:: @ 8239F74
 gUnknown_8239F8C:: @ 8239F8C
 	.incbin "baserom.gba", 0x239F8C, 0x18
 
-gUnknown_8239FA4:: @ 8239FA4
+gTrainerBackPicTable:: @ 8239FA4
 	.incbin "baserom.gba", 0x239FA4, 0x30
 
 gUnknown_8239FD4:: @ 8239FD4
@@ -129,10 +132,7 @@ gTrainers:: @ 823EAD8
 	.incbin "baserom.gba", 0x23EAC8, 0x7418
 
 gSpeciesNames:: @ 8245EE0
-	.incbin "baserom.gba", 0x245EE0, 0xD05
-
-gUnknown_8246BE5:: @ 8246BE5
-	.incbin "baserom.gba", 0x246BE5, 0x4AF
+	.include "data/text/species_names.inc"
 
 gMoveNames:: @ 8247094
 	.incbin "baserom.gba", 0x247094, 0xF97
@@ -547,69 +547,9 @@ gUnknown_825E032:: @ 825E032
 gUnknown_825E05C:: @ 825E05C
 	.incbin "baserom.gba", 0x25E05C, 0x18
 
-gUnknown_825E074:: @ 825E074
-	.incbin "baserom.gba", 0x25E074, 0x280
-
-gUnknown_825E2F4:: @ 825E2F4
-	.incbin "baserom.gba", 0x25E2F4, 0x168
-
-gBitTable:: @ 825E45C
-	.incbin "baserom.gba", 0x25E45C, 0x80
-
-gUnknown_825E4DC:: @ 825E4DC
-	.incbin "baserom.gba", 0x25E4DC, 0x18
-
-gUnknown_825E4F4:: @ 825E4F4
-	.incbin "baserom.gba", 0x25E4F4, 0x18
-
-gUnknown_825E50C:: @ 825E50C
-	.incbin "baserom.gba", 0x25E50C, 0xA00
-
-gUnknown_825EF0C:: @ 825EF0C
-	.incbin "baserom.gba", 0x25EF0C, 0x8E8
-
-gUnknown_825F7F4:: @ 825F7F4
-	.incbin "baserom.gba", 0x25F7F4, 0x20
-
-gUnknown_825F814:: @ 825F814
-	.incbin "baserom.gba", 0x25F814, 0x18
-
-gUnknown_825F82C:: @ 825F82C
-	.incbin "baserom.gba", 0x25F82C, 0x10
-
-gUnknown_825F83C:: @ 825F83C
-	.incbin "baserom.gba", 0x25F83C, 0x2
-
-gUnknown_825F83E:: @ 825F83E
-	.incbin "baserom.gba", 0x25F83E, 0x8DE
-
-gUnknown_826011C:: @ 826011C
-	.incbin "baserom.gba", 0x26011C, 0x8
-
-gUnknown_8260124:: @ 8260124
-	.incbin "baserom.gba", 0x260124, 0x8
-
-gUnknown_826012C:: @ 826012C
-	.incbin "baserom.gba", 0x26012C, 0x8
-
-gUnknown_8260134:: @ 8260134
-	.incbin "baserom.gba", 0x260134, 0x50
-
-gUnknown_8260184:: @ 8260184
-	.incbin "baserom.gba", 0x260184, 0x18
-
-gUnknown_826019C:: @ 826019C
-	.incbin "baserom.gba", 0x26019C, 0x8
-
-gUnknown_82601A4:: @ 82601A4
-	.incbin "baserom.gba", 0x2601A4, 0x10
-
-gUnknown_82601B4:: @ 82601B4
-	.incbin "baserom.gba", 0x2601B4, 0x8
-
-gUnknown_82601BC:: @ 82601BC
-	.incbin "baserom.gba", 0x2601BC, 0x4C
+	.section .rodata.825EF0C
 
+	.align 2
 gUnknown_8260208:: @ 8260208
 	.incbin "baserom.gba", 0x260208, 0x8
 
@@ -751,13 +691,13 @@ gUnknown_8261E8A:: @ 8261E8A
 gUnknown_8261EB6:: @ 8261EB6
 	.incbin "baserom.gba", 0x261EB6, 0xB
 
-gUnknown_8261EC1:: @ 8261EC1
+gText_MaleSymbol4:: @ 8261EC1
 	.incbin "baserom.gba", 0x261EC1, 0x2
 
-gUnknown_8261EC3:: @ 8261EC3
+gText_FemaleSymbol4:: @ 8261EC3
 	.incbin "baserom.gba", 0x261EC3, 0x2
 
-gUnknown_8261EC5:: @ 8261EC5
+gText_GenderlessSymbol:: @ 8261EC5
 	.incbin "baserom.gba", 0x261EC5, 0x2
 
 gUnknown_8261EC7:: @ 8261EC7
@@ -793,7 +733,7 @@ gUnknown_8262055:: @ 8262055
 gUnknown_826407C:: @ 826407C
 	.incbin "baserom.gba", 0x26407C, 0x1FA0
 
-gUnknown_826601C:: @ 826601C
+gUnknown_08331F60:: @ 826601C
 	.incbin "baserom.gba", 0x26601C, 0x1000
 
 gUnknown_826701C:: @ 826701C
@@ -908,8 +848,16 @@ gUnknown_826D29E:: @ 826D29E
 gUnknown_826D2B0:: @ 826D2B0
 	.incbin "baserom.gba", 0x26D2B0, 0x28
 
-gUnknown_826D2D8:: @ 826D2D8
-	.incbin "baserom.gba", 0x26D2D8, 0x48
+gDirectionToVectors:: @ 826D2D8
+	.4byte  0,  0
+	.4byte  0,  1
+	.4byte  0, -1
+	.4byte -1,  0
+	.4byte  1,  0
+	.4byte -1,  1
+	.4byte  1,  1
+	.4byte -1, -1
+	.4byte  1, -1
 
 gUnknown_826D320:: @ 826D320
 	.incbin "baserom.gba", 0x26D320, 0x10
@@ -918,36 +866,24 @@ gUnknown_826D330:: @ 826D330
 	.incbin "baserom.gba", 0x26D330, 0xC
 
 gUnknown_826D33C:: @ 826D33C
-	.incbin "baserom.gba", 0x26D33C, 0xC
+	.4byte sub_8058684
+	.4byte sub_80586A4
+	.4byte sub_80586A8
 
 gUnknown_826D348:: @ 826D348
-	.incbin "baserom.gba", 0x26D348, 0x2C
+	.4byte sub_80586C8
+	.4byte sub_80586CC
+	.4byte sub_80586CC
+	.4byte sub_80586CC
+	.4byte sub_80586CC
+	.4byte sub_80586C8
+	.4byte sub_80586C8
+	.4byte sub_8058734
+	.4byte sub_8058734
+	.4byte sub_8058734
+	.4byte sub_8058734
 
 gUnknown_826D374:: @ 826D374
-	.incbin "baserom.gba", 0x26D374, 0x78258
-
-gUnknown_82E55CC:: @ 82E55CC
-	.incbin "baserom.gba", 0x2E55CC, 0x695C0
+	.4byte sub_805874C
+	.4byte sub_8058754
 
-gUnknown_834EB8C:: @ 834EB8C
-	.incbin "baserom.gba", 0x34EB8C, 0x3B1C
-
-gUnknown_83526A8:: @ 83526A8
-	.incbin "baserom.gba", 0x3526A8, 0x844
-
-gUnknown_8352EEC:: @ 8352EEC
-	.incbin "baserom.gba", 0x352EEC, 0x4
-
-gUnknown_8352EF0:: @ 8352EF0
-	.incbin "baserom.gba", 0x352EF0, 0x20
-
-gUnknown_8352F10:: @ 8352F10
-	.incbin "baserom.gba", 0x352F10, 0x8
-
-	.align 2
-gUnknown_8352F18:: @ 8352F18
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c"
-
-	.align 2
-gUnknown_8352F4C:: @ 8352F4C
-	.asciz "VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE"
diff --git a/data/data_835B488.s b/data/data_835B488.s
index 8d2183672..c106c46c4 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -1,949 +1,8 @@
-	.section .rodata
-
-	.align 2
-gUnknown_835B488:: @ 835B488
-	.incbin "baserom.gba", 0x35B488, 0x14
-
-gUnknown_835B49C:: @ 835B49C
-	.incbin "baserom.gba", 0x35B49C, 0x14
-
-gUnknown_835B4B0:: @ 835B4B0
-	.incbin "baserom.gba", 0x35B4B0, 0x14
-
-gUnknown_835B4C4:: @ 835B4C4
-	.incbin "baserom.gba", 0x35B4C4, 0x114
-
-gUnknown_835B5D8:: @ 835B5D8
-	.incbin "baserom.gba", 0x35B5D8, 0x18C
-
-gUnknown_835B764:: @ 835B764
-	.incbin "baserom.gba", 0x35B764, 0xB0
-
-gUnknown_835B814:: @ 835B814
-	.incbin "baserom.gba", 0x35B814, 0xC
-
-gUnknown_835B820:: @ 835B820
-	.incbin "baserom.gba", 0x35B820, 0x8
-
-gUnknown_835B828:: @ 835B828
-	.incbin "baserom.gba", 0x35B828, 0x14
-
-gUnknown_835B83C:: @ 835B83C
-	.incbin "baserom.gba", 0x35B83C, 0x8
-
-gUnknown_835B844:: @ 835B844
-	.incbin "baserom.gba", 0x35B844, 0x20
-
-gUnknown_835B864:: @ 835B864
-	.incbin "baserom.gba", 0x35B864, 0x10
-
-gUnknown_835B874:: @ 835B874
-	.incbin "baserom.gba", 0x35B874, 0xC
-
-gUnknown_835B880:: @ 835B880
-	.incbin "baserom.gba", 0x35B880, 0x2
-
-gUnknown_835B882:: @ 835B882
-	.incbin "baserom.gba", 0x35B882, 0xC
-
-gUnknown_835B88E:: @ 835B88E
-	.incbin "baserom.gba", 0x35B88E, 0x2
-
-gUnknown_835B890:: @ 835B890
-	.incbin "baserom.gba", 0x35B890, 0x10
-
-gUnknown_835B8A0:: @ 835B8A0
-	.incbin "baserom.gba", 0x35B8A0, 0xC
-
-gUnknown_835B8AC:: @ 835B8AC
-	.incbin "baserom.gba", 0x35B8AC, 0x4
-
-gUnknown_835B8B0:: @ 835B8B0
-	.incbin "baserom.gba", 0x35B8B0, 0x10
-
-gUnknown_835B8C0:: @ 835B8C0
-	.incbin "baserom.gba", 0x35B8C0, 0x4
-
-gUnknown_835B8C4:: @ 835B8C4
-	.incbin "baserom.gba", 0x35B8C4, 0x8
-
-gUnknown_835B8CC:: @ 835B8CC
-	.incbin "baserom.gba", 0x35B8CC, 0x40
-
-gUnknown_835B90C:: @ 835B90C
-	.incbin "baserom.gba", 0x35B90C, 0x6
-
-gUnknown_835B912:: @ 835B912
-	.incbin "baserom.gba", 0x35B912, 0x6
-
-gUnknown_835B918:: @ 835B918
-	.incbin "baserom.gba", 0x35B918, 0x2
-
-gUnknown_835B91A:: @ 835B91A
-	.incbin "baserom.gba", 0x35B91A, 0x6
-
-gUnknown_835B920:: @ 835B920
-	.incbin "baserom.gba", 0x35B920, 0xC
-
-gUnknown_835B92C:: @ 835B92C
-	.incbin "baserom.gba", 0x35B92C, 0x8
-
-gUnknown_835B934:: @ 835B934
-	.incbin "baserom.gba", 0x35B934, 0x10
-
-gUnknown_835B944:: @ 835B944
-	.incbin "baserom.gba", 0x35B944, 0x18
-
-gUnknown_835B95C:: @ 835B95C
-	.incbin "baserom.gba", 0x35B95C, 0x3DA2C
-
-gUnknown_8399388:: @ 8399388
-	.incbin "baserom.gba", 0x399388, 0x908
-
-gUnknown_8399C90:: @ 8399C90
-	.incbin "baserom.gba", 0x399C90, 0x5F38
-
-gUnknown_839FBC8:: @ 839FBC8
-	.incbin "baserom.gba", 0x39FBC8, 0x144
-
-gUnknown_839FD0C:: @ 839FD0C
-	.incbin "baserom.gba", 0x39FD0C, 0x51
-
-gUnknown_839FD5D:: @ 839FD5D
-	.incbin "baserom.gba", 0x39FD5D, 0x53
-
-gUnknown_839FDB0:: @ 839FDB0
-	.incbin "baserom.gba", 0x39FDB0, 0x260
-
-gUnknown_83A0010:: @ 83A0010
-	.incbin "baserom.gba", 0x3A0010, 0x3688
-
-gUnknown_83A3698:: @ 83A3698
-	.incbin "baserom.gba", 0x3A3698, 0x1AC0
-
-gUnknown_83A5158:: @ 83A5158
-	.incbin "baserom.gba", 0x3A5158, 0xB0
-
-gUnknown_83A5208:: @ 83A5208
-	.incbin "baserom.gba", 0x3A5208, 0x70
-
-gUnknown_83A5278:: @ 83A5278
-	.incbin "baserom.gba", 0x3A5278, 0xB8
-
-gUnknown_83A5330:: @ 83A5330
-	.incbin "baserom.gba", 0x3A5330, 0x18
-
-gUnknown_83A5348:: @ 83A5348
-	.incbin "baserom.gba", 0x3A5348, 0xCB8
-
-gUnknown_83A6000:: @ 83A6000
-	.incbin "baserom.gba", 0x3A6000, 0x10
-
-gUnknown_83A6010:: @ 83A6010
-	.incbin "baserom.gba", 0x3A6010, 0x8
-
-gUnknown_83A6018:: @ 83A6018
-	.incbin "baserom.gba", 0x3A6018, 0x1C
-
-gUnknown_83A6034:: @ 83A6034
-	.incbin "baserom.gba", 0x3A6034, 0x1C
-
-gUnknown_83A6050:: @ 83A6050
-	.incbin "baserom.gba", 0x3A6050, 0x4
-
-gUnknown_83A6054:: @ 83A6054
-	.incbin "baserom.gba", 0x3A6054, 0x2C
-
-gUnknown_83A6080:: @ 83A6080
-	.incbin "baserom.gba", 0x3A6080, 0x14
-
-gUnknown_83A6094:: @ 83A6094
-	.incbin "baserom.gba", 0x3A6094, 0x1C
-
-gUnknown_83A60B0:: @ 83A60B0
-	.incbin "baserom.gba", 0x3A60B0, 0x4
-
-gUnknown_83A60B4:: @ 83A60B4
-	.incbin "baserom.gba", 0x3A60B4, 0x1C
-
-gUnknown_83A60D0:: @ 83A60D0
-	.incbin "baserom.gba", 0x3A60D0, 0x4
-
-gUnknown_83A60D4:: @ 83A60D4
-	.incbin "baserom.gba", 0x3A60D4, 0xC
-
-gUnknown_83A60E0:: @ 83A60E0
-	.incbin "baserom.gba", 0x3A60E0, 0x14
-
-gUnknown_83A60F4:: @ 83A60F4
-	.incbin "baserom.gba", 0x3A60F4, 0x14
-
-gUnknown_83A6108:: @ 83A6108
-	.incbin "baserom.gba", 0x3A6108, 0x14
-
-gUnknown_83A611C:: @ 83A611C
-	.incbin "baserom.gba", 0x3A611C, 0x4
-
-gUnknown_83A6120:: @ 83A6120
-	.incbin "baserom.gba", 0x3A6120, 0x14
-
-gUnknown_83A6134:: @ 83A6134
-	.incbin "baserom.gba", 0x3A6134, 0x4
-
-gUnknown_83A6138:: @ 83A6138
-	.incbin "baserom.gba", 0x3A6138, 0x14
-
-gUnknown_83A614C:: @ 83A614C
-	.incbin "baserom.gba", 0x3A614C, 0x4
-
-gUnknown_83A6150:: @ 83A6150
-	.incbin "baserom.gba", 0x3A6150, 0x14
-
-gUnknown_83A6164:: @ 83A6164
-	.incbin "baserom.gba", 0x3A6164, 0x4
-
-gUnknown_83A6168:: @ 83A6168
-	.incbin "baserom.gba", 0x3A6168, 0x14
-
-gUnknown_83A617C:: @ 83A617C
-	.incbin "baserom.gba", 0x3A617C, 0x4
-
-gUnknown_83A6180:: @ 83A6180
-	.incbin "baserom.gba", 0x3A6180, 0x14
-
-gUnknown_83A6194:: @ 83A6194
-	.incbin "baserom.gba", 0x3A6194, 0x4
-
-gUnknown_83A6198:: @ 83A6198
-	.incbin "baserom.gba", 0x3A6198, 0x14
-
-gUnknown_83A61AC:: @ 83A61AC
-	.incbin "baserom.gba", 0x3A61AC, 0x4
-
-gUnknown_83A61B0:: @ 83A61B0
-	.incbin "baserom.gba", 0x3A61B0, 0x14
-
-gUnknown_83A61C4:: @ 83A61C4
-	.incbin "baserom.gba", 0x3A61C4, 0x4
-
-gUnknown_83A61C8:: @ 83A61C8
-	.incbin "baserom.gba", 0x3A61C8, 0x10
-
-gUnknown_83A61D8:: @ 83A61D8
-	.incbin "baserom.gba", 0x3A61D8, 0x8
-
-gUnknown_83A61E0:: @ 83A61E0
-	.incbin "baserom.gba", 0x3A61E0, 0x10
-
-gUnknown_83A61F0:: @ 83A61F0
-	.incbin "baserom.gba", 0x3A61F0, 0x8
-
-gUnknown_83A61F8:: @ 83A61F8
-	.incbin "baserom.gba", 0x3A61F8, 0x10
-
-gUnknown_83A6208:: @ 83A6208
-	.incbin "baserom.gba", 0x3A6208, 0xC
-
-gUnknown_83A6214:: @ 83A6214
-	.incbin "baserom.gba", 0x3A6214, 0x4
-
-gUnknown_83A6218:: @ 83A6218
-	.incbin "baserom.gba", 0x3A6218, 0xC
-
-gUnknown_83A6224:: @ 83A6224
-	.incbin "baserom.gba", 0x3A6224, 0x4
-
-gUnknown_83A6228:: @ 83A6228
-	.incbin "baserom.gba", 0x3A6228, 0xC
-
-gUnknown_83A6234:: @ 83A6234
-	.incbin "baserom.gba", 0x3A6234, 0x4
-
-gUnknown_83A6238:: @ 83A6238
-	.incbin "baserom.gba", 0x3A6238, 0xC
-
-gUnknown_83A6244:: @ 83A6244
-	.incbin "baserom.gba", 0x3A6244, 0x4
-
-gUnknown_83A6248:: @ 83A6248
-	.incbin "baserom.gba", 0x3A6248, 0xC
-
-gUnknown_83A6254:: @ 83A6254
-	.incbin "baserom.gba", 0x3A6254, 0x4
-
-gUnknown_83A6258:: @ 83A6258
-	.incbin "baserom.gba", 0x3A6258, 0xC
-
-gUnknown_83A6264:: @ 83A6264
-	.incbin "baserom.gba", 0x3A6264, 0x4
-
-gUnknown_83A6268:: @ 83A6268
-	.incbin "baserom.gba", 0x3A6268, 0xC
-
-gUnknown_83A6274:: @ 83A6274
-	.incbin "baserom.gba", 0x3A6274, 0xC
-
-gUnknown_83A6280:: @ 83A6280
-	.incbin "baserom.gba", 0x3A6280, 0x4
-
-gUnknown_83A6284:: @ 83A6284
-	.incbin "baserom.gba", 0x3A6284, 0xC
-
-gUnknown_83A6290:: @ 83A6290
-	.incbin "baserom.gba", 0x3A6290, 0x4
-
-gUnknown_83A6294:: @ 83A6294
-	.incbin "baserom.gba", 0x3A6294, 0xC
-
-gUnknown_83A62A0:: @ 83A62A0
-	.incbin "baserom.gba", 0x3A62A0, 0x4
-
-gUnknown_83A62A4:: @ 83A62A4
-	.incbin "baserom.gba", 0x3A62A4, 0xC
-
-gUnknown_83A62B0:: @ 83A62B0
-	.incbin "baserom.gba", 0x3A62B0, 0x4
-
-gUnknown_83A62B4:: @ 83A62B4
-	.incbin "baserom.gba", 0x3A62B4, 0xC
-
-gUnknown_83A62C0:: @ 83A62C0
-	.incbin "baserom.gba", 0x3A62C0, 0x4
-
-gUnknown_83A62C4:: @ 83A62C4
-	.incbin "baserom.gba", 0x3A62C4, 0xC
-
-gUnknown_83A62D0:: @ 83A62D0
-	.incbin "baserom.gba", 0x3A62D0, 0x4
-
-gUnknown_83A62D4:: @ 83A62D4
-	.incbin "baserom.gba", 0x3A62D4, 0xC
-
-gUnknown_83A62E0:: @ 83A62E0
-	.incbin "baserom.gba", 0x3A62E0, 0x4
-
-gUnknown_83A62E4:: @ 83A62E4
-	.incbin "baserom.gba", 0x3A62E4, 0xC
-
-gUnknown_83A62F0:: @ 83A62F0
-	.incbin "baserom.gba", 0x3A62F0, 0x4
-
-gUnknown_83A62F4:: @ 83A62F4
-	.incbin "baserom.gba", 0x3A62F4, 0xC
-
-gUnknown_83A6300:: @ 83A6300
-	.incbin "baserom.gba", 0x3A6300, 0x4
-
-gUnknown_83A6304:: @ 83A6304
-	.incbin "baserom.gba", 0x3A6304, 0xC
-
-gUnknown_83A6310:: @ 83A6310
-	.incbin "baserom.gba", 0x3A6310, 0x4
-
-gUnknown_83A6314:: @ 83A6314
-	.incbin "baserom.gba", 0x3A6314, 0xC
-
-gUnknown_83A6320:: @ 83A6320
-	.incbin "baserom.gba", 0x3A6320, 0x4
-
-gUnknown_83A6324:: @ 83A6324
-	.incbin "baserom.gba", 0x3A6324, 0xC
-
-gUnknown_83A6330:: @ 83A6330
-	.incbin "baserom.gba", 0x3A6330, 0x4
-
-gUnknown_83A6334:: @ 83A6334
-	.incbin "baserom.gba", 0x3A6334, 0xC
-
-gUnknown_83A6340:: @ 83A6340
-	.incbin "baserom.gba", 0x3A6340, 0x4
-
-gUnknown_83A6344:: @ 83A6344
-	.incbin "baserom.gba", 0x3A6344, 0xC
-
-gUnknown_83A6350:: @ 83A6350
-	.incbin "baserom.gba", 0x3A6350, 0x4
-
-gUnknown_83A6354:: @ 83A6354
-	.incbin "baserom.gba", 0x3A6354, 0xC
-
-gUnknown_83A6360:: @ 83A6360
-	.incbin "baserom.gba", 0x3A6360, 0x4
-
-gUnknown_83A6364:: @ 83A6364
-	.incbin "baserom.gba", 0x3A6364, 0xC
-
-gUnknown_83A6370:: @ 83A6370
-	.incbin "baserom.gba", 0x3A6370, 0x4
-
-gUnknown_83A6374:: @ 83A6374
-	.incbin "baserom.gba", 0x3A6374, 0xC
-
-gUnknown_83A6380:: @ 83A6380
-	.incbin "baserom.gba", 0x3A6380, 0x4
-
-gUnknown_83A6384:: @ 83A6384
-	.incbin "baserom.gba", 0x3A6384, 0xC
-
-gUnknown_83A6390:: @ 83A6390
-	.incbin "baserom.gba", 0x3A6390, 0x2C
-
-gUnknown_83A63BC:: @ 83A63BC
-	.incbin "baserom.gba", 0x3A63BC, 0xC
-
-gUnknown_83A63C8:: @ 83A63C8
-	.incbin "baserom.gba", 0x3A63C8, 0x4
-
-gUnknown_83A63CC:: @ 83A63CC
-	.incbin "baserom.gba", 0x3A63CC, 0x8
-
-gUnknown_83A63D4:: @ 83A63D4
-	.incbin "baserom.gba", 0x3A63D4, 0x8
-
-gUnknown_83A63DC:: @ 83A63DC
-	.incbin "baserom.gba", 0x3A63DC, 0x8
-
-gUnknown_83A63E4:: @ 83A63E4
-	.incbin "baserom.gba", 0x3A63E4, 0xC
-
-gUnknown_83A63F0:: @ 83A63F0
-	.incbin "baserom.gba", 0x3A63F0, 0xC
-
-gUnknown_83A63FC:: @ 83A63FC
-	.incbin "baserom.gba", 0x3A63FC, 0x8
-
-gUnknown_83A6404:: @ 83A6404
-	.incbin "baserom.gba", 0x3A6404, 0x8
-
-gUnknown_83A640C:: @ 83A640C
-	.incbin "baserom.gba", 0x3A640C, 0x9
-
-gUnknown_83A6415:: @ 83A6415
-	.incbin "baserom.gba", 0x3A6415, 0x9
-
-gUnknown_83A641E:: @ 83A641E
-	.incbin "baserom.gba", 0x3A641E, 0x9
-
-gUnknown_83A6427:: @ 83A6427
-	.incbin "baserom.gba", 0x3A6427, 0x9
-
-gUnknown_83A6430:: @ 83A6430
-	.incbin "baserom.gba", 0x3A6430, 0x9
-
-gUnknown_83A6439:: @ 83A6439
-	.incbin "baserom.gba", 0x3A6439, 0x9
-
-gUnknown_83A6442:: @ 83A6442
-	.incbin "baserom.gba", 0x3A6442, 0x9
-
-gUnknown_83A644B:: @ 83A644B
-	.incbin "baserom.gba", 0x3A644B, 0x9
-
-gUnknown_83A6454:: @ 83A6454
-	.incbin "baserom.gba", 0x3A6454, 0x9
-
-gUnknown_83A645D:: @ 83A645D
-	.incbin "baserom.gba", 0x3A645D, 0x9
-
-gUnknown_83A6466:: @ 83A6466
-	.incbin "baserom.gba", 0x3A6466, 0x9
-
-gUnknown_83A646F:: @ 83A646F
-	.incbin "baserom.gba", 0x3A646F, 0x9
-
-gUnknown_83A6478:: @ 83A6478
-	.incbin "baserom.gba", 0x3A6478, 0x9
-
-gUnknown_83A6481:: @ 83A6481
-	.incbin "baserom.gba", 0x3A6481, 0x9
-
-gUnknown_83A648A:: @ 83A648A
-	.incbin "baserom.gba", 0x3A648A, 0x9
-
-gUnknown_83A6493:: @ 83A6493
-	.incbin "baserom.gba", 0x3A6493, 0x9
-
-gUnknown_83A649C:: @ 83A649C
-	.incbin "baserom.gba", 0x3A649C, 0xC
-
-gUnknown_83A64A8:: @ 83A64A8
-	.incbin "baserom.gba", 0x3A64A8, 0x10
-
-gUnknown_83A64B8:: @ 83A64B8
-	.incbin "baserom.gba", 0x3A64B8, 0x10
-
-gUnknown_83A64C8:: @ 83A64C8
-	.incbin "baserom.gba", 0x3A64C8, 0x24
-
-gUnknown_83A64EC:: @ 83A64EC
-	.incbin "baserom.gba", 0x3A64EC, 0x5
-
-gUnknown_83A64F1:: @ 83A64F1
-	.incbin "baserom.gba", 0x3A64F1, 0x5
-
-gUnknown_83A64F6:: @ 83A64F6
-	.incbin "baserom.gba", 0x3A64F6, 0x5
-
-gUnknown_83A64FB:: @ 83A64FB
-	.incbin "baserom.gba", 0x3A64FB, 0x5
-
-gUnknown_83A6500:: @ 83A6500
-	.incbin "baserom.gba", 0x3A6500, 0x5
-
-gUnknown_83A6505:: @ 83A6505
-	.incbin "baserom.gba", 0x3A6505, 0x5
-
-gUnknown_83A650A:: @ 83A650A
-	.incbin "baserom.gba", 0x3A650A, 0x5
-
-gUnknown_83A650F:: @ 83A650F
-	.incbin "baserom.gba", 0x3A650F, 0x5
-
-gUnknown_83A6514:: @ 83A6514
-	.incbin "baserom.gba", 0x3A6514, 0x5
-
-gUnknown_83A6519:: @ 83A6519
-	.incbin "baserom.gba", 0x3A6519, 0x5
-
-gUnknown_83A651E:: @ 83A651E
-	.incbin "baserom.gba", 0x3A651E, 0x5
-
-gUnknown_83A6523:: @ 83A6523
-	.incbin "baserom.gba", 0x3A6523, 0x5
-
-gUnknown_83A6528:: @ 83A6528
-	.incbin "baserom.gba", 0x3A6528, 0x5
-
-gUnknown_83A652D:: @ 83A652D
-	.incbin "baserom.gba", 0x3A652D, 0x5
-
-gUnknown_83A6532:: @ 83A6532
-	.incbin "baserom.gba", 0x3A6532, 0x5
-
-gUnknown_83A6537:: @ 83A6537
-	.incbin "baserom.gba", 0x3A6537, 0x5
-
-gUnknown_83A653C:: @ 83A653C
-	.incbin "baserom.gba", 0x3A653C, 0x5
-
-gUnknown_83A6541:: @ 83A6541
-	.incbin "baserom.gba", 0x3A6541, 0x5
-
-gUnknown_83A6546:: @ 83A6546
-	.incbin "baserom.gba", 0x3A6546, 0x5
-
-gUnknown_83A654B:: @ 83A654B
-	.incbin "baserom.gba", 0x3A654B, 0x5
-
-gUnknown_83A6550:: @ 83A6550
-	.incbin "baserom.gba", 0x3A6550, 0x5
-
-gUnknown_83A6555:: @ 83A6555
-	.incbin "baserom.gba", 0x3A6555, 0x5
-
-gUnknown_83A655A:: @ 83A655A
-	.incbin "baserom.gba", 0x3A655A, 0x5
-
-gUnknown_83A655F:: @ 83A655F
-	.incbin "baserom.gba", 0x3A655F, 0x5
-
-gUnknown_83A6564:: @ 83A6564
-	.incbin "baserom.gba", 0x3A6564, 0x5
-
-gUnknown_83A6569:: @ 83A6569
-	.incbin "baserom.gba", 0x3A6569, 0x5
-
-gUnknown_83A656E:: @ 83A656E
-	.incbin "baserom.gba", 0x3A656E, 0x5
-
-gUnknown_83A6573:: @ 83A6573
-	.incbin "baserom.gba", 0x3A6573, 0x5
-
-gUnknown_83A6578:: @ 83A6578
-	.incbin "baserom.gba", 0x3A6578, 0x5
-
-gUnknown_83A657D:: @ 83A657D
-	.incbin "baserom.gba", 0x3A657D, 0x5
-
-gUnknown_83A6582:: @ 83A6582
-	.incbin "baserom.gba", 0x3A6582, 0x5
-
-gUnknown_83A6587:: @ 83A6587
-	.incbin "baserom.gba", 0x3A6587, 0x5
-
-gUnknown_83A658C:: @ 83A658C
-	.incbin "baserom.gba", 0x3A658C, 0x5
-
-gUnknown_83A6591:: @ 83A6591
-	.incbin "baserom.gba", 0x3A6591, 0x8
-
-gUnknown_83A6599:: @ 83A6599
-	.incbin "baserom.gba", 0x3A6599, 0x10
-
-gUnknown_83A65A9:: @ 83A65A9
-	.incbin "baserom.gba", 0x3A65A9, 0x13
-
-gUnknown_83A65BC:: @ 83A65BC
-	.incbin "baserom.gba", 0x3A65BC, 0x2C8
-
-gUnknown_83A6884:: @ 83A6884
-	.incbin "baserom.gba", 0x3A6884, 0xD4
-
-gUnknown_83A6958:: @ 83A6958
-	.incbin "baserom.gba", 0x3A6958, 0x6
-
-gUnknown_83A695E:: @ 83A695E
-	.incbin "baserom.gba", 0x3A695E, 0x6C6
-
-gUnknown_83A7024:: @ 83A7024
-	.incbin "baserom.gba", 0x3A7024, 0x8
-
-gUnknown_83A702C:: @ 83A702C
-	.incbin "baserom.gba", 0x3A702C, 0x18
-
-gUnknown_83A7044:: @ 83A7044
-	.incbin "baserom.gba", 0x3A7044, 0x18
-
-gUnknown_83A705C:: @ 83A705C
-	.incbin "baserom.gba", 0x3A705C, 0x10
-
-gUnknown_83A706C:: @ 83A706C
-	.incbin "baserom.gba", 0x3A706C, 0x10
-
-gUnknown_83A707C:: @ 83A707C
-	.incbin "baserom.gba", 0x3A707C, 0x10
-
-gUnknown_83A708C:: @ 83A708C
-	.incbin "baserom.gba", 0x3A708C, 0x10
-
-gUnknown_83A709C:: @ 83A709C
-	.incbin "baserom.gba", 0x3A709C, 0xC
-
-gUnknown_83A70A8:: @ 83A70A8
-	.incbin "baserom.gba", 0x3A70A8, 0x4
-
-gUnknown_83A70AC:: @ 83A70AC
-	.incbin "baserom.gba", 0x3A70AC, 0x10
-
-gUnknown_83A70BC:: @ 83A70BC
-	.incbin "baserom.gba", 0x3A70BC, 0xE0
-
-gUnknown_83A719C:: @ 83A719C
-	.incbin "baserom.gba", 0x3A719C, 0x14
-
-gUnknown_83A71B0:: @ 83A71B0
-	.incbin "baserom.gba", 0x3A71B0, 0x3C
-
-gUnknown_83A71EC:: @ 83A71EC
-	.incbin "baserom.gba", 0x3A71EC, 0xC
-
-gUnknown_83A71F8:: @ 83A71F8
-	.incbin "baserom.gba", 0x3A71F8, 0x6
-
-gUnknown_83A71FE:: @ 83A71FE
-	.incbin "baserom.gba", 0x3A71FE, 0x4
-
-gUnknown_83A7202:: @ 83A7202
-	.incbin "baserom.gba", 0x3A7202, 0x6
-
-gUnknown_83A7208:: @ 83A7208
-	.incbin "baserom.gba", 0x3A7208, 0x4
-
-	.align 2
-gUnknown_83A720C:: @ 83A720C
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/evobjmv.c"
-
-	.align 2
-gUnknown_83A7240:: @ 83A7240
-	.asciz "0"
-
-	.align 2
-gNullScriptPtr:: @ 83A7244
-	.incbin "baserom.gba", 0x3A7244, 0x4
-
-gUnknown_83A7248:: @ 83A7248
-	.incbin "baserom.gba", 0x3A7248, 0x14
-
-gUnknown_83A725C:: @ 83A725C
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c"
-
-	.align 2
-gUnknown_83A7290:: @ 83A7290
-	.asciz "0"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 
+	.section .rodata
 	.align 2
-gUnknown_83A7294:: @ 83A7294
-	.incbin "baserom.gba", 0x3A7294, 0xC
-
-gUnknown_83A72A0:: @ 83A72A0
-	.incbin "baserom.gba", 0x3A72A0, 0x2
-
-gUnknown_83A72A2:: @ 83A72A2
-	.incbin "baserom.gba", 0x3A72A2, 0x6
-
-gUnknown_83A72A8:: @ 83A72A8
-	.incbin "baserom.gba", 0x3A72A8, 0x68
-
-gUnknown_83A7310:: @ 83A7310
-	.incbin "baserom.gba", 0x3A7310, 0x20
-
-gUnknown_83A7330:: @ 83A7330
-	.incbin "baserom.gba", 0x3A7330, 0x14
-
-gUnknown_83A7344:: @ 83A7344
-	.incbin "baserom.gba", 0x3A7344, 0x48
-
-gUnknown_83A738C:: @ 83A738C
-	.incbin "baserom.gba", 0x3A738C, 0x8
-
-gUnknown_83A7394:: @ 83A7394
-	.incbin "baserom.gba", 0x3A7394, 0x24
-
-gUnknown_83A73B8:: @ 83A73B8
-	.incbin "baserom.gba", 0x3A73B8, 0x4
-
-gUnknown_83A73BC:: @ 83A73BC
-	.incbin "baserom.gba", 0x3A73BC, 0x10
-
-gUnknown_83A73CC:: @ 83A73CC
-	.incbin "baserom.gba", 0x3A73CC, 0x8
-
-gUnknown_83A73D4:: @ 83A73D4
-	.incbin "baserom.gba", 0x3A73D4, 0x4
-
-gUnknown_83A73D8:: @ 83A73D8
-	.incbin "baserom.gba", 0x3A73D8, 0x4
-
-gUnknown_83A73DC:: @ 83A73DC
-	.incbin "baserom.gba", 0x3A73DC, 0x284
-
-gUnknown_83A7660:: @ 83A7660
-	.incbin "baserom.gba", 0x3A7660, 0x2FF4
-
-gUnknown_83AA654:: @ 83AA654
-	.incbin "baserom.gba", 0x3AA654, 0x1220
-
-gUnknown_83AB874:: @ 83AB874
-	.incbin "baserom.gba", 0x3AB874, 0x540
-
-gUnknown_83ABDB4:: @ 83ABDB4
-	.incbin "baserom.gba", 0x3ABDB4, 0x434
-
-gUnknown_83AC1E8:: @ 83AC1E8
-	.incbin "baserom.gba", 0x3AC1E8, 0x410
-
-gUnknown_83AC5F8:: @ 83AC5F8
-	.incbin "baserom.gba", 0x3AC5F8, 0x1D0
-
-gUnknown_83AC7C8:: @ 83AC7C8
-	.incbin "baserom.gba", 0x3AC7C8, 0x188
-
-gUnknown_83AC950:: @ 83AC950
-	.incbin "baserom.gba", 0x3AC950, 0x10
-
-gUnknown_83AC960:: @ 83AC960
-	.incbin "baserom.gba", 0x3AC960, 0x10
-
-gUnknown_83AC970:: @ 83AC970
-	.incbin "baserom.gba", 0x3AC970, 0x20
-
-sFanfares:: @ 83AC990
-	.incbin "baserom.gba", 0x3AC990, 0x40
-
-gUnknown_83AC9D0:: @ 83AC9D0
-	.incbin "baserom.gba", 0x3AC9D0, 0x28
-
-gUnknown_83AC9F8::
-	.incbin "baserom.gba", 0x3AC9F8, 0x8
-
-gUnknown_83ACA00::
-	.incbin "baserom.gba", 0x3ACA00, 0x208
-
-gUnknown_83ACC08:: @ 83ACC08
-	.incbin "baserom.gba", 0x3ACC08, 0x440
-
-gUnknown_83AD048:: @ 83AD048
-	.incbin "baserom.gba", 0x3AD048, 0x308
-
-gUnknown_83AD350:: @ 83AD350
-	.incbin "baserom.gba", 0x3AD350, 0x120
-
-gUnknown_83AD470:: @ 83AD470
-	.incbin "baserom.gba", 0x3AD470, 0x4E0
-
-gUnknown_83AD950:: @ 83AD950
-	.incbin "baserom.gba", 0x3AD950, 0x308
-
-gUnknown_83ADC58:: @ 83ADC58
-	.incbin "baserom.gba", 0x3ADC58, 0x120
-
-gUnknown_83ADD78:: @ 83ADD78
-	.incbin "baserom.gba", 0x3ADD78, 0xA0
-
-gUnknown_83ADE18:: @ 83ADE18
-	.incbin "baserom.gba", 0x3ADE18, 0x144
-
-gUnknown_83ADF5C:: @ 83ADF5C
-	.incbin "baserom.gba", 0x3ADF5C, 0xC0
-
-gUnknown_83AE01C:: @ 83AE01C
-	.incbin "baserom.gba", 0x3AE01C, 0x20
-
-gUnknown_83AE03C:: @ 83AE03C
-	.incbin "baserom.gba", 0x3AE03C, 0x10
-
-gUnknown_83AE04C:: @ 83AE04C
-	.incbin "baserom.gba", 0x3AE04C, 0x4
-
-gUnknown_83AE050:: @ 83AE050
-	.incbin "baserom.gba", 0x3AE050, 0x4
-
-gUnknown_83AE054:: @ 83AE054
-	.incbin "baserom.gba", 0x3AE054, 0x30
-
-gUnknown_83AE084:: @ 83AE084
-	.incbin "baserom.gba", 0x3AE084, 0x114D0
-
-gUnknown_83BF554:: @ 83BF554
-	.incbin "baserom.gba", 0x3BF554, 0x8
-
-gUnknown_83BF55C:: @ 83BF55C
-	.incbin "baserom.gba", 0x3BF55C, 0x18
-
-gUnknown_83BF574:: @ 83BF574
-	.incbin "baserom.gba", 0x3BF574, 0x18
-
-gUnknown_83BF58C:: @ 83BF58C
-	.incbin "baserom.gba", 0x3BF58C, 0x1C
-
-gUnknown_83BF5A8:: @ 83BF5A8
-	.incbin "baserom.gba", 0x3BF5A8, 0x55C
-
-gUnknown_83BFB04:: @ 83BFB04
-	.incbin "baserom.gba", 0x3BFB04, 0x18
-
-gUnknown_83BFB1C:: @ 83BFB1C
-	.incbin "baserom.gba", 0x3BFB1C, 0x20
-
-gUnknown_83BFB3C:: @ 83BFB3C
-	.incbin "baserom.gba", 0x3BFB3C, 0x20
-
-gUnknown_83BFB5C:: @ 83BFB5C
-	.incbin "baserom.gba", 0x3BFB5C, 0x18
-
-gUnknown_83BFB74:: @ 83BFB74
-	.incbin "baserom.gba", 0x3BFB74, 0x10
-
-gUnknown_83BFB84:: @ 83BFB84
-	.incbin "baserom.gba", 0x3BFB84, 0x18
-
-gUnknown_83BFB9C:: @ 83BFB9C
-	.incbin "baserom.gba", 0x3BFB9C, 0x20
-
-gUnknown_83BFBBC:: @ 83BFBBC
-	.incbin "baserom.gba", 0x3BFBBC, 0x18
-
-gUnknown_83BFBD4:: @ 83BFBD4
-	.incbin "baserom.gba", 0x3BFBD4, 0x2FE8
-
-gUnknown_83C2BBC:: @ 83C2BBC
-	.incbin "baserom.gba", 0x3C2BBC, 0x4
-
-gUnknown_83C2BC0:: @ 83C2BC0
-	.incbin "baserom.gba", 0x3C2BC0, 0xF0
-
-gUnknown_83C2CB0:: @ 83C2CB0
-	.incbin "baserom.gba", 0x3C2CB0, 0x10
-
-gUnknown_83C2CC0:: @ 83C2CC0
-	.incbin "baserom.gba", 0x3C2CC0, 0x20
-
-gUnknown_83C2CE0:: @ 83C2CE0
-	.incbin "baserom.gba", 0x3C2CE0, 0x20
-
-gUnknown_83C2D00:: @ 83C2D00
-	.incbin "baserom.gba", 0x3C2D00, 0x20
-
-gUnknown_83C2D20:: @ 83C2D20
-	.incbin "baserom.gba", 0x3C2D20, 0x820
-
-gUnknown_83C3540:: @ 83C3540
-	.incbin "baserom.gba", 0x3C3540, 0x3080
-
-gUnknown_83C65C0:: @ 83C65C0
-	.incbin "baserom.gba", 0x3C65C0, 0x4
-
-gUnknown_83C65C4:: @ 83C65C4
-	.incbin "baserom.gba", 0x3C65C4, 0x4
-
-gUnknown_83C65C8:: @ 83C65C8
-	.incbin "baserom.gba", 0x3C65C8, 0xC
-
-gUnknown_83C65D4:: @ 83C65D4
-	.incbin "baserom.gba", 0x3C65D4, 0x1C
-
-gUnknown_83C65F0:: @ 83C65F0
-	.incbin "baserom.gba", 0x3C65F0, 0x18
-
-gUnknown_83C6608:: @ 83C6608
-	.incbin "baserom.gba", 0x3C6608, 0x9C
-
-gUnknown_83C66A4:: @ 83C66A4
-	.incbin "baserom.gba", 0x3C66A4, 0x18
-
-gUnknown_83C66BC:: @ 83C66BC
-	.incbin "baserom.gba", 0x3C66BC, 0x8
-
-gUnknown_83C66C4:: @ 83C66C4
-	.incbin "baserom.gba", 0x3C66C4, 0x8
-
-gUnknown_83C66CC:: @ 83C66CC
-	.incbin "baserom.gba", 0x3C66CC, 0x38
-
-gUnknown_83C6704:: @ 83C6704
-	.incbin "baserom.gba", 0x3C6704, 0x8C
-
-gUnknown_83C6790:: @ 83C6790
-	.incbin "baserom.gba", 0x3C6790, 0x18
-
-gUnknown_83C67A8:: @ 83C67A8
-	.incbin "baserom.gba", 0x3C67A8, 0x8
-
-gUnknown_83C67B0:: @ 83C67B0
-	.incbin "baserom.gba", 0x3C67B0, 0x20
-
-gUnknown_83C67D0:: @ 83C67D0
-	.incbin "baserom.gba", 0x3C67D0, 0x18
-
-gUnknown_83C67E8:: @ 83C67E8
-	.incbin "baserom.gba", 0x3C67E8, 0x1C
-
-gUnknown_83C6804:: @ 83C6804
-	.incbin "baserom.gba", 0x3C6804, 0x38
-
-gUnknown_83C683C:: @ 83C683C
-	.incbin "baserom.gba", 0x3C683C, 0x18
-
-gUnknown_83C6854:: @ 83C6854
-	.incbin "baserom.gba", 0x3C6854, 0x8
-
-gUnknown_83C685C:: @ 83C685C
-	.incbin "baserom.gba", 0x3C685C, 0xC
-
-gUnknown_83C6868:: @ 83C6868
-	.incbin "baserom.gba", 0x3C6868, 0x8
-
-gUnknown_83C6870:: @ 83C6870
-	.incbin "baserom.gba", 0x3C6870, 0x8
-
-gUnknown_83C6878:: @ 83C6878
-	.incbin "baserom.gba", 0x3C6878, 0x44
-
-gUnknown_83C68BC:: @ 83C68BC
-	.incbin "baserom.gba", 0x3C68BC, 0x18
-
-gUnknown_83C68D4:: @ 83C68D4
-	.incbin "baserom.gba", 0x3C68D4, 0xC
 
 gUnknown_83C68E0:: @ 83C68E0
 	.incbin "baserom.gba", 0x3C68E0, 0x4
@@ -1483,38 +542,9 @@ gUnknown_83D414C:: @ 83D414C
 	.incbin "baserom.gba", 0x3D414C, 0x18
 
 gUnknown_83D4164:: @ 83D4164
-	.incbin "baserom.gba", 0x3D4164, 0x80
-
-gUnknown_83D41E4:: @ 83D41E4
-	.incbin "baserom.gba", 0x3D41E4, 0x8
-
-gUnknown_83D41EC:: @ 83D41EC
-	.incbin "baserom.gba", 0x3D41EC, 0x8
-
-gUnknown_83D41F4:: @ 83D41F4
-	.incbin "baserom.gba", 0x3D41F4, 0x8
-
-gUnknown_83D41FC:: @ 83D41FC
-	.incbin "baserom.gba", 0x3D41FC, 0x44
-
-gUnknown_83D4240:: @ 83D4240
-	.incbin "baserom.gba", 0x3D4240, 0x8
-
-gUnknown_83D4248:: @ 83D4248
-	.incbin "baserom.gba", 0x3D4248, 0x8
-
-gUnknown_83D4250:: @ 83D4250
-	.incbin "baserom.gba", 0x3D4250, 0x2C
-
-gUnknown_83D427C:: @ 83D427C
-	.incbin "baserom.gba", 0x3D427C, 0x18
-
-gUnknown_83D4294:: @ 83D4294
-	.incbin "baserom.gba", 0x3D4294, 0x6D94
-
-gUnknown_83DB028:: @ 83DB028
-	.incbin "baserom.gba", 0x3DB028, 0x4074
+	.incbin "baserom.gba", 0x3D4164, 0x8
 
+	.section .rodata.83DF09C
 gUnknown_83DF09C:: @ 83DF09C
 	.incbin "baserom.gba", 0x3DF09C, 0x18
 
@@ -1546,12 +576,9 @@ gUnknown_83DF0F2:: @ 83DF0F2
 	.incbin "baserom.gba", 0x3DF0F2, 0x6
 
 gUnknown_83DF0F8:: @ 83DF0F8
-	.incbin "baserom.gba", 0x3DF0F8, 0x6D4
+	.incbin "baserom.gba", 0x3DF0F8, 0x6F0
 
-gUnknown_83DF7CC:: @ 83DF7CC
-	.incbin "baserom.gba", 0x3DF7CC, 0x1C
-
-gUnknown_83DF7E8:: @ 83DF7E8
+sBerries:: @ 83DF7E8
 	.incbin "baserom.gba", 0x3DF7E8, 0x4B4
 
 gUnknown_83DFC9C:: @ 83DFC9C
@@ -1560,7 +587,7 @@ gUnknown_83DFC9C:: @ 83DFC9C
 gUnknown_83E04B0:: @ 83E04B0
 	.incbin "baserom.gba", 0x3E04B0, 0x208
 
-gUnknown_83E06B8:: @ 83E06B8
+gStdStringPtrs:: @ 83E06B8
 	.incbin "baserom.gba", 0x3E06B8, 0x74
 
 gUnknown_83E072C:: @ 83E072C
@@ -1747,7 +774,13 @@ gUnknown_83E27AC:: @ 83E27AC
 	.incbin "baserom.gba", 0x3E27AC, 0x1A8
 
 gUnknown_83E2954:: @ 83E2954
-	.incbin "baserom.gba", 0x3E2954, 0x134
+	.4byte sub_8124C8C
+	.4byte CB2_ReturnToField
+	.4byte NULL
+	.4byte NULL
+
+gUnknown_83E2964:: @ 83E2964
+	.incbin "baserom.gba", 0x3E2964, 0x124
 
 gUnknown_83E2A88:: @ 83E2A88
 	.incbin "baserom.gba", 0x3E2A88, 0x4F0
@@ -1990,19 +1023,9 @@ gUnknown_83EEAC4:: @ 83EEAC4
 	.incbin "baserom.gba", 0x3EEAC4, 0xA4
 
 gUnknown_83EEB68:: @ 83EEB68
-	.incbin "baserom.gba", 0x3EEB68, 0x88
-
-gUnknown_83EEBF0:: @ 83EEBF0
-	.incbin "baserom.gba", 0x3EEBF0, 0x8
-
-gUnknown_83EEBF8:: @ 83EEBF8
-	.incbin "baserom.gba", 0x3EEBF8, 0xA0
-
-gUnknown_83EEC98:: @ 83EEC98
-	.incbin "baserom.gba", 0x3EEC98, 0x50
+	.incbin "baserom.gba", 0x3EEB68, 0x90
 
-gUnknown_83EECE8:: @ 83EECE8
-	.incbin "baserom.gba", 0x3EECE8, 0x14
+	.section .rodata.83EEC98
 
 	.include "data/text/map_section_names.inc"
 
diff --git a/data/data_83F5738.s b/data/data_83F5738.s
index e6f026d0e..c14edc5c8 100644
--- a/data/data_83F5738.s
+++ b/data/data_83F5738.s
@@ -55,7 +55,7 @@ gUnknown_83F5BCC:: @ 83F5BCC
 gUnknown_83F5D1C:: @ 83F5D1C
 	.incbin "baserom.gba", 0x3F5D1C, 0x10
 
-gUnknown_83F5D2C:: @ 83F5D2C
+sStarterMon:: @ 83F5D2C
 	.incbin "baserom.gba", 0x3F5D2C, 0x6
 
 gUnknown_83F5D32:: @ 83F5D32
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index 9c39a96d2..1a1ab6d0a 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -1,3 +1,5 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
 
 	.align 2
@@ -517,1777 +519,10 @@ gUnknown_8415A08:: @ 8415A08
 gUnknown_8415A10:: @ 8415A10
 	.incbin "baserom.gba", 0x415A10, 0x10
 
-gExpandedPlaceholder_Empty:: @ 8415A20
-	.incbin "baserom.gba", 0x415A20, 0x1
-
-gExpandedPlaceholder_Kun:: @ 8415A21
-	.incbin "baserom.gba", 0x415A21, 0x1
-
-gExpandedPlaceholder_Chan:: @ 8415A22
-	.incbin "baserom.gba", 0x415A22, 0xA
-
-gExpandedPlaceholder_Ruby:: @ 8415A2C
-	.incbin "baserom.gba", 0x415A2C, 0x5
-
-gExpandedPlaceholder_Aqua:: @ 8415A31
-	.incbin "baserom.gba", 0x415A31, 0x5
-
-gExpandedPlaceholder_Magma:: @ 8415A36
-	.incbin "baserom.gba", 0x415A36, 0x6
-
-gExpandedPlaceholder_Archie:: @ 8415A3C
-	.incbin "baserom.gba", 0x415A3C, 0x7
-
-gExpandedPlaceholder_Maxie:: @ 8415A43
-	.incbin "baserom.gba", 0x415A43, 0x6
-
-gExpandedPlaceholder_Kyogre:: @ 8415A49
-	.incbin "baserom.gba", 0x415A49, 0x7
-
-gExpandedPlaceholder_Groudon:: @ 8415A50
-	.incbin "baserom.gba", 0x415A50, 0x8
-
-gExpandedPlaceholder_Red:: @ 8415A58
-	.incbin "baserom.gba", 0x415A58, 0x4
-
-gExpandedPlaceholder_Green:: @ 8415A5C
-	.incbin "baserom.gba", 0x415A5C, 0x6
-
-gText_EggNickname:: @ 8415A62
-	.incbin "baserom.gba", 0x415A62, 0x4
-
-gText_Pokemon:: @ 8415A66
-	.incbin "baserom.gba", 0x415A66, 0x8
-
-gUnknown_8415A6E:: @ 8415A6E
-	.incbin "baserom.gba", 0x415A6E, 0x9
-
-gUnknown_8415A77:: @ 8415A77
-	.incbin "baserom.gba", 0x415A77, 0x20
-
-gUnknown_8415A97:: @ 8415A97
-	.incbin "baserom.gba", 0x415A97, 0xD
-
-gUnknown_8415AA4:: @ 8415AA4
-	.incbin "baserom.gba", 0x415AA4, 0x27
-
-gUnknown_8415ACB:: @ 8415ACB
-	.incbin "baserom.gba", 0x415ACB, 0x134
-
-gUnknown_8415BFF:: @ 8415BFF
-	.incbin "baserom.gba", 0x415BFF, 0x43
-
-gUnknown_8415C42:: @ 8415C42
-	.incbin "baserom.gba", 0x415C42, 0x22
-
-gUnknown_8415C64:: @ 8415C64
-	.incbin "baserom.gba", 0x415C64, 0x84
-
-gUnknown_8415CE8:: @ 8415CE8
-	.incbin "baserom.gba", 0x415CE8, 0x44
-
-gUnknown_8415D2C:: @ 8415D2C
-	.incbin "baserom.gba", 0x415D2C, 0x1C
-
-gUnknown_8415D48:: @ 8415D48
-	.incbin "baserom.gba", 0x415D48, 0x8
-
-gUnknown_8415D50:: @ 8415D50
-	.incbin "baserom.gba", 0x415D50, 0x10
-
-gUnknown_8415D60:: @ 8415D60
-	.incbin "baserom.gba", 0x415D60, 0x18
-
-gUnknown_8415D78:: @ 8415D78
-	.incbin "baserom.gba", 0x415D78, 0x14
-
-gUnknown_8415D8C:: @ 8415D8C
-	.incbin "baserom.gba", 0x415D8C, 0x7
-
-gUnknown_8415D93:: @ 8415D93
-	.incbin "baserom.gba", 0x415D93, 0x4
-
-gUnknown_8415D97:: @ 8415D97
-	.incbin "baserom.gba", 0x415D97, 0x5
-
-gUnknown_8415D9C:: @ 8415D9C
-	.incbin "baserom.gba", 0x415D9C, 0x1C
-
-gUnknown_8415DB8:: @ 8415DB8
-	.incbin "baserom.gba", 0x415DB8, 0xC
-
-gUnknown_8415DC4:: @ 8415DC4
-	.incbin "baserom.gba", 0x415DC4, 0x6
-
-gUnknown_8415DCA:: @ 8415DCA
-	.incbin "baserom.gba", 0x415DCA, 0x7
-
-gUnknown_8415DD1:: @ 8415DD1
-	.incbin "baserom.gba", 0x415DD1, 0x6
-
-gUnknown_8415DD7:: @ 8415DD7
-	.incbin "baserom.gba", 0x415DD7, 0x166
-
-gUnknown_8415F3D:: @ 8415F3D
-	.incbin "baserom.gba", 0x415F3D, 0xD
-
-gUnknown_8415F4A:: @ 8415F4A
-	.incbin "baserom.gba", 0x415F4A, 0x7
-
-gUnknown_8415F51:: @ 8415F51
-	.incbin "baserom.gba", 0x415F51, 0x15
-
-gUnknown_8415F66:: @ 8415F66
-	.incbin "baserom.gba", 0x415F66, 0x6
-
-gUnknown_8415F6C:: @ 8415F6C
-	.incbin "baserom.gba", 0x415F6C, 0x23
-
-gUnknown_8415F8F:: @ 8415F8F
-	.incbin "baserom.gba", 0x415F8F, 0x9
-
-gUnknown_8415F98:: @ 8415F98
-	.incbin "baserom.gba", 0x415F98, 0x3
-
-gUnknown_8415F9B:: @ 8415F9B
-	.incbin "baserom.gba", 0x415F9B, 0x5
-
-gUnknown_8415FA0:: @ 8415FA0
-	.incbin "baserom.gba", 0x415FA0, 0xD
-
-gUnknown_8415FAD:: @ 8415FAD
-	.incbin "baserom.gba", 0x415FAD, 0x6
-
-gUnknown_8415FB3:: @ 8415FB3
-	.incbin "baserom.gba", 0x415FB3, 0x15
-
-gUnknown_8415FC8:: @ 8415FC8
-	.incbin "baserom.gba", 0x415FC8, 0x7
-
-gUnknown_8415FCF:: @ 8415FCF
-	.incbin "baserom.gba", 0x415FCF, 0x19
-
-gUnknown_8415FE8:: @ 8415FE8
-	.incbin "baserom.gba", 0x415FE8, 0x5
-
-gUnknown_8415FED:: @ 8415FED
-	.incbin "baserom.gba", 0x415FED, 0x5
-
-gUnknown_8415FF2:: @ 8415FF2
-	.incbin "baserom.gba", 0x415FF2, 0xD
-
-gUnknown_8415FFF:: @ 8415FFF
-	.incbin "baserom.gba", 0x415FFF, 0x3
-
-gUnknown_8416002:: @ 8416002
-	.incbin "baserom.gba", 0x416002, 0x6
-
-gUnknown_8416008:: @ 8416008
-	.incbin "baserom.gba", 0x416008, 0x88
-
-gUnknown_8416090:: @ 8416090
-	.incbin "baserom.gba", 0x416090, 0x24
-
-gUnknown_84160B4:: @ 84160B4
-	.incbin "baserom.gba", 0x4160B4, 0x14
-
-gUnknown_84160C8:: @ 84160C8
-	.incbin "baserom.gba", 0x4160C8, 0x24
-
-gUnknown_84160EC:: @ 84160EC
-	.incbin "baserom.gba", 0x4160EC, 0x8
-
-gUnknown_84160F4:: @ 84160F4
-	.incbin "baserom.gba", 0x4160F4, 0x8
-
-gUnknown_84160FC:: @ 84160FC
-	.incbin "baserom.gba", 0x4160FC, 0x8
-
-gUnknown_8416104:: @ 8416104
-	.incbin "baserom.gba", 0x416104, 0x47
-
-gUnknown_841614B:: @ 841614B
-	.incbin "baserom.gba", 0x41614B, 0x2F
-
-gUnknown_841617A:: @ 841617A
-	.incbin "baserom.gba", 0x41617A, 0x7
-
-gUnknown_8416181:: @ 8416181
-	.incbin "baserom.gba", 0x416181, 0x7
-
-gUnknown_8416188:: @ 8416188
-	.incbin "baserom.gba", 0x416188, 0x8
-
-gUnknown_8416190:: @ 8416190
-	.incbin "baserom.gba", 0x416190, 0x31
-
-gFameCheckerText_Cancel:: @ 84161C1
-	.string "CANCEL$"
-
-gUnknown_84161C8:: @ 84161C8
-	.incbin "baserom.gba", 0x4161C8, 0x5
-
-gUnknown_84161CD:: @ 84161CD
-	.incbin "baserom.gba", 0x4161CD, 0x22
-
-gUnknown_84161EF:: @ 84161EF
-	.incbin "baserom.gba", 0x4161EF, 0x13
-
-gUnknown_8416202:: @ 8416202
-	.incbin "baserom.gba", 0x416202, 0xA
-
-gUnknown_841620C:: @ 841620C
-	.incbin "baserom.gba", 0x41620C, 0x2
-
-gUnknown_841620E:: @ 841620E
-	.incbin "baserom.gba", 0x41620E, 0x2
-
-gUnknown_8416210:: @ 8416210
-	.incbin "baserom.gba", 0x416210, 0x3
-
-gUnknown_8416213:: @ 8416213
-	.incbin "baserom.gba", 0x416213, 0x4
-
-gUnknown_8416217:: @ 8416217
-	.incbin "baserom.gba", 0x416217, 0x8
-
-gUnknown_841621F:: @ 841621F
-	.incbin "baserom.gba", 0x41621F, 0x2
-
-gUnknown_8416221:: @ 8416221
-	.incbin "baserom.gba", 0x416221, 0x2
-
-gUnknown_8416223:: @ 8416223
-	.incbin "baserom.gba", 0x416223, 0x3
-
-gUnknown_8416226:: @ 8416226
-	.incbin "baserom.gba", 0x416226, 0x12
-
-gUnknown_8416238:: @ 8416238
-	.incbin "baserom.gba", 0x416238, 0x3
-
-gFameCheckerText_ListMenuCursor:: @ 841623B
-	.string "▶$"
-
-gUnknown_841623D:: @ 841623D
-	.incbin "baserom.gba", 0x41623D, 0x25
-
-gUnknown_8416262:: @ 8416262
-	.incbin "baserom.gba", 0x416262, 0x23
-
-gUnknown_8416285:: @ 8416285
-	.incbin "baserom.gba", 0x416285, 0x24
-
-gUnknown_84162A9:: @ 84162A9
-	.incbin "baserom.gba", 0x4162A9, 0x10
-
-gUnknown_84162B9:: @ 84162B9
-	.incbin "baserom.gba", 0x4162B9, 0x4
-
-gUnknown_84162BD:: @ 84162BD
-	.incbin "baserom.gba", 0x4162BD, 0x7
-
-gText_Coins:: @ 84162C4
-	.incbin "baserom.gba", 0x4162C4, 0x24
-
-gUnknown_84162E8:: @ 84162E8
-	.incbin "baserom.gba", 0x4162E8, 0xD
-
-gUnknown_84162F5:: @ 84162F5
-	.incbin "baserom.gba", 0x4162F5, 0xA
-
-gUnknown_84162FF:: @ 84162FF
-	.incbin "baserom.gba", 0x4162FF, 0x2
-
-gUnknown_8416301:: @ 8416301
-	.incbin "baserom.gba", 0x416301, 0xE
-
-gUnknown_841630F:: @ 841630F
-	.incbin "baserom.gba", 0x41630F, 0x1B
-
-gUnknown_841632A:: @ 841632A
-	.incbin "baserom.gba", 0x41632A, 0x15
-
-gUnknown_841633F:: @ 841633F
-	.incbin "baserom.gba", 0x41633F, 0x1F
-
-gUnknown_841635E:: @ 841635E
-	.incbin "baserom.gba", 0x41635E, 0x16
-
-gUnknown_8416374:: @ 8416374
-	.incbin "baserom.gba", 0x416374, 0x1B
-
-gUnknown_841638F:: @ 841638F
-	.incbin "baserom.gba", 0x41638F, 0x18
-
-gUnknown_84163A7:: @ 84163A7
-	.incbin "baserom.gba", 0x4163A7, 0x14
-
-gUnknown_84163BB:: @ 84163BB
-	.incbin "baserom.gba", 0x4163BB, 0x20
-
-gUnknown_84163DB:: @ 84163DB
-	.incbin "baserom.gba", 0x4163DB, 0x19
-
-gUnknown_84163F4:: @ 84163F4
-	.incbin "baserom.gba", 0x4163F4, 0x15
-
-gUnknown_8416409:: @ 8416409
-	.incbin "baserom.gba", 0x416409, 0x1C
-
-gUnknown_8416425:: @ 8416425
-	.incbin "baserom.gba", 0x416425, 0x2C
-
-gUnknown_8416451:: @ 8416451
-	.incbin "baserom.gba", 0x416451, 0x25
-
-gUnknown_8416476:: @ 8416476
-	.incbin "baserom.gba", 0x416476, 0x48
-
-gUnknown_84164BE:: @ 84164BE
-	.incbin "baserom.gba", 0x4164BE, 0x55
-
-gUnknown_8416513:: @ 8416513
-	.incbin "baserom.gba", 0x416513, 0x24
-
-gUnknown_8416537:: @ 8416537
-	.incbin "baserom.gba", 0x416537, 0x55
-
-gUnknown_841658C:: @ 841658C
-	.incbin "baserom.gba", 0x41658C, 0x12
-
-gUnknown_841659E:: @ 841659E
-	.incbin "baserom.gba", 0x41659E, 0x34
-
-gUnknown_84165D2:: @ 84165D2
-	.incbin "baserom.gba", 0x4165D2, 0x2E
-
-gUnknown_8416600:: @ 8416600
-	.incbin "baserom.gba", 0x416600, 0x31
-
-gUnknown_8416631:: @ 8416631
-	.incbin "baserom.gba", 0x416631, 0x13
-
-gUnknown_8416644:: @ 8416644
-	.incbin "baserom.gba", 0x416644, 0x11
-
-gUnknown_8416655:: @ 8416655
-	.incbin "baserom.gba", 0x416655, 0x7
-
-gUnknown_841665C:: @ 841665C
-	.incbin "baserom.gba", 0x41665C, 0x34
-
-gUnknown_8416690:: @ 8416690
-	.incbin "baserom.gba", 0x416690, 0x17
-
-gUnknown_84166A7:: @ 84166A7
-	.incbin "baserom.gba", 0x4166A7, 0x2C
-
-gUnknown_84166D3:: @ 84166D3
-	.incbin "baserom.gba", 0x4166D3, 0x8
-
-gUnknown_84166DB:: @ 84166DB
-	.incbin "baserom.gba", 0x4166DB, 0x6
-
-gUnknown_84166E1:: @ 84166E1
-	.incbin "baserom.gba", 0x4166E1, 0x1E
-
-gUnknown_84166FF:: @ 84166FF
-	.incbin "baserom.gba", 0x4166FF, 0x4
-
-gUnknown_8416703:: @ 8416703
-	.incbin "baserom.gba", 0x416703, 0x7
-
-gUnknown_841670A:: @ 841670A
-	.incbin "baserom.gba", 0x41670A, 0xC
-
-gUnknown_8416716:: @ 8416716
-	.incbin "baserom.gba", 0x416716, 0x33
-
-gUnknown_8416749:: @ 8416749
-	.incbin "baserom.gba", 0x416749, 0xE
-
-gUnknown_8416757:: @ 8416757
-	.incbin "baserom.gba", 0x416757, 0xF
-
-gUnknown_8416766:: @ 8416766
-	.incbin "baserom.gba", 0x416766, 0x28
-
-gUnknown_841678E:: @ 841678E
-	.incbin "baserom.gba", 0x41678E, 0x59
-
-gUnknown_84167E7:: @ 84167E7
-	.incbin "baserom.gba", 0x4167E7, 0x5B
-
-gUnknown_8416842:: @ 8416842
-	.incbin "baserom.gba", 0x416842, 0x1F
-
-gUnknown_8416861:: @ 8416861
-	.incbin "baserom.gba", 0x416861, 0x3D
-
-gUnknown_841689E:: @ 841689E
-	.incbin "baserom.gba", 0x41689E, 0x53
-
-gUnknown_84168F1:: @ 84168F1
-	.incbin "baserom.gba", 0x4168F1, 0x20
-
-gUnknown_8416911:: @ 8416911
-	.incbin "baserom.gba", 0x416911, 0x25
-
-gUnknown_8416936:: @ 8416936
-	.incbin "baserom.gba", 0x416936, 0x23
-
-gUnknown_8416959:: @ 8416959
-	.incbin "baserom.gba", 0x416959, 0x21
-
-gText_PokedollarVar1:: @ 841697A
-	.incbin "baserom.gba", 0x41697A, 0x48
-
-gUnknown_84169C2:: @ 84169C2
-	.incbin "baserom.gba", 0x4169C2, 0x3
-
-gUnknown_84169C5:: @ 84169C5
-	.incbin "baserom.gba", 0x4169C5, 0x8
-
-gUnknown_84169CD:: @ 84169CD
-	.incbin "baserom.gba", 0x4169CD, 0x8
-
-gUnknown_84169D5:: @ 84169D5
-	.incbin "baserom.gba", 0x4169D5, 0x4
-
-gUnknown_84169D9:: @ 84169D9
-	.incbin "baserom.gba", 0x4169D9, 0x3
-
-gUnknown_84169DC:: @ 84169DC
-	.incbin "baserom.gba", 0x4169DC, 0x1C
-
-gUnknown_84169F8:: @ 84169F8
-	.incbin "baserom.gba", 0x4169F8, 0x26
-
-gUnknown_8416A1E:: @ 8416A1E
-	.incbin "baserom.gba", 0x416A1E, 0x1C
-
-gUnknown_8416A3A:: @ 8416A3A
-	.incbin "baserom.gba", 0x416A3A, 0x1B
-
-gUnknown_8416A55:: @ 8416A55
-	.incbin "baserom.gba", 0x416A55, 0x20
-
-gUnknown_8416A75:: @ 8416A75
-	.incbin "baserom.gba", 0x416A75, 0x23
-
-gUnknown_8416A98:: @ 8416A98
-	.incbin "baserom.gba", 0x416A98, 0x33
-
-gUnknown_8416ACB:: @ 8416ACB
-	.incbin "baserom.gba", 0x416ACB, 0x17
-
-gUnknown_8416AE2:: @ 8416AE2
-	.incbin "baserom.gba", 0x416AE2, 0x34
-
-gUnknown_8416B16:: @ 8416B16
-	.incbin "baserom.gba", 0x416B16, 0x28
-
-gUnknown_8416B3E:: @ 8416B3E
-	.incbin "baserom.gba", 0x416B3E, 0x26
-
-gUnknown_8416B64:: @ 8416B64
-	.incbin "baserom.gba", 0x416B64, 0x22
-
-gUnknown_8416B86:: @ 8416B86
-	.incbin "baserom.gba", 0x416B86, 0x20
-
-gUnknown_8416BA6:: @ 8416BA6
-	.incbin "baserom.gba", 0x416BA6, 0x1D
-
-gUnknown_8416BC3:: @ 8416BC3
-	.incbin "baserom.gba", 0x416BC3, 0x38
-
-gUnknown_8416BFB:: @ 8416BFB
-	.incbin "baserom.gba", 0x416BFB, 0x2F
-
-gUnknown_8416C2A:: @ 8416C2A
-	.incbin "baserom.gba", 0x416C2A, 0x1F
-
-gUnknown_8416C49:: @ 8416C49
-	.incbin "baserom.gba", 0x416C49, 0x46
-
-gUnknown_8416C8F:: @ 8416C8F
-	.incbin "baserom.gba", 0x416C8F, 0x1D
-
-gUnknown_8416CAC:: @ 8416CAC
-	.incbin "baserom.gba", 0x416CAC, 0x1B
-
-gUnknown_8416CC7:: @ 8416CC7
-	.incbin "baserom.gba", 0x416CC7, 0x23
-
-gUnknown_8416CEA:: @ 8416CEA
-	.incbin "baserom.gba", 0x416CEA, 0x2D
-
-gUnknown_8416D17:: @ 8416D17
-	.incbin "baserom.gba", 0x416D17, 0x38
-
-gUnknown_8416D4F:: @ 8416D4F
-	.incbin "baserom.gba", 0x416D4F, 0x29
-
-gUnknown_8416D78:: @ 8416D78
-	.incbin "baserom.gba", 0x416D78, 0x3B
-
-gUnknown_8416DB3:: @ 8416DB3
-	.incbin "baserom.gba", 0x416DB3, 0xF
-
-gUnknown_8416DC2:: @ 8416DC2
-	.incbin "baserom.gba", 0x416DC2, 0x35
-
-gUnknown_8416DF7:: @ 8416DF7
-	.incbin "baserom.gba", 0x416DF7, 0x74
-
-gUnknown_8416E6B:: @ 8416E6B
-	.incbin "baserom.gba", 0x416E6B, 0x19
-
-gUnknown_8416E84:: @ 8416E84
-	.incbin "baserom.gba", 0x416E84, 0x20
-
-gUnknown_8416EA4:: @ 8416EA4
-	.incbin "baserom.gba", 0x416EA4, 0x22
-
-gUnknown_8416EC6:: @ 8416EC6
-	.incbin "baserom.gba", 0x416EC6, 0x4A
-
-gUnknown_8416F10:: @ 8416F10
-	.incbin "baserom.gba", 0x416F10, 0x17
-
-gUnknown_8416F27:: @ 8416F27
-	.incbin "baserom.gba", 0x416F27, 0x27
-
-gUnknown_8416F4E:: @ 8416F4E
-	.incbin "baserom.gba", 0x416F4E, 0x21
-
-gUnknown_8416F6F:: @ 8416F6F
-	.incbin "baserom.gba", 0x416F6F, 0x1D
-
-gUnknown_8416F8C:: @ 8416F8C
-	.incbin "baserom.gba", 0x416F8C, 0xE
-
-gUnknown_8416F9A:: @ 8416F9A
-	.incbin "baserom.gba", 0x416F9A, 0x18
-
-gUnknown_8416FB2:: @ 8416FB2
-	.incbin "baserom.gba", 0x416FB2, 0x15
-
-gUnknown_8416FC7:: @ 8416FC7
-	.incbin "baserom.gba", 0x416FC7, 0x26
-
-gUnknown_8416FED:: @ 8416FED
-	.incbin "baserom.gba", 0x416FED, 0x15
-
-gUnknown_8417002:: @ 8417002
-	.incbin "baserom.gba", 0x417002, 0x15
-
-gUnknown_8417017:: @ 8417017
-	.incbin "baserom.gba", 0x417017, 0x1B
-
-gUnknown_8417032:: @ 8417032
-	.incbin "baserom.gba", 0x417032, 0x20
-
-gUnknown_8417052:: @ 8417052
-	.incbin "baserom.gba", 0x417052, 0x23
-
-gUnknown_8417075:: @ 8417075
-	.incbin "baserom.gba", 0x417075, 0x47
-
-gUnknown_84170BC:: @ 84170BC
-	.incbin "baserom.gba", 0x4170BC, 0x24
-
-gUnknown_84170E0:: @ 84170E0
-	.incbin "baserom.gba", 0x4170E0, 0x377
-
-gUnknown_8417457:: @ 8417457
-	.incbin "baserom.gba", 0x417457, 0x3D
-
-gUnknown_8417494:: @ 8417494
-	.incbin "baserom.gba", 0x417494, 0x181
-
-gUnknown_8417615:: @ 8417615
-	.incbin "baserom.gba", 0x417615, 0x2B
-
-gUnknown_8417640:: @ 8417640
-	.incbin "baserom.gba", 0x417640, 0x34
-
-gUnknown_8417674:: @ 8417674
-	.incbin "baserom.gba", 0x417674, 0x7
-
-gUnknown_841767B:: @ 841767B
-	.incbin "baserom.gba", 0x41767B, 0x12
-
-gUnknown_841768D:: @ 841768D
-	.incbin "baserom.gba", 0x41768D, 0x9
-
-gUnknown_8417696:: @ 8417696
-	.incbin "baserom.gba", 0x417696, 0x22
-
-gUnknown_84176B8:: @ 84176B8
-	.incbin "baserom.gba", 0x4176B8, 0x17
-
-gUnknown_84176CF:: @ 84176CF
-	.incbin "baserom.gba", 0x4176CF, 0x2F
-
-gUnknown_84176FE:: @ 84176FE
-	.incbin "baserom.gba", 0x4176FE, 0x76
-
-gUnknown_8417774:: @ 8417774
-	.incbin "baserom.gba", 0x417774, 0x16
-
-gUnknown_841778A:: @ 841778A
-	.incbin "baserom.gba", 0x41778A, 0x22
-
-gUnknown_84177AC:: @ 84177AC
-	.incbin "baserom.gba", 0x4177AC, 0x19
-
-gUnknown_84177C5:: @ 84177C5
-	.incbin "baserom.gba", 0x4177C5, 0x29
-
-gUnknown_84177EE:: @ 84177EE
-	.incbin "baserom.gba", 0x4177EE, 0x18
-
-gUnknown_8417806:: @ 8417806
-	.incbin "baserom.gba", 0x417806, 0x2A
-
-gUnknown_8417830:: @ 8417830
-	.incbin "baserom.gba", 0x417830, 0x28
-
-gUnknown_8417858:: @ 8417858
-	.incbin "baserom.gba", 0x417858, 0x13
-
-gUnknown_841786B:: @ 841786B
-	.incbin "baserom.gba", 0x41786B, 0x3C
-
-gUnknown_84178A7:: @ 84178A7
-	.incbin "baserom.gba", 0x4178A7, 0x17
-
-gUnknown_84178BE:: @ 84178BE
-	.incbin "baserom.gba", 0x4178BE, 0x12
-
-gUnknown_84178D0:: @ 84178D0
-	.incbin "baserom.gba", 0x4178D0, 0xA
-
-gUnknown_84178DA:: @ 84178DA
-	.incbin "baserom.gba", 0x4178DA, 0x5E
-
-gUnknown_8417938:: @ 8417938
-	.incbin "baserom.gba", 0x417938, 0x4
-
-gUnknown_841793C:: @ 841793C
-	.incbin "baserom.gba", 0x41793C, 0x263
-
-gUnknown_8417B9F:: @ 8417B9F
-	.incbin "baserom.gba", 0x417B9F, 0xD
-
-gUnknown_8417BAC:: @ 8417BAC
-	.incbin "baserom.gba", 0x417BAC, 0xA
-
-gUnknown_8417BB6:: @ 8417BB6
-	.incbin "baserom.gba", 0x417BB6, 0x8
-
-gUnknown_8417BBE:: @ 8417BBE
-	.incbin "baserom.gba", 0x417BBE, 0xD
-
-gUnknown_8417BCB:: @ 8417BCB
-	.incbin "baserom.gba", 0x417BCB, 0x8
-
-gUnknown_8417BD3:: @ 8417BD3
-	.incbin "baserom.gba", 0x417BD3, 0x5A
-
-gUnknown_8417C2D:: @ 8417C2D
-	.incbin "baserom.gba", 0x417C2D, 0x1C0
-
-gUnknown_8417DED:: @ 8417DED
-	.incbin "baserom.gba", 0x417DED, 0x1CC
-
-gUnknown_8417FB9:: @ 8417FB9
-	.incbin "baserom.gba", 0x417FB9, 0x2
-
-gUnknown_8417FBB:: @ 8417FBB
-	.incbin "baserom.gba", 0x417FBB, 0x8
-
-gUnknown_8417FC3:: @ 8417FC3
-	.incbin "baserom.gba", 0x417FC3, 0x9
-
-gUnknown_8417FCC:: @ 8417FCC
-	.incbin "baserom.gba", 0x417FCC, 0x4
-
-gUnknown_8417FD0:: @ 8417FD0
-	.incbin "baserom.gba", 0x417FD0, 0xA5
-
-gUnknown_8418075:: @ 8418075
-	.incbin "baserom.gba", 0x418075, 0xFF
-
-gUnknown_8418174:: @ 8418174
-	.incbin "baserom.gba", 0x418174, 0x14
-
-gUnknown_8418188:: @ 8418188
-	.incbin "baserom.gba", 0x418188, 0x1C
-
-gUnknown_84181A4:: @ 84181A4
-	.incbin "baserom.gba", 0x4181A4, 0x12
-
-gUnknown_84181B6:: @ 84181B6
-	.incbin "baserom.gba", 0x4181B6, 0x8
-
-gUnknown_84181BE:: @ 84181BE
-	.incbin "baserom.gba", 0x4181BE, 0x5
-
-gFameCheckerText_FameCheckerWillBeClosed:: @ 84181C3
-	.string "The FAME CHECKER will be closed.$"
-
-gFameCheckerText_ClearTextbox:: @ 84181E4
-	.string "\n                              $"
-
-gUnknown_8418204:: @ 8418204
-	.incbin "baserom.gba", 0x00418204, 0x48c
-
-gUnknown_8418690:: @ 8418690
-	.incbin "baserom.gba", 0x418690, 0x20
-
-gUnknown_84186B0:: @ 84186B0
-	.incbin "baserom.gba", 0x4186B0, 0x1D
-
-gUnknown_84186CD:: @ 84186CD
-	.incbin "baserom.gba", 0x4186CD, 0x26A
-
-gUnknown_8418937:: @ 8418937
-	.incbin "baserom.gba", 0x418937, 0x1F
-
-gUnknown_8418956:: @ 8418956
-	.incbin "baserom.gba", 0x418956, 0x8A
-
-gUnknown_84189E0:: @ 84189E0
-	.incbin "baserom.gba", 0x4189E0, 0xE
-
-gUnknown_84189EE:: @ 84189EE
-	.incbin "baserom.gba", 0x4189EE, 0x22D
-
-gUnknown_8418C1B:: @ 8418C1B
-	.string "POKéMON CENTER$"
-
-gUnknown_8418C2A:: @ 8418C2A
-	.incbin "baserom.gba", 0x418C2A, 0x59
-
-gUnknown_8418C83:: @ 8418C83
-	.incbin "baserom.gba", 0x418C83, 0x56
-
-gUnknown_8418CD9:: @ 8418CD9
-	.string "The backup memory is damaged or\n"
-	.string "the game’s battery has run dry.\n"
-	.string "The game can be played, but its\n"
-	.string "progress cannot be saved.\n"
-	.string "“Please press the A Button.”$"
-
-gUnknown_8418D70:: @ 8418D70
-	.incbin "baserom.gba", 0x418D70, 0x99
-
-gUnknown_8418E09:: @ 8418E09
-	.incbin "baserom.gba", 0x418E09, 0x6E
-
-gUnknown_8418E77:: @ 8418E77
-	.incbin "baserom.gba", 0x418E77, 0x13
-
-gUnknown_8418E8A:: @ 8418E8A
-	.incbin "baserom.gba", 0x418E8A, 0x1
-
-gUnknown_8418E8B:: @ 8418E8B
-	.incbin "baserom.gba", 0x418E8B, 0x2
-
-gUnknown_8418E8D:: @ 8418E8D
-	.incbin "baserom.gba", 0x418E8D, 0x8
-
-gUnknown_8418E95:: @ 8418E95
-	.incbin "baserom.gba", 0x418E95, 0x9
-
-gUnknown_8418E9E:: @ 8418E9E
-	.incbin "baserom.gba", 0x418E9E, 0x9
-
-gUnknown_8418EA7:: @ 8418EA7
-	.incbin "baserom.gba", 0x418EA7, 0x9
-
-gUnknown_8418EB0:: @ 8418EB0
-	.incbin "baserom.gba", 0x418EB0, 0x5
-
-gUnknown_8418EB5:: @ 8418EB5
-	.incbin "baserom.gba", 0x418EB5, 0x7
-
-gUnknown_8418EBC:: @ 8418EBC
-	.incbin "baserom.gba", 0x418EBC, 0x7
-
-gUnknown_8418EC3:: @ 8418EC3
-	.string "No data$"
-
-gUnknown_8418ECB:: @ 8418ECB
-	@ Viridian Forest
-	.string "A deep and sprawling forest that\n"
-	.string "extends around VIRIDIAN CITY.\n"
-	.string "A natural maze, many people\n"
-	.string "become lost inside.$"
-
-gUnknown_8418F3A:: @ 8418F3A
-	@ Mt. Moon
-	.string "A mystical mountain that is known\n"
-	.string "for its frequent meteor falls.\n"
-	.string "The shards of stars that fall\n"
-	.string "here are known as MOON STONES.$"
-
-gUnknown_8418FB8:: @ 8418FB8
-	@ Diglett's Cave
-	.string "A seemingly plain tunnel that was\n"
-	.string "dug by wild DIGLETT.\n"
-	.string "It is famous for connecting\n"
-	.string "ROUTES 2 and 11.$"
-
-gUnknown_841901C:: @ 841901C
-	@ Victory Road
-	.string "A tunnel situated on ROUTE 23.\n"
-	.string "It earned its name because it\n"
-	.string "must be traveled by all TRAINERS\n"
-	.string "aiming for the top.$"
-
-gUnknown_841908E:: @ 841908E
-	@ Pokémon Mansion
-	.string "A decrepit, burned-down mansion\n"
-	.string "on CINNABAR ISLAND.\n"
-	.string "It got its name because a famous\n"
-	.string "POKéMON researcher lived there.$"
-
-gUnknown_8419103:: @ 8419103
-	@ Safari Zone
-	.string "An amusement park outside FUCHSIA\n"
-	.string "CITY where many rare POKéMON can\n"
-	.string "be observed in the wild.\n"
-	.string "Catch them in a popular game!$"
-
-gUnknown_841917D:: @ 841917D
-	@ Rock Tunnel
-	.string "A naturally formed underground\n"
-	.string "tunnel. Because it has not been\n"
-	.string "developed, it is inky dark inside.\n"
-	.string "A light is needed to get through.$"
-
-gUnknown_8419201:: @ 8419201
-	@ Seafoam Islands
-	.string "A pair of islands that is situated\n"
-	.string "on ROUTE 20.\n"
-	.string "The two islands are shaped the\n"
-	.string "same, as if they were twins.$"
-
-gUnknown_841926D:: @ 841926D
-	@ Pokémon Tower
-	.string "A tower that houses the graves of\n"
-	.string "countless POKéMON.\n"
-	.string "Many people visit it daily to pay\n"
-	.string "their respects to the fallen.$"
-
-gUnknown_84192E2:: @ 84192E2
-	@ Cerulean Cave
-	.string "A mysterious cave that is filled\n"
-	.string "with terribly tough POKéMON.\n"
-	.string "It is so dangerous, the POKéMON\n"
-	.string "LEAGUE is in charge of it.$"
-
-gUnknown_841935B:: @ 841935B
-	@ Power Plant
-	.string "A power plant that was abandoned\n"
-	.string "years ago, though some of the\n"
-	.string "machines still work. It is infested\n"
-	.string "with electric POKéMON.$"
-
-gUnknown_84193D5:: @ 84193D5
-	@ Mt. Ember
-	.string "Supposedly an inactive volcano.\n"
-	.string "However, there are persistent\n"
-	.string "reports that the peak blazes\n"
-	.string "with fire at night.$"
-
-gUnknown_8419444:: @ 8419444
-	@ Berry Forest
-	.string "A forest on a small islet off the\n"
-	.string "coast of THREE ISLAND. BERRIES\n"
-	.string "grow wildly in profusion, quickly\n"
-	.string "replenishing those that fall off.$"
-
-gUnknown_84194C9:: @ 84194C9
-	@ Icefall Cave
-	.string "A cave which is covered by water\n"
-	.string "and ice on FOUR ISLAND.\n"
-	.string "It seems like the end of the cave\n"
-	.string "is connected to the ocean.$"
-
-gUnknown_841953F:: @ 841953F
-	@ Lost Cave
-	.string "A bewildering cave off the coast\n"
-	.string "of RESORT GORGEOUS.\n"
-	.string "Some curious thrill seekers have\n"
-	.string "never emerged from it.$"
-
-gUnknown_84195AC:: @ 84195AC
-	@ Tanoby Ruins
-	.string "An ancient ruin that is rumored to\n"
-	.string "be home to a peculiar POKéMON.\n"
-	.string "However, so far, the POKéMON\n"
-	.string "remains an unconfirmed rumor.$"
-
-gUnknown_8419629:: @ 8419629
-	@ Altering Cave
-	.string "This island has been known by this\n"
-	.string "name since the distant past.\n"
-	.string "No one today knows where it got\n"
-	.string "this name, however.$"
-
-gUnknown_841969D:: @ 841969D
-	@ Pattern Bush
-	.string "A lush and bush-like area. \n"
-	.string "In it are patterns where no grass\n"
-	.string "grows. Some study it in the belief\n"
-	.string "that a secret is concealed.$"
-
-gUnknown_841971A:: @ 841971A
-	@ Dotted Hole
-	.string "A mysterious, just-discovered\n"
-	.string "ruin from an ancient time.\n"
-	.string "It got its name from the six dots\n"
-	.string "on its door.$"
-
-gUnknown_8419782:: @ 8419782
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Met in a trade.$"
-
-gUnknown_841979D:: @ 841979D
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Met in a trade.$"
-
-gUnknown_84197B8:: @ 84197B8
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Met in a fateful encounter when\n"
-	.string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$"
-
-gUnknown_84197ED:: @ 84197ED
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Met in a fateful encounter when\n"
-	.string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$"
-
-gUnknown_8419822:: @ 8419822
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Met in {UNKNOWN_F7 0x02} at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$"
-
-gUnknown_8419841:: @ 8419841
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Met in {UNKNOWN_F7 0x02} at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$"
-
-gUnknown_8419860:: @ 8419860
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Apparently met in {UNKNOWN_F7 0x02}\n"
-	.string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$"
-
-gUnknown_841988A:: @ 841988A
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Apparently met in {UNKNOWN_F7 0x02}\n"
-	.string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$"
-
-gUnknown_84198B4:: @ 84198B4
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Hatched: {UNKNOWN_F7 0x02}\n"
-	.string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$"
-
-gUnknown_84198D5:: @ 84198D5
-	.string "{UNKNOWN_F7 0x00} nature.\n"
-	.string "Hatched: {UNKNOWN_F7 0x02}\n"
-	.string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$"
-
-@ TODO: Replace this gibberish with the proper Hiragana
-gUnknown_84198F6:: @ 84198F6
-	.string "{UNKNOWN_F7 0x00}ßÓÁÉË {UNKNOWN_F9 0x05}{UNKNOWN_F7 0x01}çÑÊ\n"
-	.string "{UNKNOWN_F7 0x02}で ÉÇっŒ ùÂだ$"
-
-gUnknown_8419913:: @ 8419913
-	.string "{UNKNOWN_F7 0x00}ÓÁÉË {UNKNOWN_F9 0x05}{UNKNOWN_F7 0x01}çÑÊ\n"
-	.string "{UNKNOWN_F7 0x02}で ÉÇっŒ ùÂだ$"
-
-gUnknown_841992F:: @ 841992F
-	.string "{UNKNOWN_F7 0x00} nature. Met in a fateful\n"
-	.string "encounter (hatched: {UNKNOWN_F7 0x02}\n"
-	.string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}).$"
-
-gUnknown_841996D:: @ 841996D
-	.string "{UNKNOWN_F7 0x00} nature. Met in a fateful\n"
-	.string "encounter (hatched: {UNKNOWN_F7 0x02}\n"
-	.string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}).$"
-
-gUnknown_84199AB:: @ 84199AB
-	.string "{UNKNOWN_F7 0x00} nature. Apparently met in\n"
-	.string "a fateful encounter (hatched:\n"
-	.string "{UNKNOWN_F7 0x02} at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}).$"
-
-gUnknown_84199F4:: @ 84199F4
-	.incbin "baserom.gba", 0x4199F4, 0x217
-
-gUnknown_8419C0B:: @ 8419C0B
-	.incbin "baserom.gba", 0x419C0B, 0x8
-
-gUnknown_8419C13:: @ 8419C13
-	.incbin "baserom.gba", 0x419C13, 0xA
-
-gUnknown_8419C1D:: @ 8419C1D
-	.incbin "baserom.gba", 0x419C1D, 0xD
-
-gUnknown_8419C2A:: @ 8419C2A
-	.incbin "baserom.gba", 0x419C2A, 0xF
-
-gUnknown_8419C39:: @ 8419C39
-	.incbin "baserom.gba", 0x419C39, 0xC
-
-gUnknown_8419C45:: @ 8419C45
-	.incbin "baserom.gba", 0x419C45, 0x8
-
-gUnknown_8419C4D:: @ 8419C4D
-	.incbin "baserom.gba", 0x419C4D, 0xC
-
-gUnknown_8419C59:: @ 8419C59
-	.incbin "baserom.gba", 0x419C59, 0x9
-
-gUnknown_8419C62:: @ 8419C62
-	.incbin "baserom.gba", 0x419C62, 0x10
-
-gUnknown_8419C72:: @ 8419C72
-	.incbin "baserom.gba", 0x419C72, 0x9
-
-gUnknown_8419C7B:: @ 8419C7B
-	.incbin "baserom.gba", 0x419C7B, 0x7
-
-gUnknown_8419C82:: @ 8419C82
-	.incbin "baserom.gba", 0x419C82, 0x10
-
-gUnknown_8419C92:: @ 8419C92
-	.incbin "baserom.gba", 0x419C92, 0x10
-
-gUnknown_8419CA2:: @ 8419CA2
-	.incbin "baserom.gba", 0x419CA2, 0x7
-
-gUnknown_8419CA9:: @ 8419CA9
-	.incbin "baserom.gba", 0x419CA9, 0x10
-
-gUnknown_8419CB9:: @ 8419CB9
-	.incbin "baserom.gba", 0x419CB9, 0x21
-
-gUnknown_8419CDA:: @ 8419CDA
-	.incbin "baserom.gba", 0x419CDA, 0x7
-
-gUnknown_8419CE1:: @ 8419CE1
-	.incbin "baserom.gba", 0x419CE1, 0x6
-
-gUnknown_8419CE7:: @ 8419CE7
-	.incbin "baserom.gba", 0x419CE7, 0x6
-
-gUnknown_8419CED:: @ 8419CED
-	.incbin "baserom.gba", 0x419CED, 0x2
-
-gUnknown_8419CEF:: @ 8419CEF
-	.incbin "baserom.gba", 0x419CEF, 0x8
-
-gUnknown_8419CF7:: @ 8419CF7
-	.incbin "baserom.gba", 0x419CF7, 0x1
-
-gUnknown_8419CF8:: @ 8419CF8
-	.incbin "baserom.gba", 0x419CF8, 0x5
-
-gUnknown_8419CFD:: @ 8419CFD
-	.incbin "baserom.gba", 0x419CFD, 0xD
-
-gUnknown_8419D0A:: @ 8419D0A
-	.incbin "baserom.gba", 0x419D0A, 0x10
-
-gUnknown_8419D1A:: @ 8419D1A
-	.incbin "baserom.gba", 0x419D1A, 0x35
-
-gUnknown_8419D4F:: @ 8419D4F
-	.incbin "baserom.gba", 0x419D4F, 0x8
-
-gUnknown_8419D57:: @ 8419D57
-	.incbin "baserom.gba", 0x419D57, 0xF
-
-gUnknown_8419D66:: @ 8419D66
-	.incbin "baserom.gba", 0x419D66, 0x17
-
-gUnknown_8419D7D:: @ 8419D7D
-	.incbin "baserom.gba", 0x419D7D, 0xC
-
-gUnknown_8419D89:: @ 8419D89
-	.incbin "baserom.gba", 0x419D89, 0x43
-
-gUnknown_8419DCC:: @ 8419DCC
-	.incbin "baserom.gba", 0x419DCC, 0x86
-
-gUnknown_8419E52:: @ 8419E52
-	.incbin "baserom.gba", 0x419E52, 0x5
-
-gUnknown_8419E57:: @ 8419E57
-	.incbin "baserom.gba", 0x419E57, 0xFD
-
-gUnknown_8419F54:: @ 8419F54
-	.string "SAVING…\n"
-	.string "DON’T TURN OFF THE POWER.$"
-
-// Start menu option descriptions
-gUnknown_8419F76:: @ 8419F76 // Pokedex
-	.string "A device that records POKéMON secrets\n"
-	.string "upon meeting or catching them.$"
-
-gUnknown_8419FBB:: @ 8419FBB // Pokemon
-	.string "Check and organize POKéMON that are\n"
-	.string "traveling with you in your party.$"
-
-gUnknown_841A001:: @ 841A001 // Bag
-	.string "Equipped with pockets for storing items\n"
-	.string "you bought, received, or found.$"
-
-gUnknown_841A049:: @ 841A049 // {PLAYER}
-	.string "Check your money and other game data.$"
-
-gUnknown_841A06F:: @ 841A06F // Save
-	.string "Save your game with a complete record\n"
-	.string "of your progress to take a break.$"
-
-gUnknown_841A0B7:: @ 841A0B7 // Options
-	.string "Adjust various game settings such as text\n"
-	.string "speed, game rules, etc.$"
-
-gUnknown_841A0F9:: @ 841A0F9 // Quit
-	.string "Close this MENU window.$"
-
-gUnknown_841A111:: @ 841A111 // Retire
-	.string "Retire from the SAFARI GAME and return to\n"
-	.string "the registration counter.$"
-
-	.include "data/text/quest_log.inc"
-
-gUnknown_841B285:: @ 841B285
-	.incbin "baserom.gba", 0x41B285, 0xE
-
-gUnknown_841B293:: @ 841B293
-	.incbin "baserom.gba", 0x41B293, 0x2
-
-gUnknown_841B295:: @ 841B295
-	.incbin "baserom.gba", 0x41B295, 0x12
-
-gUnknown_841B2A7:: @ 841B2A7
-	.incbin "baserom.gba", 0x41B2A7, 0x35
-
-gUnknown_841B2DC:: @ 841B2DC
-	.incbin "baserom.gba", 0x41B2DC, 0x9
-
-gUnknown_841B2E5:: @ 841B2E5
-	.incbin "baserom.gba", 0x41B2E5, 0x8
-
-gUnknown_841B2ED:: @ 841B2ED
-	.incbin "baserom.gba", 0x41B2ED, 0x4
-
-gUnknown_841B2F1:: @ 841B2F1
-	.incbin "baserom.gba", 0x41B2F1, 0x15
-
-gUnknown_841B306:: @ 841B306
-	.incbin "baserom.gba", 0x41B306, 0xF
-
-gUnknown_841B315:: @ 841B315
-	.incbin "baserom.gba", 0x41B315, 0x6
-
-gUnknown_841B31B:: @ 841B31B
-	.incbin "baserom.gba", 0x41B31B, 0xE
-
-gUnknown_841B329:: @ 841B329
-	.incbin "baserom.gba", 0x41B329, 0x5
-
-gUnknown_841B32E:: @ 841B32E
-	.incbin "baserom.gba", 0x41B32E, 0x7C
-
-gUnknown_841B3AA:: @ 841B3AA
-	.incbin "baserom.gba", 0x41B3AA, 0x14
-
-gUnknown_841B3BE:: @ 841B3BE
-	.incbin "baserom.gba", 0x41B3BE, 0x152
-
-gUnknown_841B510:: @ 841B510
-	.incbin "baserom.gba", 0x41B510, 0x6
-
-gUnknown_841B516:: @ 841B516
-	.incbin "baserom.gba", 0x41B516, 0x8
-
-gUnknown_841B51E:: @ 841B51E
-	.incbin "baserom.gba", 0x41B51E, 0x6
-
-gUnknown_841B524:: @ 841B524
-	.incbin "baserom.gba", 0x41B524, 0x7
-
-gUnknown_841B52B:: @ 841B52B
-	.incbin "baserom.gba", 0x41B52B, 0x6
-
-gUnknown_841B531:: @ 841B531
-	.incbin "baserom.gba", 0x41B531, 0x4
-
-gUnknown_841B535:: @ 841B535
-	.incbin "baserom.gba", 0x41B535, 0x6
-
-gUnknown_841B53B:: @ 841B53B
-	.incbin "baserom.gba", 0x41B53B, 0x6
-
-gUnknown_841B541:: @ 841B541
-	.incbin "baserom.gba", 0x41B541, 0xA
-
-gUnknown_841B54B:: @ 841B54B
-	.incbin "baserom.gba", 0x41B54B, 0x9
-
-gUnknown_841B554:: @ 841B554
-	.incbin "baserom.gba", 0x41B554, 0x62
-
-gUnknown_841B5B6:: @ 841B5B6
-	.incbin "baserom.gba", 0x41B5B6, 0x58
-
-gUnknown_841B60E:: @ 841B60E
-	.incbin "baserom.gba", 0x41B60E, 0xB
-
-gUnknown_841B619:: @ 841B619
-	.incbin "baserom.gba", 0x41B619, 0x6B
-
-gUnknown_841B684:: @ 841B684
-	.incbin "baserom.gba", 0x41B684, 0xB
-
-gUnknown_841B68F:: @ 841B68F
-	.incbin "baserom.gba", 0x41B68F, 0x9
-
-gUnknown_841B698:: @ 841B698
-	.incbin "baserom.gba", 0x41B698, 0x6
-
-gUnknown_841B69E:: @ 841B69E
-	.incbin "baserom.gba", 0x41B69E, 0x1B
-
-gUnknown_841B6B9:: @ 841B6B9
-	.incbin "baserom.gba", 0x41B6B9, 0x1C
-
-gUnknown_841B6D5:: @ 841B6D5
-	.incbin "baserom.gba", 0x41B6D5, 0x7
-
-gUnknown_841B6DC:: @ 841B6DC
-	.incbin "baserom.gba", 0x41B6DC, 0x7
-
-gUnknown_841B6E3:: @ 841B6E3
-	.incbin "baserom.gba", 0x41B6E3, 0x8
-
-gUnknown_841B6EB:: @ 841B6EB
-	.incbin "baserom.gba", 0x41B6EB, 0x1
-
-gUnknown_841B6EC:: @ 841B6EC
-	.incbin "baserom.gba", 0x41B6EC, 0x7
-
-gUnknown_841B6F3:: @ 841B6F3
-	.incbin "baserom.gba", 0x41B6F3, 0xA
-
-gUnknown_841B6FD:: @ 841B6FD
-	.incbin "baserom.gba", 0x41B6FD, 0x19
-
-gUnknown_841B716:: @ 841B716
-	.incbin "baserom.gba", 0x41B716, 0x31
-
-gUnknown_841B747:: @ 841B747
-	.incbin "baserom.gba", 0x41B747, 0x24
-
-gUnknown_841B76B:: @ 841B76B
-	.incbin "baserom.gba", 0x41B76B, 0xE
-
-gUnknown_841B779:: @ 841B779
-	.incbin "baserom.gba", 0x41B779, 0xC4
-
-gUnknown_841B83D:: @ 841B83D
-	.incbin "baserom.gba", 0x41B83D, 0xD4A
-
-gUnknown_841C587:: @ 841C587
-	.incbin "baserom.gba", 0x41C587, 0x10C
-
-gUnknown_841C693:: @ 841C693
-	.incbin "baserom.gba", 0x41C693, 0x4A9
-
-gUnknown_841CB3C:: @ 841CB3C
-	.incbin "baserom.gba", 0x41CB3C, 0x5
-
-gUnknown_841CB41:: @ 841CB41
-	.incbin "baserom.gba", 0x41CB41, 0x8
-
-gUnknown_841CB49:: @ 841CB49
-	.incbin "baserom.gba", 0x41CB49, 0x5
-
-gUnknown_841CB4E:: @ 841CB4E
-	.incbin "baserom.gba", 0x41CB4E, 0x4
-
-gUnknown_841CB52:: @ 841CB52
-	.incbin "baserom.gba", 0x41CB52, 0x8
-
-gUnknown_841CB5A:: @ 841CB5A
-	.incbin "baserom.gba", 0x41CB5A, 0x9
-
-gUnknown_841CB63:: @ 841CB63
-	.incbin "baserom.gba", 0x41CB63, 0x46
-
-gUnknown_841CBA9:: @ 841CBA9
-	.incbin "baserom.gba", 0x41CBA9, 0x21
-
-gUnknown_841CBCA:: @ 841CBCA
-	.incbin "baserom.gba", 0x41CBCA, 0x1A
-
-gUnknown_841CBE4:: @ 841CBE4
-	.incbin "baserom.gba", 0x41CBE4, 0x19
-
-gUnknown_841CBFD:: @ 841CBFD
-	.incbin "baserom.gba", 0x41CBFD, 0x14
-
-gUnknown_841CC11:: @ 841CC11
-	.incbin "baserom.gba", 0x41CC11, 0x31
-
-gUnknown_841CC42:: @ 841CC42
-	.incbin "baserom.gba", 0x41CC42, 0x22
-
-gUnknown_841CC64:: @ 841CC64
-	.incbin "baserom.gba", 0x41CC64, 0x9F
-
-gUnknown_841CD03:: @ 841CD03
-	.incbin "baserom.gba", 0x41CD03, 0x22
-
-gUnknown_841CD25:: @ 841CD25
-	.incbin "baserom.gba", 0x41CD25, 0x1E
-
-gUnknown_841CD43:: @ 841CD43
-	.incbin "baserom.gba", 0x41CD43, 0x15
-
-gUnknown_841CD58:: @ 841CD58
-	.incbin "baserom.gba", 0x41CD58, 0x22
-
-gUnknown_841CD7A:: @ 841CD7A
-	.incbin "baserom.gba", 0x41CD7A, 0x25
-
-gUnknown_841CD9F:: @ 841CD9F
-	.incbin "baserom.gba", 0x41CD9F, 0x1B
-
-gUnknown_841CDBA:: @ 841CDBA
-	.incbin "baserom.gba", 0x41CDBA, 0x1D
-
-gUnknown_841CDD7:: @ 841CDD7
-	.incbin "baserom.gba", 0x41CDD7, 0x14
-
-gUnknown_841CDEB:: @ 841CDEB
-	.incbin "baserom.gba", 0x41CDEB, 0x31
-
-gUnknown_841CE1C:: @ 841CE1C
-	.incbin "baserom.gba", 0x41CE1C, 0x8
-
-gUnknown_841CE24:: @ 841CE24
-	.incbin "baserom.gba", 0x41CE24, 0x1FC
-
-gUnknown_841D020:: @ 841D020
-	.incbin "baserom.gba", 0x41D020, 0xC
-
-gUnknown_841D02C:: @ 841D02C
-	.incbin "baserom.gba", 0x41D02C, 0x24
-
-gUnknown_841D050:: @ 841D050
-	.incbin "baserom.gba", 0x41D050, 0x8
-
-gUnknown_841D058:: @ 841D058
-	.incbin "baserom.gba", 0x41D058, 0x10
-
-gUnknown_841D068:: @ 841D068
-	.incbin "baserom.gba", 0x41D068, 0xC
-
-gUnknown_841D074:: @ 841D074
-	.incbin "baserom.gba", 0x41D074, 0x4
-
-gUnknown_841D078:: @ 841D078
-	.incbin "baserom.gba", 0x41D078, 0x8
-
-gUnknown_841D080:: @ 841D080
-	.incbin "baserom.gba", 0x41D080, 0x8
-
-gUnknown_841D088:: @ 841D088
-	.incbin "baserom.gba", 0x41D088, 0x8
-
-gUnknown_841D090:: @ 841D090
-	.incbin "baserom.gba", 0x41D090, 0x8
-
-gUnknown_841D098:: @ 841D098
-	.incbin "baserom.gba", 0x41D098, 0xC
-
-gUnknown_841D0A4:: @ 841D0A4
-	.incbin "baserom.gba", 0x41D0A4, 0x4
-
-gUnknown_841D0A8:: @ 841D0A8
-	.incbin "baserom.gba", 0x41D0A8, 0x18
-
-gUnknown_841D0C0:: @ 841D0C0
-	.incbin "baserom.gba", 0x41D0C0, 0x58
-
-gUnknown_841D118:: @ 841D118
-	.incbin "baserom.gba", 0x41D118, 0xC
-
-gUnknown_841D124:: @ 841D124
-	.incbin "baserom.gba", 0x41D124, 0x18
-
-gUnknown_841D13C:: @ 841D13C
-	.incbin "baserom.gba", 0x41D13C, 0xC
-
-gUnknown_841D148:: @ 841D148
-	.incbin "baserom.gba", 0x41D148, 0x6
-
-gUnknown_841D14E:: @ 841D14E
-	.incbin "baserom.gba", 0x41D14E, 0x1B
-
-gUnknown_841D169:: @ 841D169
-	.incbin "baserom.gba", 0x41D169, 0x15
-
-gUnknown_841D17E:: @ 841D17E
-	.incbin "baserom.gba", 0x41D17E, 0xF
-
-gUnknown_841D18D:: @ 841D18D
-	.incbin "baserom.gba", 0x41D18D, 0xB
-
-gUnknown_841D198:: @ 841D198
-	.incbin "baserom.gba", 0x41D198, 0xCB8
-
-gUnknown_841DE50:: @ 841DE50
-	.string "$"
-
-gUnknown_841DE51:: @ 841DE51
-	.string "$"
-
-gUnknown_841DE52:: @ 841DE52
-	.string "$"
-
-gUnknown_841DE53:: @ 841DE53
-	.string "$"
-
-gUnknown_841DE54:: @ 841DE54
-	.string "$"
-
-gUnknown_841DE55:: @ 841DE55
-	.incbin "baserom.gba", 0x41DE55, 0x27 @ japanese
-
-gUnknown_841DE7C:: @ 841DE7C
-	.string "$"
-
-gUnknown_841DE7D:: @ 841DE7D
-	.string "$"
-
-gUnknown_841DE7E:: @ 841DE7E
-	.incbin "baserom.gba", 0x0041de7e, 0x17 @ japanese
-
-gUnknown_841DE95:: @ 841DE95
-	.string "$"
-
-gUnknown_841DE96:: @ 841DE96
-	.string "$"
-
-gUnknown_841DE97:: @ 841DE97
-	.string "$"
-
-gUnknown_841DE98:: @ 841DE98
-	.string "$"
-
-gUnknown_841DE99:: @ 841DE99
-	.string "$"
-
-gUnknown_841DE9A:: @ 841DE9A
-	.string "$"
-
-gUnknown_841DE9B:: @ 841DE9B
-	.string "$"
-
-gUnknown_841DE9C:: @ 841DE9C
-	.string "$"
-
-gUnknown_841DE9D:: @ 841DE9D
-	.string "Communication error…\n"
-	.string "Please check all connections,\n"
-	.string "then turn the power OFF and ON.$"
-
-gUnknown_841DEF0:: @ 841DEF0
-	.string "Communication error…$"
-
-gUnknown_841DF05:: @ 841DF05
-	.string "Move closer to your link partner(s).\n"
-	.string "Avoid obstacles between partners.$"
-
-gUnknown_841DF4C:: @ 841DF4C
-	.string "A Button: Registration Counter$"
-
-gUnknown_841DF6B:: @ 841DF6B
-	.string "A Button: Title Screen$"
-
-gUnknown_841DF82:: @ 841DF82
-	.string "{STR_VAR_1}P LINK$"
-
-gUnknown_841DF8B:: @ 841DF8B
-	.string "BRONZE$"
-
-gUnknown_841DF92:: @ 841DF92
-	.string "COPPER$"
-
-gUnknown_841DF99:: @ 841DF99
-	.string "SILVER$"
-
-gUnknown_841DFA0:: @ 841DFA0
-	.string "GOLD$"
-
-gUnknown_841DFA5:: @ 841DFA5
-	.incbin "baserom.gba", 0x41DFA5, 0x7
-
-gUnknown_841DFAC:: @ 841DFAC
-	.incbin "baserom.gba", 0x41DFAC, 0x12
-
-gUnknown_841DFBE:: @ 841DFBE
-	.incbin "baserom.gba", 0x41DFBE, 0xB
-
-gUnknown_841DFC9:: @ 841DFC9
-	.incbin "baserom.gba", 0x41DFC9, 0xCA
-
-gUnknown_841E093:: @ 841E093
-	.incbin "baserom.gba", 0x41E093, 0xC
-
-gUnknown_841E09F:: @ 841E09F
-	.incbin "baserom.gba", 0x41E09F, 0x6
-
-gUnknown_841E0A5:: @ 841E0A5
-	.incbin "baserom.gba", 0x41E0A5, 0x144
-
-gUnknown_841E1E9:: @ 841E1E9
-	.incbin "baserom.gba", 0x41E1E9, 0x17
-
-gUnknown_841E200:: @ 841E200
-	.incbin "baserom.gba", 0x41E200, 0xD
-
-gUnknown_841E20D:: @ 841E20D
-	.incbin "baserom.gba", 0x41E20D, 0x11
-
-gUnknown_841E21E:: @ 841E21E
-	.incbin "baserom.gba", 0x41E21E, 0x16
-
-gUnknown_841E234:: @ 841E234
-	.incbin "baserom.gba", 0x41E234, 0xF1
-
-gUnknown_841E325:: @ 841E325
-	.incbin "baserom.gba", 0x41E325, 0xBE
-
-gUnknown_841E3E3:: @ 841E3E3
-	.incbin "baserom.gba", 0x41E3E3, 0x18
-
-gUnknown_841E3FB:: @ 841E3FB
-	.incbin "baserom.gba", 0x41E3FB, 0xA
-
-gUnknown_841E405:: @ 841E405
-	.incbin "baserom.gba", 0x41E405, 0xF
-
-gUnknown_841E414:: @ 841E414
-	.incbin "baserom.gba", 0x41E414, 0x6D
-
-gUnknown_841E481:: @ 841E481
-	.incbin "baserom.gba", 0x41E481, 0x12
-
-gUnknown_841E493:: @ 841E493
-	.incbin "baserom.gba", 0x41E493, 0x2D
-
-gUnknown_841E4C0:: @ 841E4C0
-	.incbin "baserom.gba", 0x41E4C0, 0x22
-
-gUnknown_841E4E2:: @ 841E4E2
-	.incbin "baserom.gba", 0x41E4E2, 0x2A
-
-gUnknown_841E50C:: @ 841E50C
-	.incbin "baserom.gba", 0x41E50C, 0x2C
-
-gUnknown_841E538:: @ 841E538
-	.incbin "baserom.gba", 0x41E538, 0x3A
-
-gUnknown_841E572:: @ 841E572
-	.incbin "baserom.gba", 0x41E572, 0x1B
-
-gUnknown_841E58D:: @ 841E58D
-	.incbin "baserom.gba", 0x41E58D, 0x17
-
-gFameCheckerText_MainScreenUI:: @ 841E5A4
-	.string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$"
-
-gFameCheckerText_PickScreenUI:: @ 841E5B9
-	.string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$"
-
-gFameCheckerText_FlavorTextUI:: @ 841E5D2
-	.string "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {UNKNOWN_F8 0x01}CANCEL$"
-
-gFameCheckerOakName:: @ 841E5E9
-	.string "OAK$"
-
-gFameCheckerDaisyName:: @ 841E5ED
-	.string "DAISY$"
-
-gFameCheckerBillName:: @ 841E5F3
-	.string "BILL$"
-
-gFameCheckerMrFujiName:: @ 841E5F8
-	.string "FUJI$"
-
-gUnknown_841E5FD:: @ 841E5FD
-	.string "A variety of events will be imported\nover Wireless Communication.$"
-
-gUnknown_841E63F:: @ 841E63F
-	.string "Read the WONDER CARDS in your\npossession.$"
-
-gUnknown_841E669:: @ 841E669
-	.string "Read the NEWS that arrived.$"
-
-gUnknown_841E685:: @ 841E685
-	.string "Return to the title screen.$"
-
-gUnknown_841E6A1:: @ 841E6A1
-	.incbin "baserom.gba", 0x41E6A1, 0x3B
-
-gUnknown_841E6DC:: @ 841E6DC
-	.incbin "baserom.gba", 0x41E6DC, 0x3B
-
-gUnknown_841E717:: @ 841E717
-	.incbin "baserom.gba", 0x41E717, 0x2A
-
-gUnknown_841E741:: @ 841E741
-	.incbin "baserom.gba", 0x41E741, 0x53
-
-gUnknown_841E794:: @ 841E794
-	.incbin "baserom.gba", 0x41E794, 0xF
-
-gUnknown_841E7A3:: @ 841E7A3
-	.incbin "baserom.gba", 0x41E7A3, 0x19
-
-gUnknown_841E7BC:: @ 841E7BC
-	.incbin "baserom.gba", 0x41E7BC, 0x15
-
-gUnknown_841E7D1:: @ 841E7D1
-	.incbin "baserom.gba", 0x41E7D1, 0x21
-
-gUnknown_841E7F2:: @ 841E7F2
-	.incbin "baserom.gba", 0x41E7F2, 0x31
-
-gUnknown_841E823:: @ 841E823
-	.incbin "baserom.gba", 0x41E823, 0x43
-
-gUnknown_841E866:: @ 841E866
-	.incbin "baserom.gba", 0x41E866, 0x29
-
-gUnknown_841E88F:: @ 841E88F
-	.incbin "baserom.gba", 0x41E88F, 0x2E
-
-gUnknown_841E8BD:: @ 841E8BD
-	.incbin "baserom.gba", 0x41E8BD, 0x25
-
-gUnknown_841E8E2:: @ 841E8E2
-	.incbin "baserom.gba", 0x41E8E2, 0x2A
-
-gUnknown_841E90C:: @ 841E90C
-	.incbin "baserom.gba", 0x41E90C, 0x1F
-
-gUnknown_841E92B:: @ 841E92B
-	.incbin "baserom.gba", 0x41E92B, 0x1B
-
-gUnknown_841E946:: @ 841E946
-	.incbin "baserom.gba", 0x41E946, 0x22
-
-gUnknown_841E968:: @ 841E968
-	.incbin "baserom.gba", 0x41E968, 0x27
-
-gUnknown_841E98F:: @ 841E98F
-	.incbin "baserom.gba", 0x41E98F, 0x1C
-
-gUnknown_841E9AB:: @ 841E9AB
-	.incbin "baserom.gba", 0x41E9AB, 0x28
-
-gUnknown_841E9D3:: @ 841E9D3
-	.incbin "baserom.gba", 0x41E9D3, 0x3A
-
-gUnknown_841EA0D:: @ 841EA0D
-	.incbin "baserom.gba", 0x41EA0D, 0x32
-
-gUnknown_841EA3F:: @ 841EA3F
-	.incbin "baserom.gba", 0x41EA3F, 0x30
-
-gUnknown_841EA6F:: @ 841EA6F
-	.incbin "baserom.gba", 0x41EA6F, 0x17
-
-gUnknown_841EA86:: @ 841EA86
-	.incbin "baserom.gba", 0x41EA86, 0x31
-
-gUnknown_841EAB7:: @ 841EAB7
-	.incbin "baserom.gba", 0x41EAB7, 0x30
-
-gUnknown_841EAE7:: @ 841EAE7
-	.incbin "baserom.gba", 0x41EAE7, 0x1A
-
-gUnknown_841EB01:: @ 841EB01
-	.incbin "baserom.gba", 0x41EB01, 0x1F
-
-gUnknown_841EB20:: @ 841EB20
-	.incbin "baserom.gba", 0x41EB20, 0x26
-
-gUnknown_841EB46:: @ 841EB46
-	.incbin "baserom.gba", 0x41EB46, 0x2B
-
-gUnknown_841EB71:: @ 841EB71
-	.incbin "baserom.gba", 0x41EB71, 0x1D
-
-gUnknown_841EB8E:: @ 841EB8E
-	.incbin "baserom.gba", 0x41EB8E, 0x1C
-
-gUnknown_841EBAA:: @ 841EBAA
-	.incbin "baserom.gba", 0x41EBAA, 0x34
-
-gUnknown_841EBDE:: @ 841EBDE
-	.incbin "baserom.gba", 0x41EBDE, 0x34
-
-gUnknown_841EC12:: @ 841EC12
-	.incbin "baserom.gba", 0x41EC12, 0x2E
-
-gUnknown_841EC40:: @ 841EC40
-	.incbin "baserom.gba", 0x41EC40, 0x2A
-
-gUnknown_841EC6A:: @ 841EC6A
-	.incbin "baserom.gba", 0x41EC6A, 0x2F
-
-gUnknown_841EC99:: @ 841EC99
-	.incbin "baserom.gba", 0x41EC99, 0x3A
-
-gUnknown_841ECD3:: @ 841ECD3
-	.incbin "baserom.gba", 0x41ECD3, 0x26
-
-gUnknown_841ECF9:: @ 841ECF9
-	.incbin "baserom.gba", 0x41ECF9, 0x36
-
-gUnknown_841ED2F:: @ 841ED2F
-	.incbin "baserom.gba", 0x41ED2F, 0x21
-
-gUnknown_841ED50:: @ 841ED50
-	.incbin "baserom.gba", 0x41ED50, 0x2B
-
-gUnknown_841ED7B:: @ 841ED7B
-	.incbin "baserom.gba", 0x41ED7B, 0x21
-
-gUnknown_841ED9C:: @ 841ED9C
-	.incbin "baserom.gba", 0x41ED9C, 0x21
-
-gUnknown_841EDBD:: @ 841EDBD
-	.incbin "baserom.gba", 0x41EDBD, 0xD
-
-gUnknown_841EDCA:: @ 841EDCA
-	.incbin "baserom.gba", 0x41EDCA, 0x61
-
-gUnknown_841EE2B:: @ 841EE2B
-	.incbin "baserom.gba", 0x41EE2B, 0x19
+	@ strings
 
+	.section .rodata.841EE44
+	.align 2
 gUnknown_841EE44:: @ 841EE44
 	.incbin "baserom.gba", 0x41EE44, 0x20
 
@@ -2313,10 +548,10 @@ gUnknown_841EF10:: @ 841EF10
 	.incbin "baserom.gba", 0x41EF10, 0x2B8
 
 gUnknown_841F1C8:: @ 841F1C8
-	.incbin "baserom.gba", 0x41F1C8, 0x240
+	.incbin "graphics/text_window/unk_841F1C8.4bpp"
 
-gUnknown_841F408:: @ 841F408
-	.incbin "baserom.gba", 0x41F408, 0x20
+gTMCaseMainWindowPalette:: @ 841F408
+	.incbin "graphics/tm_case/unk_841F408.gbapal"
 
 gUnknown_841F428:: @ 841F428
 	.incbin "baserom.gba", 0x41F428, 0x4
@@ -2369,6 +604,7 @@ gUnknown_843EC64:: @ 843EC64
 gUnknown_843EC8C:: @ 843EC8C
 	.incbin "baserom.gba", 0x43EC8C, 0xFC
 
+	.align 2
 gUnknown_843ED88:: @ 843ED88
 	.incbin "baserom.gba", 0x43ED88, 0xC
 
@@ -2495,7 +731,10 @@ gUnknown_843F8DB:: @ 843F8DB
 	.incbin "baserom.gba", 0x43F8DB, 0x5
 
 gUnknown_843F8E0:: @ 843F8E0
-	.incbin "baserom.gba", 0x43F8E0, 0x10
+	.4byte gUnknown_847A8D8
+	.4byte gUnknown_847A8FA
+	.4byte gUnknown_847A913
+	.4byte gUnknown_847A934
 
 gUnknown_843F8F0:: @ 843F8F0
 	.incbin "baserom.gba", 0x43F8F0, 0x20
@@ -2752,51 +991,9 @@ gUnknown_8453092:: @ 8453092
 gUnknown_8453094:: @ 8453094
 	.incbin "baserom.gba", 0x453094, 0x4
 
-gUnknown_8453098:: @ 8453098
-	.incbin "baserom.gba", 0x453098, 0x20
-
-gUnknown_84530B8:: @ 84530B8
-	.incbin "baserom.gba", 0x4530B8, 0xC
-
-gUnknown_84530C4:: @ 84530C4
-	.incbin "baserom.gba", 0x4530C4, 0x20
-
-gUnknown_84530E4:: @ 84530E4
-	.incbin "baserom.gba", 0x4530E4, 0x20
-
-gUnknown_8453104:: @ 8453104
-	.incbin "baserom.gba", 0x453104, 0x18
-
-gUnknown_845311C:: @ 845311C
-	.incbin "baserom.gba", 0x45311C, 0x8
-
-gUnknown_8453124:: @ 8453124
-	.incbin "baserom.gba", 0x453124, 0x54
-
-gUnknown_8453178:: @ 8453178
-	.incbin "baserom.gba", 0x453178, 0xC
-
-gUnknown_8453184:: @ 8453184
-	.incbin "baserom.gba", 0x453184, 0x8
-
 	.section .rodata.8453F6C
 
-// item_pc.o
-gUnknown_8453F6C:: @ 8453F6C
-	.incbin "baserom.gba", 0x453F6C, 0x8
-
-gUnknown_8453F74:: @ 8453F74
-	.incbin "baserom.gba", 0x453F74, 0x18
-
-gUnknown_8453F8C:: @ 8453F8C
-	.incbin "baserom.gba", 0x453F8C, 0xC
-
-gUnknown_8453F98:: @ 8453F98
-	.incbin "baserom.gba", 0x453F98, 0x38
-
-gUnknown_8453FD0:: @ 8453FD0
-	.incbin "baserom.gba", 0x453FD0, 0x18
-
+// mailbox_pc.o
 gUnknown_8453FE8:: @ 8453FE8
 	.incbin "baserom.gba", 0x453FE8, 0x18
 
@@ -3543,60 +1740,3 @@ gUnknown_845B050:: @ 845B050
 
 gUnknown_845B068:: @ 845B068
 	.incbin "baserom.gba", 0x45B068, 0x18
-
-gUnknown_845B080:: @ 845B080
-	.incbin "baserom.gba", 0x45B080, 0x18
-
-gUnknown_845B098:: @ 845B098
-	.incbin "baserom.gba", 0x45B098, 0x18
-
-gUnknown_845B0B0:: @ 845B0B0
-	.incbin "baserom.gba", 0x45B0B0, 0xB4
-
-gUnknown_845B164:: @ 845B164
-	.incbin "baserom.gba", 0x45B164, 0xB4
-
-gUnknown_845B218:: @ 845B218
-	.incbin "baserom.gba", 0x45B218, 0xC4
-
-gUnknown_845B2DC:: @ 845B2DC
-	.incbin "baserom.gba", 0x45B2DC, 0xC4
-
-gUnknown_845B3A0:: @ 845B3A0
-	.incbin "baserom.gba", 0x45B3A0, 0xB0
-
-gUnknown_845B450:: @ 845B450
-	.incbin "baserom.gba", 0x45B450, 0xB0
-
-gUnknown_845B500:: @ 845B500
-	.incbin "baserom.gba", 0x45B500, 0x20
-
-gUnknown_845B520:: @ 845B520
-	.incbin "baserom.gba", 0x45B520, 0x20
-
-gUnknown_845B540:: @ 845B540
-	.incbin "baserom.gba", 0x45B540, 0x90
-
-gUnknown_845B5D0:: @ 845B5D0
-	.incbin "baserom.gba", 0x45B5D0, 0x3EE
-
-gUnknown_845B9BE:: @ 845B9BE
-	.incbin "baserom.gba", 0x45B9BE, 0x22
-
-gUnknown_845B9E0:: @ 845B9E0
-	.incbin "baserom.gba", 0x45B9E0, 0xAD0
-
-gUnknown_845C4B0:: @ 845C4B0
-	.incbin "baserom.gba", 0x45C4B0, 0x6
-
-gUnknown_845C4B6:: @ 845C4B6
-	.incbin "baserom.gba", 0x45C4B6, 0xDE
-
-gUnknown_845C594:: @ 845C594
-	.incbin "baserom.gba", 0x45C594, 0x28
-
-gUnknown_845C5BC:: @ 845C5BC
-	.incbin "baserom.gba", 0x45C5BC, 0x12
-
-gUnknown_845C5CE:: @ 845C5CE
-	.incbin "baserom.gba", 0x45C5CE, 0x32
diff --git a/data/data_845FD54.s b/data/data_845FD54.s
deleted file mode 100644
index d05e14570..000000000
--- a/data/data_845FD54.s
+++ /dev/null
@@ -1,600 +0,0 @@
-	.section .rodata
-
-	.align 2
-	// oak_speech
-gUnknown_845FD54:: @ 845FD54
-	.incbin "baserom.gba", 0x45FD54, 0x814
-
-gUnknown_8460568:: @ 8460568
-	.incbin "baserom.gba", 0x460568, 0x80
-
-gUnknown_84605E8:: @ 84605E8
-	.incbin "baserom.gba", 0x4605E8, 0x5C0
-
-gUnknown_8460BA8:: @ 8460BA8
-	.incbin "baserom.gba", 0x460BA8, 0xFC
-
-gUnknown_8460CA4:: @ 8460CA4
-	.incbin "baserom.gba", 0x460CA4, 0x44
-
-gUnknown_8460CE8:: @ 8460CE8
-	.incbin "baserom.gba", 0x460CE8, 0xAC
-
-gUnknown_8460D94:: @ 8460D94
-	.incbin "baserom.gba", 0x460D94, 0xA0
-
-gUnknown_8460E34:: @ 8460E34
-	.incbin "baserom.gba", 0x460E34, 0xA0
-
-gUnknown_8460ED4:: @ 8460ED4
-	.incbin "baserom.gba", 0x460ED4, 0x40
-
-gUnknown_8460F14:: @ 8460F14
-	.incbin "baserom.gba", 0x460F14, 0x6E8
-
-gUnknown_84615FC:: @ 84615FC
-	.incbin "baserom.gba", 0x4615FC, 0x40
-
-gUnknown_846163C:: @ 846163C
-	.incbin "baserom.gba", 0x46163C, 0x698
-
-gUnknown_8461CD4:: @ 8461CD4
-	.incbin "baserom.gba", 0x461CD4, 0x40
-
-gUnknown_8461D14:: @ 8461D14
-	.incbin "baserom.gba", 0x461D14, 0x698
-
-gUnknown_84623AC:: @ 84623AC
-	.incbin "baserom.gba", 0x4623AC, 0x40
-
-gUnknown_84623EC:: @ 84623EC
-	.incbin "baserom.gba", 0x4623EC, 0xA6C
-
-gUnknown_8462E58:: @ 8462E58
-	.incbin "baserom.gba", 0x462E58, 0x5C
-
-gUnknown_8462EB4:: @ 8462EB4
-	.incbin "baserom.gba", 0x462EB4, 0xC
-
-gUnknown_8462EC0:: @ 8462EC0
-	.incbin "baserom.gba", 0x462EC0, 0x8
-
-gUnknown_8462EC8:: @ 8462EC8
-	.incbin "baserom.gba", 0x462EC8, 0x8
-
-gUnknown_8462ED0:: @ 8462ED0
-	.incbin "baserom.gba", 0x462ED0, 0x8
-
-gUnknown_8462ED8:: @ 8462ED8
-	.incbin "baserom.gba", 0x462ED8, 0x10
-
-gUnknown_8462EE8:: @ 8462EE8
-	.incbin "baserom.gba", 0x462EE8, 0x4
-
-gUnknown_8462EEC:: @ 8462EEC
-	.incbin "baserom.gba", 0x462EEC, 0x4
-
-gUnknown_8462EF0:: @ 8462EF0
-	.incbin "baserom.gba", 0x462EF0, 0xC
-
-gUnknown_8462EFC:: @ 8462EFC
-	.incbin "baserom.gba", 0x462EFC, 0x18
-
-gUnknown_8462F14:: @ 8462F14
-	.incbin "baserom.gba", 0x462F14, 0x8
-
-gUnknown_8462F1C:: @ 8462F1C
-	.incbin "baserom.gba", 0x462F1C, 0x8
-
-gUnknown_8462F24:: @ 8462F24
-	.incbin "baserom.gba", 0x462F24, 0x2C
-
-gUnknown_8462F50:: @ 8462F50
-	.incbin "baserom.gba", 0x462F50, 0xDC
-
-gUnknown_846302C:: @ 846302C
-	.incbin "baserom.gba", 0x46302C, 0x48
-
-gUnknown_8463074:: @ 8463074
-	.incbin "baserom.gba", 0x463074, 0x18
-
-gUnknown_846308C:: @ 846308C
-	.incbin "baserom.gba", 0x46308C, 0x4C
-
-gUnknown_84630D8:: @ 84630D8
-	.incbin "baserom.gba", 0x4630D8, 0x4C
-
-gUnknown_8463124:: @ 8463124
-	.incbin "baserom.gba", 0x463124, 0x10
-
-gUnknown_8463134:: @ 8463134
-	.incbin "baserom.gba", 0x463134, 0xC
-
-gUnknown_8463140:: @ 8463140
-	.incbin "baserom.gba", 0x463140, 0x10
-
-gUnknown_8463150:: @ 8463150
-	.incbin "baserom.gba", 0x463150, 0x18
-
-gUnknown_8463168:: @ 8463168
-	.incbin "baserom.gba", 0x463168, 0x3
-
-gUnknown_846316B:: @ 846316B
-	.incbin "baserom.gba", 0x46316B, 0x5
-
-gUnknown_8463170:: @ 8463170
-	.incbin "baserom.gba", 0x463170, 0x8
-
-gUnknown_8463178:: @ 8463178
-	.incbin "baserom.gba", 0x463178, 0x4
-
-gUnknown_846317C:: @ 846317C
-	.incbin "baserom.gba", 0x46317C, 0x4
-
-gUnknown_8463180:: @ 8463180
-	.incbin "baserom.gba", 0x463180, 0x4
-
-gUnknown_8463184:: @ 8463184
-	.incbin "baserom.gba", 0x463184, 0xC
-
-gUnknown_8463190:: @ 8463190
-	.incbin "baserom.gba", 0x463190, 0x50
-
-gUnknown_84631E0:: @ 84631E0
-	.incbin "baserom.gba", 0x4631E0, 0x8
-
-gUnknown_84631E8:: @ 84631E8
-	.incbin "baserom.gba", 0x4631E8, 0x30
-
-gUnknown_8463218:: @ 8463218
-	.incbin "baserom.gba", 0x463218, 0x8
-
-gUnknown_8463220:: @ 8463220
-	.incbin "baserom.gba", 0x463220, 0x18
-
-gUnknown_8463238:: @ 8463238
-	.incbin "baserom.gba", 0x463238, 0x24
-
-gUnknown_846325C:: @ 846325C
-	.incbin "baserom.gba", 0x46325C, 0x48
-
-gUnknown_84632A4:: @ 84632A4
-	.incbin "baserom.gba", 0x4632A4, 0x18
-
-gUnknown_84632BC:: @ 84632BC
-	.incbin "baserom.gba", 0x4632BC, 0x4
-
-gUnknown_84632C0:: @ 84632C0
-	.incbin "baserom.gba", 0x4632C0, 0x4
-
-gUnknown_84632C4:: @ 84632C4
-	.incbin "baserom.gba", 0x4632C4, 0x4
-
-gUnknown_84632C8:: @ 84632C8
-	.incbin "baserom.gba", 0x4632C8, 0x4
-
-gUnknown_84632CC:: @ 84632CC
-	.incbin "baserom.gba", 0x4632CC, 0x4
-
-gUnknown_84632D0:: @ 84632D0
-	.incbin "baserom.gba", 0x4632D0, 0x4
-
-gUnknown_84632D4:: @ 84632D4
-	.incbin "baserom.gba", 0x4632D4, 0x4
-
-gUnknown_84632D8:: @ 84632D8
-	.incbin "baserom.gba", 0x4632D8, 0x18
-
-gUnknown_84632F0:: @ 84632F0
-	.incbin "baserom.gba", 0x4632F0, 0x18
-
-gUnknown_8463308:: @ 8463308
-	.incbin "baserom.gba", 0x463308, 0x20
-
-gUnknown_8463328:: @ 8463328
-	.incbin "baserom.gba", 0x463328, 0x70
-
-gUnknown_8463398:: @ 8463398
-	.incbin "baserom.gba", 0x463398, 0x40
-
-gUnknown_84633D8:: @ 84633D8
-	.incbin "baserom.gba", 0x4633D8, 0x44
-
-gUnknown_846341C:: @ 846341C
-	.incbin "baserom.gba", 0x46341C, 0x20
-
-gUnknown_846343C:: @ 846343C
-	.incbin "baserom.gba", 0x46343C, 0x128
-
-gUnknown_8463564:: @ 8463564
-	.incbin "baserom.gba", 0x463564, 0x1C
-
-gUnknown_8463580:: @ 8463580
-	.incbin "baserom.gba", 0x463580, 0x140
-
-gUnknown_84636C0:: @ 84636C0
-	.incbin "baserom.gba", 0x4636C0, 0x20
-
-gUnknown_84636E0:: @ 84636E0
-	.incbin "baserom.gba", 0x4636E0, 0x20
-
-gUnknown_8463700:: @ 8463700
-	.incbin "baserom.gba", 0x463700, 0x20
-
-gUnknown_8463720:: @ 8463720
-	.incbin "baserom.gba", 0x463720, 0x20
-
-gUnknown_8463740:: @ 8463740
-	.incbin "baserom.gba", 0x463740, 0x12C
-
-gUnknown_846386C:: @ 846386C
-	.incbin "baserom.gba", 0x46386C, 0x120
-
-gUnknown_846398C:: @ 846398C
-	.incbin "baserom.gba", 0x46398C, 0x18
-
-gUnknown_84639A4:: @ 84639A4
-	.incbin "baserom.gba", 0x4639A4, 0x8
-
-gUnknown_84639AC:: @ 84639AC
-	.incbin "baserom.gba", 0x4639AC, 0x48
-
-gUnknown_84639F4:: @ 84639F4
-	.incbin "baserom.gba", 0x4639F4, 0x20
-
-gUnknown_8463A14:: @ 8463A14
-	.incbin "baserom.gba", 0x463A14, 0x68
-
-gUnknown_8463A7C:: @ 8463A7C
-	.incbin "baserom.gba", 0x463A7C, 0x70
-
-gUnknown_8463AEC:: @ 8463AEC
-	.incbin "baserom.gba", 0x463AEC, 0x10
-
-gUnknown_8463AFC:: @ 8463AFC
-	.incbin "baserom.gba", 0x463AFC, 0x4
-
-gUnknown_8463B00:: @ 8463B00
-	.incbin "baserom.gba", 0x463B00, 0x20
-
-gUnknown_8463B20:: @ 8463B20
-	.incbin "baserom.gba", 0x463B20, 0x10
-
-gUnknown_8463B30:: @ 8463B30
-	.incbin "baserom.gba", 0x463B30, 0x10
-
-gUnknown_8463B40:: @ 8463B40
-	.incbin "baserom.gba", 0x463B40, 0x4
-
-gUnknown_8463B44:: @ 8463B44
-	.incbin "baserom.gba", 0x463B44, 0x20
-
-gUnknown_8463B64:: @ 8463B64
-	.incbin "baserom.gba", 0x463B64, 0x24
-
-gUnknown_8463B88:: @ 8463B88
-	.incbin "baserom.gba", 0x463B88, 0xF8
-
-gUnknown_8463C80:: @ 8463C80
-	.incbin "baserom.gba", 0x463C80, 0x1E0
-
-gUnknown_8463E60:: @ 8463E60
-	.incbin "baserom.gba", 0x463E60, 0x64
-
-gUnknown_8463EC4:: @ 8463EC4
-	.incbin "baserom.gba", 0x463EC4, 0x10
-
-gUnknown_8463ED4:: @ 8463ED4
-	.incbin "baserom.gba", 0x463ED4, 0x1C
-
-gUnknown_8463EF0:: @ 8463EF0
-	.incbin "baserom.gba", 0x463EF0, 0xC
-
-gUnknown_8463EFC:: @ 8463EFC
-	.incbin "baserom.gba", 0x463EFC, 0x10
-
-gUnknown_8463F0C:: @ 8463F0C
-	.incbin "baserom.gba", 0x463F0C, 0x18
-
-gUnknown_8463F24:: @ 8463F24
-	.incbin "baserom.gba", 0x463F24, 0x18
-
-gUnknown_8463F3C:: @ 8463F3C
-	.incbin "baserom.gba", 0x463F3C, 0x20
-
-gUnknown_8463F5C:: @ 8463F5C
-	.incbin "baserom.gba", 0x463F5C, 0x20
-
-gUnknown_8463F7C:: @ 8463F7C
-	.incbin "baserom.gba", 0x463F7C, 0x20
-
-gUnknown_8463F9C:: @ 8463F9C
-	.incbin "baserom.gba", 0x463F9C, 0x8
-
-gUnknown_8463FA4:: @ 8463FA4
-	.incbin "baserom.gba", 0x463FA4, 0x3
-
-gUnknown_8463FA7:: @ 8463FA7
-	.incbin "baserom.gba", 0x463FA7, 0x11
-
-gUnknown_8463FB8:: @ 8463FB8
-	.incbin "baserom.gba", 0x463FB8, 0x6
-
-gUnknown_8463FBE:: @ 8463FBE
-	.incbin "baserom.gba", 0x463FBE, 0x3
-
-gUnknown_8463FC1:: @ 8463FC1
-	.incbin "baserom.gba", 0x463FC1, 0x5
-
-gUnknown_8463FC6:: @ 8463FC6
-	.incbin "baserom.gba", 0x463FC6, 0x7
-
-gUnknown_8463FCD:: @ 8463FCD
-	.incbin "baserom.gba", 0x463FCD, 0x7
-
-gUnknown_8463FD4:: @ 8463FD4
-	.incbin "baserom.gba", 0x463FD4, 0xB
-
-gUnknown_8463FDF:: @ 8463FDF
-	.incbin "baserom.gba", 0x463FDF, 0xB
-
-gUnknown_8463FEA:: @ 8463FEA
-	.incbin "baserom.gba", 0x463FEA, 0x12
-
-gUnknown_8463FFC:: @ 8463FFC
-	.incbin "baserom.gba", 0x463FFC, 0xC
-
-gUnknown_8464008:: @ 8464008
-	.incbin "baserom.gba", 0x464008, 0x120
-
-gUnknown_8464128:: @ 8464128
-	.incbin "baserom.gba", 0x464128, 0x20
-
-gUnknown_8464148:: @ 8464148
-	.incbin "baserom.gba", 0x464148, 0x174
-
-gUnknown_84642BC:: @ 84642BC
-	.incbin "baserom.gba", 0x4642BC, 0x4
-
-gUnknown_84642C0:: @ 84642C0
-	.incbin "baserom.gba", 0x4642C0, 0x34
-
-gUnknown_84642F4:: @ 84642F4
-	.incbin "baserom.gba", 0x4642F4, 0xC
-
-gUnknown_8464300:: @ 8464300
-	.incbin "baserom.gba", 0x464300, 0x4C
-
-gUnknown_846434C:: @ 846434C
-	.incbin "baserom.gba", 0x46434C, 0xC
-
-gUnknown_8464358:: @ 8464358
-	.incbin "baserom.gba", 0x464358, 0x14
-
-gUnknown_846436C:: @ 846436C
-	.incbin "baserom.gba", 0x46436C, 0x8
-
-gUnknown_8464374:: @ 8464374
-	.incbin "baserom.gba", 0x464374, 0x8
-
-gUnknown_846437C:: @ 846437C
-	.incbin "baserom.gba", 0x46437C, 0x28
-
-gUnknown_84643A4:: @ 84643A4
-	.incbin "baserom.gba", 0x4643A4, 0x4
-
-gUnknown_84643A8:: @ 84643A8
-	.incbin "baserom.gba", 0x4643A8, 0x4
-
-gUnknown_84643AC:: @ 84643AC
-	.incbin "baserom.gba", 0x4643AC, 0x4
-
-gUnknown_84643B0:: @ 84643B0
-	.incbin "baserom.gba", 0x4643B0, 0x4
-
-gUnknown_84643B4:: @ 84643B4
-	.incbin "baserom.gba", 0x4643B4, 0x4
-
-gUnknown_84643B8:: @ 84643B8
-	.incbin "baserom.gba", 0x4643B8, 0x20
-
-gUnknown_84643D8:: @ 84643D8
-	.incbin "baserom.gba", 0x4643D8, 0x18
-
-gUnknown_84643F0:: @ 84643F0
-	.incbin "baserom.gba", 0x4643F0, 0x8
-
-gUnknown_84643F8:: @ 84643F8
-	.incbin "baserom.gba", 0x4643F8, 0x8
-
-gUnknown_8464400:: @ 8464400
-	.incbin "baserom.gba", 0x464400, 0x48
-
-gUnknown_8464448:: @ 8464448
-	.incbin "baserom.gba", 0x464448, 0x60
-
-gUnknown_84644A8:: @ 84644A8
-	.incbin "baserom.gba", 0x4644A8, 0x8
-
-gUnknown_84644B0:: @ 84644B0
-	.incbin "baserom.gba", 0x4644B0, 0x8
-
-gUnknown_84644B8:: @ 84644B8
-	.incbin "baserom.gba", 0x4644B8, 0x32C
-
-gUnknown_84647E4:: @ 84647E4
-	.incbin "baserom.gba", 0x4647E4, 0x18
-
-gUnknown_84647FC:: @ 84647FC
-	.incbin "baserom.gba", 0x4647FC, 0x8
-
-gUnknown_8464804:: @ 8464804
-	.incbin "baserom.gba", 0x464804, 0x38
-
-gUnknown_846483C:: @ 846483C
-	.incbin "baserom.gba", 0x46483C, 0x40
-
-gUnknown_846487C:: @ 846487C
-	.incbin "baserom.gba", 0x46487C, 0x8
-
-gUnknown_8464884:: @ 8464884
-	.incbin "baserom.gba", 0x464884, 0xC
-
-gUnknown_8464890:: @ 8464890
-	.incbin "baserom.gba", 0x464890, 0x1E
-
-gUnknown_84648AE:: @ 84648AE
-	.incbin "baserom.gba", 0x4648AE, 0xF
-
-gUnknown_84648BD:: @ 84648BD
-	.incbin "baserom.gba", 0x4648BD, 0x15
-
-gUnknown_84648D2:: @ 84648D2
-	.incbin "baserom.gba", 0x4648D2, 0x54
-
-gUnknown_8464926:: @ 8464926
-	.incbin "baserom.gba", 0x464926, 0x40
-
-gUnknown_8464966:: @ 8464966
-	.incbin "baserom.gba", 0x464966, 0xC4A
-
-gUnknown_84655B0:: @ 84655B0
-	.incbin "baserom.gba", 0x4655B0, 0x18
-
-gUnknown_84655C8:: @ 84655C8
-	.incbin "baserom.gba", 0x4655C8, 0x40
-
-gUnknown_8465608:: @ 8465608
-	.incbin "baserom.gba", 0x465608, 0xE
-
-gUnknown_8465616:: @ 8465616
-	.incbin "baserom.gba", 0x465616, 0xC0
-
-gUnknown_84656D6:: @ 84656D6
-	.incbin "baserom.gba", 0x4656D6, 0x10E
-
-gUnknown_84657E4:: @ 84657E4
-	.incbin "baserom.gba", 0x4657E4, 0x98
-
-gUnknown_846587C:: @ 846587C
-	.incbin "baserom.gba", 0x46587C, 0x5C
-
-gUnknown_84658D8:: @ 84658D8
-	.incbin "baserom.gba", 0x4658D8, 0x18
-
-gUnknown_84658F0:: @ 84658F0
-	.incbin "baserom.gba", 0x4658F0, 0x40
-
-gUnknown_8465930:: @ 8465930
-	.incbin "baserom.gba", 0x465930, 0x20
-
-gUnknown_8465950:: @ 8465950
-	.incbin "baserom.gba", 0x465950, 0x80
-
-gUnknown_84659D0:: @ 84659D0
-	.incbin "baserom.gba", 0x4659D0, 0x804
-
-gUnknown_84661D4:: @ 84661D4
-	.incbin "baserom.gba", 0x4661D4, 0x2E8
-
-gUnknown_84664BC:: @ 84664BC
-	.incbin "baserom.gba", 0x4664BC, 0x20
-
-gUnknown_84664DC:: @ 84664DC
-	.incbin "baserom.gba", 0x4664DC, 0x60
-
-gUnknown_846653C:: @ 846653C
-	.incbin "baserom.gba", 0x46653C, 0x84
-
-gUnknown_84665C0:: @ 84665C0
-	.incbin "baserom.gba", 0x4665C0, 0x60
-
-gUnknown_8466620:: @ 8466620
-	.incbin "baserom.gba", 0x466620, 0x378
-
-gUnknown_8466998:: @ 8466998
-	.incbin "baserom.gba", 0x466998, 0x178
-
-gUnknown_8466B10:: @ 8466B10
-	.incbin "baserom.gba", 0x466B10, 0x10
-
-gUnknown_8466B20:: @ 8466B20
-	.incbin "baserom.gba", 0x466B20, 0xEC
-
-gUnknown_8466C0C:: @ 8466C0C
-	.incbin "baserom.gba", 0x466C0C, 0x28
-
-gUnknown_8466C34:: @ 8466C34
-	.incbin "baserom.gba", 0x466C34, 0x4
-
-gUnknown_8466C38:: @ 8466C38
-	.incbin "baserom.gba", 0x466C38, 0x8
-
-gUnknown_8466C40:: @ 8466C40
-	.incbin "baserom.gba", 0x466C40, 0x18
-
-gUnknown_8466C58:: @ 8466C58
-	.incbin "baserom.gba", 0x466C58, 0xB8
-
-gUnknown_8466D10:: @ 8466D10
-	.incbin "baserom.gba", 0x466D10, 0x20
-
-gUnknown_8466D30:: @ 8466D30
-	.incbin "baserom.gba", 0x466D30, 0x30
-
-gUnknown_8466D60:: @ 8466D60
-	.incbin "baserom.gba", 0x466D60, 0x10
-
-gUnknown_8466D70:: @ 8466D70
-	.incbin "baserom.gba", 0x466D70, 0x20
-
-gUnknown_8466D90:: @ 8466D90
-	.incbin "baserom.gba", 0x466D90, 0x8
-
-gUnknown_8466D98:: @ 8466D98
-	.incbin "baserom.gba", 0x466D98, 0x8
-
-gUnknown_8466DA0:: @ 8466DA0
-	.incbin "baserom.gba", 0x466DA0, 0x8
-
-gUnknown_8466DA8:: @ 8466DA8
-	.incbin "baserom.gba", 0x466DA8, 0x8
-
-gUnknown_8466DB0:: @ 8466DB0
-	.incbin "baserom.gba", 0x466DB0, 0x8
-
-gUnknown_8466DB8:: @ 8466DB8
-	.incbin "baserom.gba", 0x466DB8, 0x8
-
-gUnknown_8466DC0:: @ 8466DC0
-	.incbin "baserom.gba", 0x466DC0, 0x8
-
-gUnknown_8466DC8:: @ 8466DC8
-	.incbin "baserom.gba", 0x466DC8, 0x8
-
-gUnknown_8466DD0:: @ 8466DD0
-	.incbin "baserom.gba", 0x466DD0, 0x18
-
-gUnknown_8466DE8:: @ 8466DE8
-	.incbin "baserom.gba", 0x466DE8, 0x18
-
-gUnknown_8466E00:: @ 8466E00
-	.incbin "baserom.gba", 0x466E00, 0x78
-
-gUnknown_8466E78:: @ 8466E78
-	.incbin "baserom.gba", 0x466E78, 0x18
-
-gUnknown_8466E90:: @ 8466E90
-	.incbin "baserom.gba", 0x466E90, 0x18
-
-gUnknown_8466EA8:: @ 8466EA8
-	.incbin "baserom.gba", 0x466EA8, 0x18
-
-gUnknown_8466EC0:: @ 8466EC0
-	.incbin "baserom.gba", 0x466EC0, 0x28
-
-gUnknown_8466EE8:: @ 8466EE8
-	.incbin "baserom.gba", 0x466EE8, 0x8
-
-gUnknown_8466EF0:: @ 8466EF0
-	.incbin "baserom.gba", 0x466EF0, 0x10
diff --git a/data/data_8468C98.s b/data/data_8468C98.s
index f850fe141..7ce7c3a02 100644
--- a/data/data_8468C98.s
+++ b/data/data_8468C98.s
@@ -1,50 +1,63 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
 	.section .rodata
 
 	.align 2
-gUnknown_8468C98:: @ 8468C98
-	.incbin "baserom.gba", 0x468C98, 0x520
-
-gUnknown_84691B8:: @ 84691B8
-	.incbin "baserom.gba", 0x4691B8, 0x20
+gUnknown_846AFE8:: @ 846AFE8
+	.incbin "graphics/misc/unk_846B008.gbapal"
 
-gUnknown_84691D8:: @ 84691D8
-	.incbin "baserom.gba", 0x4691D8, 0x800
+gUnknown_846B008:: @ 846B008
+	.incbin "graphics/misc/unk_846B008.4bpp.lz"
 
-gUnknown_84699D8:: @ 84699D8
-	.incbin "baserom.gba", 0x4699D8, 0x1520
+gUnknown_846B42C:: @ 846B42C
+	obj_tiles gUnknown_846B008, 0x0c00, 0x2000
+	null_obj_tiles
 
-gUnknown_846AEF8:: @ 846AEF8
-	.incbin "baserom.gba", 0x46AEF8, 0x4
+gUnknown_846B43C:: @ 846B43C
+	obj_pal gUnknown_846AFE8, 0x2000
+	null_obj_pal
 
-gUnknown_846AEFC:: @ 846AEFC
-	.incbin "baserom.gba", 0x46AEFC, 0x2C
+gUnknown_846B44C:: @ 846B44C
+	obj_image_anim_frame 0x00, 0
+	obj_image_anim_end
 
-gUnknown_846AF28:: @ 846AF28
-	.incbin "baserom.gba", 0x46AF28, 0x38
+gUnknown_846B454:: @ 846B454
+	obj_image_anim_frame 0x10, 0
+	obj_image_anim_end
 
-gUnknown_846AF60:: @ 846AF60
-	.incbin "baserom.gba", 0x46AF60, 0x18
+gUnknown_846B45C:: @ 846B45C
+	obj_image_anim_frame 0x20, 0
+	obj_image_anim_end
 
-gUnknown_846AF78:: @ 846AF78
-	.incbin "baserom.gba", 0x46AF78, 0x18
+gUnknown_846B464:: @ 846B464
+	obj_image_anim_frame 0x40, 0
+	obj_image_anim_end
 
-gUnknown_846AF90:: @ 846AF90
-	.incbin "baserom.gba", 0x46AF90, 0x40
+gUnknown_846B46C:: @ 846B46C
+	obj_image_anim_frame 0x30, 0
+	obj_image_anim_end
 
-gUnknown_846AFD0:: @ 846AFD0
-	.incbin "baserom.gba", 0x46AFD0, 0x45C
+gUnknown_846B474:: @ 846B474
+	obj_image_anim_frame 0x50, 0
+	obj_image_anim_end
 
-gUnknown_846B42C:: @ 846B42C
-	.incbin "baserom.gba", 0x46B42C, 0x10
-
-gUnknown_846B43C:: @ 846B43C
-	.incbin "baserom.gba", 0x46B43C, 0x58
+gUnknown_846B47C::
+	.4byte gUnknown_846B44C
+	.4byte gUnknown_846B454
+	.4byte gUnknown_846B45C
+	.4byte gUnknown_846B464
+	.4byte gUnknown_846B46C
+	.4byte gUnknown_846B474
 
 gUnknown_846B494:: @ 846B494
-	.incbin "baserom.gba", 0x46B494, 0x18
+	spr_template 0x2000, 0x2000, gOamData_83AC9D8, gUnknown_846B47C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_846B4AC:: @ 846B4AC
-	.incbin "baserom.gba", 0x46B4AC, 0x10
+	@ This is a 2D array with one row.
+	@ Why this was done this way is beyond me.
+	@ The data that follow this row are not at all function pointers.
+	.4byte sub_81477C0, sub_814784C, sub_81479D4, sub_8147A34
 
 gUnknown_846B4BC:: @ 846B4BC
 	.incbin "baserom.gba", 0x46B4BC, 0x190
@@ -125,10 +138,14 @@ gUnknown_846D953:: @ 846D953
 	.incbin "baserom.gba", 0x46D953, 0xD
 
 gUnknown_846D960:: @ 846D960
-	.incbin "baserom.gba", 0x46D960, 0x8
+	obj_tiles gUnknown_8479688, 0, 800
 
 gUnknown_846D968:: @ 846D968
-	.incbin "baserom.gba", 0x46D968, 0x40
+	obj_pal gUnknown_8479668, 800
+
+gUnknown_846D970::
+	.2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0002, 0x0006
+	.2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006, 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006
 
 gUnknown_846D9A8:: @ 846D9A8
 	.incbin "baserom.gba", 0x46D9A8, 0x2C
@@ -279,45 +296,3 @@ gUnknown_846F488:: @ 846F488
 
 gUnknown_846F4B8:: @ 846F4B8
 	.incbin "baserom.gba", 0x46F4B8, 0x18
-
-gUnknown_846F4D0:: @ 846F4D0
-	.incbin "baserom.gba", 0x46F4D0, 0x200
-
-gUnknown_846F6D0:: @ 846F6D0
-	.incbin "baserom.gba", 0x46F6D0, 0x210
-
-gUnknown_846F8E0:: @ 846F8E0
-	.incbin "baserom.gba", 0x46F8E0, 0x194
-
-gUnknown_846FA74:: @ 846FA74
-	.incbin "baserom.gba", 0x46FA74, 0x8
-
-gUnknown_846FA7C:: @ 846FA7C
-	.incbin "baserom.gba", 0x46FA7C, 0x30
-
-gUnknown_846FAAC:: @ 846FAAC
-	.incbin "baserom.gba", 0x46FAAC, 0x14
-
-gUnknown_846FAC0:: @ 846FAC0
-	.incbin "baserom.gba", 0x46FAC0, 0x48
-
-gUnknown_846FB08:: @ 846FB08
-	.incbin "baserom.gba", 0x46FB08, 0x4
-
-gUnknown_846FB0C:: @ 846FB0C
-	.incbin "baserom.gba", 0x46FB0C, 0x1000
-
-gUnknown_8470B0C:: @ 8470B0C
-	.incbin "baserom.gba", 0x470B0C, 0xF40
-
-gUnknown_8471A4C:: @ 8471A4C
-	.incbin "baserom.gba", 0x471A4C, 0x120
-
-gUnknown_8471B6C:: @ 8471B6C
-	.incbin "baserom.gba", 0x471B6C, 0x280
-
-gUnknown_8471DEC:: @ 8471DEC
-	.incbin "baserom.gba", 0x471DEC, 0xA0
-
-gUnknown_8471E8C:: @ 8471E8C
-	.incbin "baserom.gba", 0x471E8C, 0x50
diff --git a/data/data_8471F00.s b/data/data_8471F00.s
index 6733b3f4d..364b5458d 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F00.s
@@ -215,165 +215,88 @@ gUnknown_84791E8:: @ 84791E8
 gUnknown_84792D0:: @ 84792D0
 	.incbin "baserom.gba", 0x4792D0, 0x10
 
-gUnknown_84792E0:: @ 84792E0
-	.incbin "baserom.gba", 0x4792E0, 0x10
-
-gUnknown_84792F0:: @ 84792F0
-	.incbin "baserom.gba", 0x4792F0, 0x50
-
-gUnknown_8479340:: @ 8479340
-	.incbin "baserom.gba", 0x479340, 0x28
-
-gUnknown_8479368:: @ 8479368
-	.incbin "baserom.gba", 0x479368, 0x18
-
-gUnknown_8479380:: @ 8479380
-	.incbin "baserom.gba", 0x479380, 0x10
-
-gUnknown_8479390:: @ 8479390
-	.incbin "baserom.gba", 0x479390, 0x1B8
-
-gUnknown_8479548:: @ 8479548
-	.incbin "baserom.gba", 0x479548, 0x18
-
-gUnknown_8479560:: @ 8479560
-	.incbin "baserom.gba", 0x479560, 0x18
-
-gUnknown_8479578:: @ 8479578
-	.incbin "baserom.gba", 0x479578, 0x18
-
-gUnknown_8479590:: @ 8479590
-	.incbin "baserom.gba", 0x479590, 0x28
-
-gUnknown_84795B8:: @ 84795B8
-	.incbin "baserom.gba", 0x4795B8, 0x10
-
-gUnknown_84795C8:: @ 84795C8
-	.incbin "baserom.gba", 0x4795C8, 0x90
-
-gUnknown_8479658:: @ 8479658
-	.incbin "baserom.gba", 0x479658, 0x600
-
-gUnknown_8479C58:: @ 8479C58
-	.incbin "baserom.gba", 0x479C58, 0x30
-
-gUnknown_8479C88:: @ 8479C88
-	.incbin "baserom.gba", 0x479C88, 0x38
-
-gUnknown_8479CC0:: @ 8479CC0
-	.incbin "baserom.gba", 0x479CC0, 0x18
+	.section .rodata.8479668
 
 	.align 2
-gUnknown_8479CD8:: @ 8479CD8
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c"
+gUnknown_8479668:: @ 8479668
+	.incbin "graphics/misc/unk_8479688.gbapal"
 
-	.align 2
-gUnknown_8479D10:: @ 8479D10
-	.asciz "ttdata->dummy == 0"
-
-	.align 2
-gUnknown_8479D24:: @ 8479D24
-	.asciz "ttdata->id == 0"
+gUnknown_8479688::
+	.incbin "graphics/misc/unk_8479688.4bpp.lz"
 
-	// trainer_tower
+gUnknown_8479748::
+	.incbin "graphics/misc/unk_8479748.4bpp.lz"
 
 	.section .rodata.after_trainer_tower
 
-	// unk_815F138
-
-gUnknown_847A328::
-	.incbin "data/graphics/unk_847a348.gbapal"
-
-gUnknown_847A348::
-	.incbin "data/graphics/unk_847a348.4bpp.lz"
-
-gUnknown_847A79C:: @ 847A79C
-	obj_tiles gUnknown_847A348, 0xE00, 0
-
-gUnknown_847A7A4:: @ 847A7A4
-	obj_pal gUnknown_847A328, 0
-
-gOamData_847A7AC::
-	.4byte 0x80000300, 0x00000000
-
-gOamData_847A7B4::
-	.4byte 0xc0004000, 0x00000000
-
-gUnknown_847A7BC::
-	obj_image_anim_frame  0, 1
-	obj_image_anim_end
-
-gUnknown_847A7C4::
-	obj_image_anim_frame 16, 1
-	obj_image_anim_end
-
-gUnknown_847A7CC::
-	obj_image_anim_frame 32, 1
-	obj_image_anim_end
-
-gUnknown_847A7D4::
-	.4byte gUnknown_847A7BC
-	.4byte gUnknown_847A7C4
-	.4byte gUnknown_847A7CC
-
-gUnknown_847A7E0::
-	obj_image_anim_frame 48, 1
-	obj_image_anim_end
-
-gUnknown_847A7E8::
-	obj_image_anim_frame 80, 1
-	obj_image_anim_end
-
-gUnknown_847A7F0::
-	.4byte gUnknown_847A7E0
-	.4byte gUnknown_847A7E8
-
-gUnknown_847A7F8::
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_847A808::
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame  0x10, -0x10, 0, 8
-	obj_rot_scal_anim_end
-
-gUnknown_847A820::
-	obj_rot_scal_anim_frame -0x12,  0x12, 0, 8
-	obj_rot_scal_anim_end
-
-gUnknown_847A830::
-	obj_rot_scal_anim_frame   0x6,  -0x6, 0, 8
-	obj_rot_scal_anim_frame  -0x4,   0x4, 0, 8
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_847A850::
-	.4byte gUnknown_847A7F8
-	.4byte gUnknown_847A808
-	.4byte gUnknown_847A820
-	.4byte gUnknown_847A830
-
-gUnknown_847A860:: @ 847A860
-	spr_template 0, 0, gOamData_847A7AC, gUnknown_847A7D4, NULL, gUnknown_847A850, SpriteCallbackDummy
-
-gUnknown_847A878:: @ 847A878
-	spr_template 0, 0, gOamData_847A7B4, gUnknown_847A7F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
 	// berry_fix_program
 
-gUnknown_847A890:: @ 847A890
-	.4byte gUnknown_8EA467C, gUnknown_8EA52B8, gUnknown_8EA463C
-	.4byte gUnknown_8EA5664, gUnknown_8EA60C8, gUnknown_8EA5604
-	.4byte gUnknown_8EA6408, gUnknown_8EA7028, gUnknown_8EA63C8
-	.4byte gUnknown_8EA7320, gUnknown_8EA8118, gUnknown_8EA72E0
-	.4byte gUnknown_8EA8408, gUnknown_8EA8CC8, gUnknown_8EA83C8
-	.4byte gUnknown_8EA8F40, gUnknown_8EA9588, gUnknown_8EA8F00
-
-	.incbin "baserom.gba", 0x47A8D8, 0x2D4
+gUnknown_847A8D8::
+	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
+
+gUnknown_847A8FA::
+	.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
+
+gUnknown_847A913::
+	.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+
+gUnknown_847A934::
+	.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+	.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$"
+	.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$"
+	.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
+	.string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
+	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$"
+	.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$"
+	.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+	.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+	.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
+	.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
+	.string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$"
+	.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
+	.string "ABCDE$"
+	.string "FGHIJ$"
+	.string "KLMNO$"
+	.string "PQRST$"
+	.string "UVWXY$"
+	.string "Z    $"
+	.string "01234$"
+	.string "56789$"
+	.string ".,!? $"
+	.string "-/&… $"
+	.string "abcde$"
+	.string "fghij$"
+	.string "klmno$"
+	.string "pqrst$"
+	.string "uvwxy$"
+	.string "z    $"
+	.string "01234$"
+	.string "56789$"
+	.string ".,!? $"
+	.string "-/&… $"
+	.string "$"
+	.string "$"
+	.string "$"
+	.string "$"
+	.string "$"
+	.string "$"
+	.string "$"
+	.string "$"
+	.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
+	.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
+	.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
+	.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
+	.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
+	.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
+	.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
+	.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
+	.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
+	.string "{EXTRA 210}{EXTRA 208}ょ: $"
 
 	// trainer_tower (again?)
 
 	@ 847ABAC
+.align 2
 	.include "data/trainer_tower/trainers.inc"
 
 	.align 2
@@ -418,5 +341,359 @@ gUnknown_84827B4:: @ 84827B4
 
 	.include "data/text/move_descriptions.inc"
 
+	.align 2, 0
 gUnknown_84886E8:: @ 84886E8
-	.incbin "baserom.gba", 0x4886E8, 0x588
+	.4byte gMoveDescription_Pound
+	.4byte gMoveDescription_KarateChop
+	.4byte gMoveDescription_DoubleSlap
+	.4byte gMoveDescription_CometPunch
+	.4byte gMoveDescription_MegaPunch
+	.4byte gMoveDescription_PayDay
+	.4byte gMoveDescription_FirePunch
+	.4byte gMoveDescription_IcePunch
+	.4byte gMoveDescription_ThunderPunch
+	.4byte gMoveDescription_Scratch
+	.4byte gMoveDescription_ViceGrip
+	.4byte gMoveDescription_Guillotine
+	.4byte gMoveDescription_RazorWind
+	.4byte gMoveDescription_SwordsDance
+	.4byte gMoveDescription_Cut
+	.4byte gMoveDescription_Gust
+	.4byte gMoveDescription_WingAttack
+	.4byte gMoveDescription_Whirlwind
+	.4byte gMoveDescription_Fly
+	.4byte gMoveDescription_Bind
+	.4byte gMoveDescription_Slam
+	.4byte gMoveDescription_VineWhip
+	.4byte gMoveDescription_Stomp
+	.4byte gMoveDescription_DoubleKick
+	.4byte gMoveDescription_MegaKick
+	.4byte gMoveDescription_JumpKick
+	.4byte gMoveDescription_RollingKick
+	.4byte gMoveDescription_SandAttack
+	.4byte gMoveDescription_Headbutt
+	.4byte gMoveDescription_HornAttack
+	.4byte gMoveDescription_FuryAttack
+	.4byte gMoveDescription_HornDrill
+	.4byte gMoveDescription_Tackle
+	.4byte gMoveDescription_BodySlam
+	.4byte gMoveDescription_Wrap
+	.4byte gMoveDescription_TakeDown
+	.4byte gMoveDescription_Thrash
+	.4byte gMoveDescription_DoubleEdge
+	.4byte gMoveDescription_TailWhip
+	.4byte gMoveDescription_PoisonSting
+	.4byte gMoveDescription_Twineedle
+	.4byte gMoveDescription_PinMissile
+	.4byte gMoveDescription_Leer
+	.4byte gMoveDescription_Bite
+	.4byte gMoveDescription_Growl
+	.4byte gMoveDescription_Roar
+	.4byte gMoveDescription_Sing
+	.4byte gMoveDescription_Supersonic
+	.4byte gMoveDescription_SonicBoom
+	.4byte gMoveDescription_Disable
+	.4byte gMoveDescription_Acid
+	.4byte gMoveDescription_Ember
+	.4byte gMoveDescription_Flamethrower
+	.4byte gMoveDescription_Mist
+	.4byte gMoveDescription_WaterGun
+	.4byte gMoveDescription_HydroPump
+	.4byte gMoveDescription_Surf
+	.4byte gMoveDescription_IceBeam
+	.4byte gMoveDescription_Blizzard
+	.4byte gMoveDescription_Psybeam
+	.4byte gMoveDescription_BubbleBeam
+	.4byte gMoveDescription_AuroraBeam
+	.4byte gMoveDescription_HyperBeam
+	.4byte gMoveDescription_Peck
+	.4byte gMoveDescription_DrillPeck
+	.4byte gMoveDescription_Submission
+	.4byte gMoveDescription_LowKick
+	.4byte gMoveDescription_Counter
+	.4byte gMoveDescription_SeismicToss
+	.4byte gMoveDescription_Strength
+	.4byte gMoveDescription_Absorb
+	.4byte gMoveDescription_MegaDrain
+	.4byte gMoveDescription_LeechSeed
+	.4byte gMoveDescription_Growth
+	.4byte gMoveDescription_RazorLeaf
+	.4byte gMoveDescription_SolarBeam
+	.4byte gMoveDescription_PoisonPowder
+	.4byte gMoveDescription_StunSpore
+	.4byte gMoveDescription_SleepPowder
+	.4byte gMoveDescription_PetalDance
+	.4byte gMoveDescription_StringShot
+	.4byte gMoveDescription_DragonRage
+	.4byte gMoveDescription_FireSpin
+	.4byte gMoveDescription_ThunderShock
+	.4byte gMoveDescription_Thunderbolt
+	.4byte gMoveDescription_ThunderWave
+	.4byte gMoveDescription_Thunder
+	.4byte gMoveDescription_RockThrow
+	.4byte gMoveDescription_Earthquake
+	.4byte gMoveDescription_Fissure
+	.4byte gMoveDescription_Dig
+	.4byte gMoveDescription_Toxic
+	.4byte gMoveDescription_Confusion
+	.4byte gMoveDescription_Psychic
+	.4byte gMoveDescription_Hypnosis
+	.4byte gMoveDescription_Meditate
+	.4byte gMoveDescription_Agility
+	.4byte gMoveDescription_QuickAttack
+	.4byte gMoveDescription_Rage
+	.4byte gMoveDescription_Teleport
+	.4byte gMoveDescription_NightShade
+	.4byte gMoveDescription_Mimic
+	.4byte gMoveDescription_Screech
+	.4byte gMoveDescription_DoubleTeam
+	.4byte gMoveDescription_Recover
+	.4byte gMoveDescription_Harden
+	.4byte gMoveDescription_Minimize
+	.4byte gMoveDescription_Smokescreen
+	.4byte gMoveDescription_ConfuseRay
+	.4byte gMoveDescription_Withdraw
+	.4byte gMoveDescription_DefenseCurl
+	.4byte gMoveDescription_Barrier
+	.4byte gMoveDescription_LightScreen
+	.4byte gMoveDescription_Haze
+	.4byte gMoveDescription_Reflect
+	.4byte gMoveDescription_FocusEnergy
+	.4byte gMoveDescription_Bide
+	.4byte gMoveDescription_Metronome
+	.4byte gMoveDescription_MirrorMove
+	.4byte gMoveDescription_SelfDestruct
+	.4byte gMoveDescription_EggBomb
+	.4byte gMoveDescription_Lick
+	.4byte gMoveDescription_Smog
+	.4byte gMoveDescription_Sludge
+	.4byte gMoveDescription_BoneClub
+	.4byte gMoveDescription_FireBlast
+	.4byte gMoveDescription_Waterfall
+	.4byte gMoveDescription_Clamp
+	.4byte gMoveDescription_Swift
+	.4byte gMoveDescription_SkullBash
+	.4byte gMoveDescription_SpikeCannon
+	.4byte gMoveDescription_Constrict
+	.4byte gMoveDescription_Amnesia
+	.4byte gMoveDescription_Kinesis
+	.4byte gMoveDescription_SoftBoiled
+	.4byte gMoveDescription_HiJumpKick
+	.4byte gMoveDescription_Glare
+	.4byte gMoveDescription_DreamEater
+	.4byte gMoveDescription_PoisonGas
+	.4byte gMoveDescription_Barrage
+	.4byte gMoveDescription_LeechLife
+	.4byte gMoveDescription_LovelyKiss
+	.4byte gMoveDescription_SkyAttack
+	.4byte gMoveDescription_Transform
+	.4byte gMoveDescription_Bubble
+	.4byte gMoveDescription_DizzyPunch
+	.4byte gMoveDescription_Spore
+	.4byte gMoveDescription_Flash
+	.4byte gMoveDescription_Psywave
+	.4byte gMoveDescription_Splash
+	.4byte gMoveDescription_AcidArmor
+	.4byte gMoveDescription_Crabhammer
+	.4byte gMoveDescription_Explosion
+	.4byte gMoveDescription_FurySwipes
+	.4byte gMoveDescription_Bonemerang
+	.4byte gMoveDescription_Rest
+	.4byte gMoveDescription_RockSlide
+	.4byte gMoveDescription_HyperFang
+	.4byte gMoveDescription_Sharpen
+	.4byte gMoveDescription_Conversion
+	.4byte gMoveDescription_TriAttack
+	.4byte gMoveDescription_SuperFang
+	.4byte gMoveDescription_Slash
+	.4byte gMoveDescription_Substitute
+	.4byte gMoveDescription_Struggle
+	.4byte gMoveDescription_Sketch
+	.4byte gMoveDescription_TripleKick
+	.4byte gMoveDescription_Thief
+	.4byte gMoveDescription_SpiderWeb
+	.4byte gMoveDescription_MindReader
+	.4byte gMoveDescription_Nightmare
+	.4byte gMoveDescription_FlameWheel
+	.4byte gMoveDescription_Snore
+	.4byte gMoveDescription_Curse
+	.4byte gMoveDescription_Flail
+	.4byte gMoveDescription_Conversion2
+	.4byte gMoveDescription_Aeroblast
+	.4byte gMoveDescription_CottonSpore
+	.4byte gMoveDescription_Reversal
+	.4byte gMoveDescription_Spite
+	.4byte gMoveDescription_PowderSnow
+	.4byte gMoveDescription_Protect
+	.4byte gMoveDescription_MachPunch
+	.4byte gMoveDescription_ScaryFace
+	.4byte gMoveDescription_FaintAttack
+	.4byte gMoveDescription_SweetKiss
+	.4byte gMoveDescription_BellyDrum
+	.4byte gMoveDescription_SludgeBomb
+	.4byte gMoveDescription_MudSlap
+	.4byte gMoveDescription_Octazooka
+	.4byte gMoveDescription_Spikes
+	.4byte gMoveDescription_ZapCannon
+	.4byte gMoveDescription_Foresight
+	.4byte gMoveDescription_DestinyBond
+	.4byte gMoveDescription_PerishSong
+	.4byte gMoveDescription_IcyWind
+	.4byte gMoveDescription_Detect
+	.4byte gMoveDescription_BoneRush
+	.4byte gMoveDescription_LockOn
+	.4byte gMoveDescription_Outrage
+	.4byte gMoveDescription_Sandstorm
+	.4byte gMoveDescription_GigaDrain
+	.4byte gMoveDescription_Endure
+	.4byte gMoveDescription_Charm
+	.4byte gMoveDescription_Rollout
+	.4byte gMoveDescription_FalseSwipe
+	.4byte gMoveDescription_Swagger
+	.4byte gMoveDescription_MilkDrink
+	.4byte gMoveDescription_Spark
+	.4byte gMoveDescription_FuryCutter
+	.4byte gMoveDescription_SteelWing
+	.4byte gMoveDescription_MeanLook
+	.4byte gMoveDescription_Attract
+	.4byte gMoveDescription_SleepTalk
+	.4byte gMoveDescription_HealBell
+	.4byte gMoveDescription_Return
+	.4byte gMoveDescription_Present
+	.4byte gMoveDescription_Frustration
+	.4byte gMoveDescription_Safeguard
+	.4byte gMoveDescription_PainSplit
+	.4byte gMoveDescription_SacredFire
+	.4byte gMoveDescription_Magnitude
+	.4byte gMoveDescription_DynamicPunch
+	.4byte gMoveDescription_Megahorn
+	.4byte gMoveDescription_DragonBreath
+	.4byte gMoveDescription_BatonPass
+	.4byte gMoveDescription_Encore
+	.4byte gMoveDescription_Pursuit
+	.4byte gMoveDescription_RapidSpin
+	.4byte gMoveDescription_SweetScent
+	.4byte gMoveDescription_IronTail
+	.4byte gMoveDescription_MetalClaw
+	.4byte gMoveDescription_VitalThrow
+	.4byte gMoveDescription_MorningSun
+	.4byte gMoveDescription_Synthesis
+	.4byte gMoveDescription_Moonlight
+	.4byte gMoveDescription_HiddenPower
+	.4byte gMoveDescription_CrossChop
+	.4byte gMoveDescription_Twister
+	.4byte gMoveDescription_RainDance
+	.4byte gMoveDescription_SunnyDay
+	.4byte gMoveDescription_Crunch
+	.4byte gMoveDescription_MirrorCoat
+	.4byte gMoveDescription_PsychUp
+	.4byte gMoveDescription_ExtremeSpeed
+	.4byte gMoveDescription_AncientPower
+	.4byte gMoveDescription_ShadowBall
+	.4byte gMoveDescription_FutureSight
+	.4byte gMoveDescription_RockSmash
+	.4byte gMoveDescription_Whirlpool
+	.4byte gMoveDescription_BeatUp
+	.4byte gMoveDescription_FakeOut
+	.4byte gMoveDescription_Uproar
+	.4byte gMoveDescription_Stockpile
+	.4byte gMoveDescription_SpitUp
+	.4byte gMoveDescription_Swallow
+	.4byte gMoveDescription_HeatWave
+	.4byte gMoveDescription_Hail
+	.4byte gMoveDescription_Torment
+	.4byte gMoveDescription_Flatter
+	.4byte gMoveDescription_WillOWisp
+	.4byte gMoveDescription_Memento
+	.4byte gMoveDescription_Facade
+	.4byte gMoveDescription_FocusPunch
+	.4byte gMoveDescription_SmellingSalt
+	.4byte gMoveDescription_FollowMe
+	.4byte gMoveDescription_NaturePower
+	.4byte gMoveDescription_Charge
+	.4byte gMoveDescription_Taunt
+	.4byte gMoveDescription_HelpingHand
+	.4byte gMoveDescription_Trick
+	.4byte gMoveDescription_RolePlay
+	.4byte gMoveDescription_Wish
+	.4byte gMoveDescription_Assist
+	.4byte gMoveDescription_Ingrain
+	.4byte gMoveDescription_Superpower
+	.4byte gMoveDescription_MagicCoat
+	.4byte gMoveDescription_Recycle
+	.4byte gMoveDescription_Revenge
+	.4byte gMoveDescription_BrickBreak
+	.4byte gMoveDescription_Yawn
+	.4byte gMoveDescription_KnockOff
+	.4byte gMoveDescription_Endeavor
+	.4byte gMoveDescription_Eruption
+	.4byte gMoveDescription_SkillSwap
+	.4byte gMoveDescription_Imprison
+	.4byte gMoveDescription_Refresh
+	.4byte gMoveDescription_Grudge
+	.4byte gMoveDescription_Snatch
+	.4byte gMoveDescription_SecretPower
+	.4byte gMoveDescription_Dive
+	.4byte gMoveDescription_ArmThrust
+	.4byte gMoveDescription_Camouflage
+	.4byte gMoveDescription_TailGlow
+	.4byte gMoveDescription_LusterPurge
+	.4byte gMoveDescription_MistBall
+	.4byte gMoveDescription_FeatherDance
+	.4byte gMoveDescription_TeeterDance
+	.4byte gMoveDescription_BlazeKick
+	.4byte gMoveDescription_MudSport
+	.4byte gMoveDescription_IceBall
+	.4byte gMoveDescription_NeedleArm
+	.4byte gMoveDescription_SlackOff
+	.4byte gMoveDescription_HyperVoice
+	.4byte gMoveDescription_PoisonFang
+	.4byte gMoveDescription_CrushClaw
+	.4byte gMoveDescription_BlastBurn
+	.4byte gMoveDescription_HydroCannon
+	.4byte gMoveDescription_MeteorMash
+	.4byte gMoveDescription_Astonish
+	.4byte gMoveDescription_WeatherBall
+	.4byte gMoveDescription_Aromatherapy
+	.4byte gMoveDescription_FakeTears
+	.4byte gMoveDescription_AirCutter
+	.4byte gMoveDescription_Overheat
+	.4byte gMoveDescription_OdorSleuth
+	.4byte gMoveDescription_RockTomb
+	.4byte gMoveDescription_SilverWind
+	.4byte gMoveDescription_MetalSound
+	.4byte gMoveDescription_GrassWhistle
+	.4byte gMoveDescription_Tickle
+	.4byte gMoveDescription_CosmicPower
+	.4byte gMoveDescription_WaterSpout
+	.4byte gMoveDescription_SignalBeam
+	.4byte gMoveDescription_ShadowPunch
+	.4byte gMoveDescription_Extrasensory
+	.4byte gMoveDescription_SkyUppercut
+	.4byte gMoveDescription_SandTomb
+	.4byte gMoveDescription_SheerCold
+	.4byte gMoveDescription_MuddyWater
+	.4byte gMoveDescription_BulletSeed
+	.4byte gMoveDescription_AerialAce
+	.4byte gMoveDescription_IcicleSpear
+	.4byte gMoveDescription_IronDefense
+	.4byte gMoveDescription_Block
+	.4byte gMoveDescription_Howl
+	.4byte gMoveDescription_DragonClaw
+	.4byte gMoveDescription_FrenzyPlant
+	.4byte gMoveDescription_BulkUp
+	.4byte gMoveDescription_Bounce
+	.4byte gMoveDescription_MudShot
+	.4byte gMoveDescription_PoisonTail
+	.4byte gMoveDescription_Covet
+	.4byte gMoveDescription_VoltTackle
+	.4byte gMoveDescription_MagicalLeaf
+	.4byte gMoveDescription_WaterSport
+	.4byte gMoveDescription_CalmMind
+	.4byte gMoveDescription_LeafBlade
+	.4byte gMoveDescription_DragonDance
+	.4byte gMoveDescription_RockBlast
+	.4byte gMoveDescription_ShockWave
+	.4byte gMoveDescription_WaterPulse
+	.4byte gMoveDescription_DoomDesire
+	.4byte gMoveDescription_PsychoBoost
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 9baa201e5..7f03adfc2 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,3 +1,19 @@
+#include "constants/flags.h"
+#include "constants/decorations.h"
+#include "constants/items.h"
+#include "constants/layouts.h"
+#include "constants/maps.h"
+#include "constants/moves.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+#include "constants/trainer_classes.h"
+#include "constants/vars.h"
+#include "constants/battle.h"
+#include "constants/spawn_points.h"
+	.include "asm/macros.inc"
+	.include "asm/macros/event.inc"
+@	.include "constants/constants.inc"
+
 	.section script_data, "aw", %progbits
 
     .include "data/script_cmd_table.inc"
@@ -30,448 +46,16 @@ gSpecialVars:: @ 815FD0C
 
     .align 2
 gStdScripts:: @ 8160450
-	.4byte gStdScript_81A667B
-	.4byte gStdScript_81A67B3
-	.4byte gStdScript_81A4E3F
-	.4byte gStdScript_81A4E4A
-	.4byte gStdScript_81A4E54
-	.4byte gStdScript_81A4E5C
-	.4byte gStdScript_81A501F
-	.4byte gStdScript_81A676C
-	.4byte gStdScript_81A8E58
-	.4byte gStdScript_81A4E66
-gStdScripts_End::
-
-gUnknown_8160478:: @ 8160478
-	.incbin "baserom.gba", 0x160478, 0x886C
-
-gUnknown_8168CE4:: @ 8168CE4
-	.incbin "baserom.gba", 0x168CE4, 0x33
-
-gUnknown_8168D17:: @ 8168D17
-	.incbin "baserom.gba", 0x168D17, 0x3C128
-
-gStdScript_81A4E3F::
-    .incbin "baserom.gba", 0x1A4E3F, 0xB
-
-gStdScript_81A4E4A::
-    .incbin "baserom.gba", 0x1A4E4A, 0xA
-
-gStdScript_81A4E54::
-    .incbin "baserom.gba", 0x1A4E54, 0x8
-
-gStdScript_81A4E5C::
-    .incbin "baserom.gba", 0x1A4E5C, 0xA
-
-gStdScript_81A4E66::
-    .incbin "baserom.gba", 0x1A4E66, 0x4E
-
-gUnknown_81A4EB4:: @ 81A4EB4
-	.incbin "baserom.gba", 0x1A4EB4, 0xD
-
-gUnknown_81A4EC1:: @ 81A4EC1
-	.incbin "baserom.gba", 0x1A4EC1, 0x28
-
-gUnknown_81A4EE9:: @ 81A4EE9
-	.incbin "baserom.gba", 0x1A4EE9, 0x38
-
-gUnknown_81A4F21:: @ 81A4F21
-	.incbin "baserom.gba", 0x1A4F21, 0x1D
-
-gUnknown_81A4F3E:: @ 81A4F3E
-	.incbin "baserom.gba", 0x1A4F3E, 0x35
-
-gUnknown_81A4F73:: @ 81A4F73
-	.incbin "baserom.gba", 0x1A4F73, 0xAC
-
-gStdScript_81A501F::
-    .incbin "baserom.gba", 0x1A501F, 0x6B
-
-gUnknown_81A508A:: @ 81A508A
-	.incbin "baserom.gba", 0x1A508A, 0x3EC
-
-gUnknown_81A5476:: @ 81A5476
-	.incbin "baserom.gba", 0x1A5476, 0x100B
-
-gUnknown_81A6481:: @ 81A6481
-	.incbin "baserom.gba", 0x1A6481, 0xCA
-
-gUnknown_81A654B:: @ 81A654B
-	.incbin "baserom.gba", 0x1A654B, 0x130
-
-gStdScript_81A667B::
-    .incbin "baserom.gba", 0x1A667B, 0xF1
-
-gStdScript_81A676C::
-    .incbin "baserom.gba", 0x1A676C, 0x47
-
-gStdScript_81A67B3::
-    .incbin "baserom.gba", 0x1A67B3, 0x90
-
-gUnknown_81A6843:: @ 81A6843
-	.incbin "baserom.gba", 0x1A6843, 0x112
-
-gUnknown_81A6955:: @ 81A6955
-	.incbin "baserom.gba", 0x1A6955, 0x173
-
-gUnknown_81A6AC8:: @ 81A6AC8
-	.incbin "baserom.gba", 0x1A6AC8, 0x45
-
-gUnknown_81A6B0D:: @ 81A6B0D
-	.incbin "baserom.gba", 0x1A6B0D, 0x125
-
-gUnknown_81A6C32:: @ 81A6C32
-	.incbin "baserom.gba", 0x1A6C32, 0xE5
-
-gUnknown_81A6D17:: @ 81A6D17
-	.incbin "baserom.gba", 0x1A6D17, 0x56
-
-gUnknown_81A6D6D:: @ 81A6D6D
-	.incbin "baserom.gba", 0x1A6D6D, 0x72
-
-gUnknown_81A6DDF:: @ 81A6DDF
-	.incbin "baserom.gba", 0x1A6DDF, 0x57
-
-gUnknown_81A6E36:: @ 81A6E36
-	.incbin "baserom.gba", 0x1A6E36, 0x6E
-
-gUnknown_81A6EA4:: @ 81A6EA4
-	.incbin "baserom.gba", 0x1A6EA4, 0x67
-
-gUnknown_81A6F0B:: @ 81A6F0B
-	.incbin "baserom.gba", 0x1A6F0B, 0x66
-
-gUnknown_81A6F71:: @ 81A6F71
-	.incbin "baserom.gba", 0x1A6F71, 0x3A
-
-gUnknown_81A6FAB:: @ 81A6FAB
-	.incbin "baserom.gba", 0x1A6FAB, 0x46
-
-gUnknown_81A6FF1:: @ 81A6FF1
-	.incbin "baserom.gba", 0x1A6FF1, 0x40
-
-gUnknown_81A7031:: @ 81A7031
-	.incbin "baserom.gba", 0x1A7031, 0x32
-
-gUnknown_81A7063:: @ 81A7063
-	.incbin "baserom.gba", 0x1A7063, 0x42
-
-gUnknown_81A70A5:: @ 81A70A5
-	.incbin "baserom.gba", 0x1A70A5, 0x33
-
-gUnknown_81A70D8:: @ 81A70D8
-	.incbin "baserom.gba", 0x1A70D8, 0x30
-
-gUnknown_81A7108:: @ 81A7108
-	.incbin "baserom.gba", 0x1A7108, 0x2F
-
-gUnknown_81A7137:: @ 81A7137
-	.incbin "baserom.gba", 0x1A7137, 0x3E
-
-gUnknown_81A7175:: @ 81A7175
-	.incbin "baserom.gba", 0x1A7175, 0x491
-
-gUnknown_81A7606:: @ 81A7606
-	.incbin "baserom.gba", 0x1A7606, 0x9
-
-gUnknown_81A760F:: @ 81A760F
-	.incbin "baserom.gba", 0x1A760F, 0x9
-
-gUnknown_81A7618:: @ 81A7618
-	.incbin "baserom.gba", 0x1A7618, 0x9
-
-gUnknown_81A7621:: @ 81A7621
-	.incbin "baserom.gba", 0x1A7621, 0x9
-
-gUnknown_81A762A:: @ 81A762A
-	.incbin "baserom.gba", 0x1A762A, 0x9
-
-gUnknown_81A7633:: @ 81A7633
-	.incbin "baserom.gba", 0x1A7633, 0x9
-
-gUnknown_81A763C:: @ 81A763C
-	.incbin "baserom.gba", 0x1A763C, 0x9
-
-gUnknown_81A7645:: @ 81A7645
-	.incbin "baserom.gba", 0x1A7645, 0x9
-
-gUnknown_81A764E:: @ 81A764E
-	.incbin "baserom.gba", 0x1A764E, 0x9
-
-gUnknown_81A7657:: @ 81A7657
-	.incbin "baserom.gba", 0x1A7657, 0x9
-
-gUnknown_81A7660:: @ 81A7660
-	.incbin "baserom.gba", 0x1A7660, 0x9
-
-gUnknown_81A7669:: @ 81A7669
-	.incbin "baserom.gba", 0x1A7669, 0x9
-
-gUnknown_81A7672:: @ 81A7672
-	.incbin "baserom.gba", 0x1A7672, 0x9
-
-gUnknown_81A767B:: @ 81A767B
-	.incbin "baserom.gba", 0x1A767B, 0x9
-
-gUnknown_81A7684:: @ 81A7684
-	.incbin "baserom.gba", 0x1A7684, 0x9
-
-gUnknown_81A768D:: @ 81A768D
-	.incbin "baserom.gba", 0x1A768D, 0x9
-
-gUnknown_81A7696:: @ 81A7696
-	.incbin "baserom.gba", 0x1A7696, 0x9
-
-gUnknown_81A769F:: @ 81A769F
-	.incbin "baserom.gba", 0x1A769F, 0x9
-
-gUnknown_81A76A8:: @ 81A76A8
-	.incbin "baserom.gba", 0x1A76A8, 0x9
-
-gUnknown_81A76B1:: @ 81A76B1
-	.incbin "baserom.gba", 0x1A76B1, 0x9
-
-gUnknown_81A76BA:: @ 81A76BA
-	.incbin "baserom.gba", 0x1A76BA, 0x9
-
-gUnknown_81A76C3:: @ 81A76C3
-	.incbin "baserom.gba", 0x1A76C3, 0x9
-
-gUnknown_81A76CC:: @ 81A76CC
-	.incbin "baserom.gba", 0x1A76CC, 0x9
-
-gUnknown_81A76D5:: @ 81A76D5
-	.incbin "baserom.gba", 0x1A76D5, 0x9
-
-gUnknown_81A76DE:: @ 81A76DE
-	.incbin "baserom.gba", 0x1A76DE, 0x9
-
-gUnknown_81A76E7:: @ 81A76E7
-	.incbin "baserom.gba", 0x1A76E7, 0x9
-
-gUnknown_81A76F0:: @ 81A76F0
-	.incbin "baserom.gba", 0x1A76F0, 0x9
-
-gUnknown_81A76F9:: @ 81A76F9
-	.incbin "baserom.gba", 0x1A76F9, 0x9
-
-gUnknown_81A7702:: @ 81A7702
-	.incbin "baserom.gba", 0x1A7702, 0x9E
-
-gUnknown_81A77A0:: @ 81A77A0
-	.incbin "baserom.gba", 0x1A77A0, 0x33B
-
-gUnknown_81A7ADB:: @ 81A7ADB
-	.incbin "baserom.gba", 0x1A7ADB, 0x5
-
-gUnknown_81A7AE0:: @ 81A7AE0
-	.incbin "baserom.gba", 0x1A7AE0, 0x120D
-
-gUnknown_81A8CED:: @ 81A8CED
-	.incbin "baserom.gba", 0x1A8CED, 0x5C
-
-gUnknown_81A8D49:: @ 81A8D49
-	.incbin "baserom.gba", 0x1A8D49, 0x4E
-
-gUnknown_81A8D97:: @ 81A8D97
-	.incbin "baserom.gba", 0x1A8D97, 0x41
-
-gUnknown_81A8DD8:: @ 81A8DD8
-	.incbin "baserom.gba", 0x1A8DD8, 0x25
-
-gUnknown_81A8DFD:: @ 81A8DFD
-	.incbin "baserom.gba", 0x1A8DFD, 0x5B
-
-gStdScript_81A8E58::
-    .incbin "baserom.gba", 0x1A8E58, 0x42AE
-
-	.include "data/text/fame_checker.inc"
-
-gUnknown_81B2E6F:: @ 81B2E6F
-	.incbin "baserom.gba", 0x1B2E6F, 0x15A
-
-gUnknown_81B2FC9:: @ 81B2FC9
-	.incbin "baserom.gba", 0x1B2FC9, 0x88DE
-
-gUnknown_81BB8A7:: @ 81BB8A7
-	.incbin "baserom.gba", 0x1BB8A7, 0x1C
-
-gUnknown_81BB8C3:: @ 81BB8C3
-	.incbin "baserom.gba", 0x1BB8C3, 0xC
-
-gUnknown_81BB8CF:: @ 81BB8CF
-	.incbin "baserom.gba", 0x1BB8CF, 0xC
-
-gUnknown_81BB8DB:: @ 81BB8DB
-	.incbin "baserom.gba", 0x1BB8DB, 0x1D
-
-gUnknown_81BB8F8:: @ 81BB8F8
-	.incbin "baserom.gba", 0x1BB8F8, 0x1D
-
-gUnknown_81BB915:: @ 81BB915
-	.incbin "baserom.gba", 0x1BB915, 0x1D
-
-gUnknown_81BB932:: @ 81BB932
-	.incbin "baserom.gba", 0x1BB932, 0x1E
-
-gUnknown_81BB950:: @ 81BB950
-	.incbin "baserom.gba", 0x1BB950, 0xC
-
-gUnknown_81BB95C:: @ 81BB95C
-	.incbin "baserom.gba", 0x1BB95C, 0x24
-
-gUnknown_81BB980:: @ 81BB980
-	.incbin "baserom.gba", 0x1BB980, 0x1
-
-gUnknown_81BB981:: @ 81BB981
-	.incbin "baserom.gba", 0x1BB981, 0x11
-
-gUnknown_81BB992:: @ 81BB992
-	.incbin "baserom.gba", 0x1BB992, 0x11
-
-gUnknown_81BB9A3:: @ 81BB9A3
-	.incbin "baserom.gba", 0x1BB9A3, 0x31
-
-gUnknown_81BB9D4:: @ 81BB9D4
-	.incbin "baserom.gba", 0x1BB9D4, 0x1C
-
-gUnknown_81BB9F0:: @ 81BB9F0
-	.incbin "baserom.gba", 0x1BB9F0, 0xC
-
-gUnknown_81BB9FC:: @ 81BB9FC
-	.incbin "baserom.gba", 0x1BB9FC, 0x5DC
-
-gUnknown_81BBFD8:: @ 81BBFD8
-	.incbin "baserom.gba", 0x1BBFD8, 0x4D4
-
-gUnknown_81BC4AC:: @ 81BC4AC
-	.incbin "baserom.gba", 0x1BC4AC, 0x22
-
-gUnknown_81BC4CE:: @ 81BC4CE
-	.incbin "baserom.gba", 0x1BC4CE, 0x3F
-
-gUnknown_81BC50D:: @ 81BC50D
-	.incbin "baserom.gba", 0x1BC50D, 0x3F
-
-gUnknown_81BC54C:: @ 81BC54C
-	.incbin "baserom.gba", 0x1BC54C, 0x1A1F
-
-gUnknown_81BDF6B:: @ 81BDF6B
-	.incbin "baserom.gba", 0x1BDF6B, 0xF9
-
-gUnknown_81BE064:: @ 81BE064
-	.incbin "baserom.gba", 0x1BE064, 0x10A
-
-gUnknown_81BE16E:: @ 81BE16E
-	.incbin "baserom.gba", 0x1BE16E, 0x149
-
-gUnknown_81BE2B7:: @ 81BE2B7
-	.incbin "baserom.gba", 0x1BE2B7, 0x48
-
-gUnknown_81BE2FF:: @ 81BE2FF
-	.incbin "baserom.gba", 0x1BE2FF, 0x265
-
-gUnknown_81BE564:: @ 81BE564
-	.incbin "baserom.gba", 0x1BE564, 0xFE2
-
-gUnknown_81BF546:: @ 81BF546
-	.incbin "baserom.gba", 0x1BF546, 0x619
-
-gUnknown_81BFB5F:: @ 81BFB5F
-	.incbin "baserom.gba", 0x1BFB5F, 0x6
-
-gUnknown_81BFB65:: @ 81BFB65
-	.incbin "baserom.gba", 0x1BFB65, 0x22
-
-gUnknown_81BFB87:: @ 81BFB87
-	.incbin "baserom.gba", 0x1BFB87, 0x23
-
-gUnknown_81BFBAA:: @ 81BFBAA
-	.incbin "baserom.gba", 0x1BFBAA, 0x1B
-
-gUnknown_81BFBC5:: @ 81BFBC5
-	.incbin "baserom.gba", 0x1BFBC5, 0x12
-
-gUnknown_81BFBD7:: @ 81BFBD7
-	.incbin "baserom.gba", 0x1BFBD7, 0x178A
-
-gUnknown_81C1361:: @ 81C1361
-	.incbin "baserom.gba", 0x1C1361, 0x1B
-
-gUnknown_81C137C:: @ 81C137C
-	.incbin "baserom.gba", 0x1C137C, 0x5A
-
-gUnknown_81C13D6:: @ 81C13D6
-	.incbin "baserom.gba", 0x1C13D6, 0x53
-
-gUnknown_81C1429:: @ 81C1429
-	.incbin "baserom.gba", 0x1C1429, 0x4073
-
-gUnknown_81C549C:: @ 81C549C
-	.incbin "baserom.gba", 0x1C549C, 0xBF
-
-gUnknown_81C555B:: @ 81C555B
-	.incbin "baserom.gba", 0x1C555B, 0x6E
-
-gUnknown_81C55C9:: @ 81C55C9
-	.incbin "baserom.gba", 0x1C55C9, 0x21
-
-gUnknown_81C55EA:: @ 81C55EA
-	.incbin "baserom.gba", 0x1C55EA, 0x3B
-
-gUnknown_81C5625:: @ 81C5625
-	.incbin "baserom.gba", 0x1C5625, 0x22
-
-gUnknown_81C5647:: @ 81C5647
-	.incbin "baserom.gba", 0x1C5647, 0x23
-
-gUnknown_81C566A:: @ 81C566A
-	.incbin "baserom.gba", 0x1C566A, 0xE5
-
-gUnknown_81C574F:: @ 81C574F
-	.incbin "baserom.gba", 0x1C574F, 0xDE
-
-gUnknown_81C582D:: @ 81C582D
-	.incbin "baserom.gba", 0x1C582D, 0x1A8
-
-gUnknown_81C59D5:: @ 81C59D5
-	.incbin "baserom.gba", 0x1C59D5, 0x2A3
-
-gUnknown_81C5C78:: @ 81C5C78
-	.incbin "baserom.gba", 0x1C5C78, 0x8E
-
-gUnknown_81C5D06:: @ 81C5D06
-	.incbin "baserom.gba", 0x1C5D06, 0xC
-
-gUnknown_81C5D12:: @ 81C5D12
-	.incbin "baserom.gba", 0x1C5D12, 0x39
-
-gUnknown_81C5D4B:: @ 81C5D4B
-	.incbin "baserom.gba", 0x1C5D4B, 0x72
-
-gUnknown_81C5DBD:: @ 81C5DBD
-	.incbin "baserom.gba", 0x1C5DBD, 0x2D
-
-gUnknown_81C5DEA:: @ 81C5DEA
-	.incbin "baserom.gba", 0x1C5DEA, 0x29
-
-gUnknown_81C5E13:: @ 81C5E13
-	.incbin "baserom.gba", 0x1C5E13, 0x1B
-
-gUnknown_81C5E2E:: @ 81C5E2E
-	.incbin "baserom.gba", 0x1C5E2E, 0x63
-
-gUnknown_81C5E91:: @ 81C5E91
-	.incbin "baserom.gba", 0x1C5E91, 0x24
-
-gUnknown_81C5EB5:: @ 81C5EB5
-	.incbin "baserom.gba", 0x1C5EB5, 0x10
-
-gUnknown_81C5EC5:: @ 81C5EC5
-	.incbin "baserom.gba", 0x1C5EC5, 0x2F
-
-gUnknown_81C5EF4:: @ 81C5EF4
-	.incbin "baserom.gba", 0x1C5EF4, 0x75
-
-@ pokedude data
-	.incbin "baserom.gba", 0x1C5F69, 0x983
+	.4byte gStdScript_0
+	.4byte gStdScript_1
+	.4byte gStdScript_2
+	.4byte gStdScript_3
+	.4byte gStdScript_4
+	.4byte gStdScript_5
+	.4byte gStdScript_Message_WaitButton_AndRelease
+	.4byte gStdScript_7
+	.4byte gStdScript_8
+	.4byte gStdScript_ItemMessageAndFanfare
+gStdScriptsEnd::
+
+	.include "data/map_event_scripts.inc"
diff --git a/data/field_door.s b/data/field_door.s
new file mode 100644
index 000000000..a29cf3e24
--- /dev/null
+++ b/data/field_door.s
@@ -0,0 +1,17 @@
+	.section .rodata
+
+	.align 2
+gUnknown_835B488:: @ 835B488
+	.incbin "baserom.gba", 0x35B488, 0x14
+
+gUnknown_835B49C:: @ 835B49C
+	.incbin "baserom.gba", 0x35B49C, 0x14
+
+gUnknown_835B4B0:: @ 835B4B0
+	.incbin "baserom.gba", 0x35B4B0, 0x14
+
+gUnknown_835B4C4:: @ 835B4C4
+	.incbin "baserom.gba", 0x35B4C4, 0x114
+
+gUnknown_835B5D8:: @ 835B5D8
+	.incbin "baserom.gba", 0x35B5D8, 0x18C
diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
new file mode 100644
index 000000000..7979c7522
--- /dev/null
+++ b/data/field_ground_effect.s
@@ -0,0 +1,34 @@
+	.section .rodata
+	.align 2
+gUnknown_83A7024:: @ 83A7024
+	.incbin "baserom.gba", 0x3A7024, 0x8
+
+gUnknown_83A702C:: @ 83A702C
+	.incbin "baserom.gba", 0x3A702C, 0x18
+
+gUnknown_83A7044:: @ 83A7044
+	.incbin "baserom.gba", 0x3A7044, 0x18
+
+gUnknown_83A705C:: @ 83A705C
+	.incbin "baserom.gba", 0x3A705C, 0x10
+
+gUnknown_83A706C:: @ 83A706C
+	.incbin "baserom.gba", 0x3A706C, 0x10
+
+gUnknown_83A707C:: @ 83A707C
+	.incbin "baserom.gba", 0x3A707C, 0x10
+
+gUnknown_83A708C:: @ 83A708C
+	.incbin "baserom.gba", 0x3A708C, 0x10
+
+gUnknown_83A709C:: @ 83A709C
+	.incbin "baserom.gba", 0x3A709C, 0xC
+
+gUnknown_83A70A8:: @ 83A70A8
+	.incbin "baserom.gba", 0x3A70A8, 0x4
+
+gUnknown_83A70AC:: @ 83A70AC
+	.incbin "baserom.gba", 0x3A70AC, 0x10
+
+gUnknown_83A70BC:: @ 83A70BC
+	.incbin "baserom.gba", 0x3A70BC, 0xE0
diff --git a/data/field_map_obj.s b/data/field_map_obj.s
new file mode 100644
index 000000000..d12de7aa9
--- /dev/null
+++ b/data/field_map_obj.s
@@ -0,0 +1,508 @@
+	.section .rodata
+	.align 2
+gUnknown_835B934:: @ 835B934
+	.incbin "baserom.gba", 0x35B934, 0x10
+
+gUnknown_835B944:: @ 835B944
+	.incbin "baserom.gba", 0x35B944, 0x18
+
+gUnknown_835B95C:: @ 835B95C
+	.incbin "baserom.gba", 0x35B95C, 0x3DA2C
+
+gUnknown_8399388:: @ 8399388
+	.incbin "baserom.gba", 0x399388, 0x908
+
+gUnknown_8399C90:: @ 8399C90
+	.incbin "baserom.gba", 0x399C90, 0x5F38
+
+gUnknown_839FBC8:: @ 839FBC8
+	.incbin "baserom.gba", 0x39FBC8, 0x144
+
+gUnknown_839FD0C:: @ 839FD0C
+	.incbin "baserom.gba", 0x39FD0C, 0x51
+
+gUnknown_839FD5D:: @ 839FD5D
+	.incbin "baserom.gba", 0x39FD5D, 0x53
+
+gUnknown_839FDB0:: @ 839FDB0
+	.incbin "baserom.gba", 0x39FDB0, 0x260
+
+gUnknown_83A0010:: @ 83A0010
+	.incbin "baserom.gba", 0x3A0010, 0x3688
+
+gUnknown_83A3698:: @ 83A3698
+	.incbin "baserom.gba", 0x3A3698, 0x1AC0
+
+gUnknown_83A5158:: @ 83A5158
+	.incbin "baserom.gba", 0x3A5158, 0xB0
+
+gUnknown_83A5208:: @ 83A5208
+	.incbin "baserom.gba", 0x3A5208, 0x70
+
+gUnknown_83A5278:: @ 83A5278
+	.incbin "baserom.gba", 0x3A5278, 0xB8
+
+gUnknown_83A5330:: @ 83A5330
+	.incbin "baserom.gba", 0x3A5330, 0x18
+
+gUnknown_83A5348:: @ 83A5348
+	.incbin "baserom.gba", 0x3A5348, 0xCB8
+
+gUnknown_83A6000:: @ 83A6000
+	.incbin "baserom.gba", 0x3A6000, 0x10
+
+gUnknown_83A6010:: @ 83A6010
+	.incbin "baserom.gba", 0x3A6010, 0x8
+
+gUnknown_83A6018:: @ 83A6018
+	.incbin "baserom.gba", 0x3A6018, 0x1C
+
+gUnknown_83A6034:: @ 83A6034
+	.incbin "baserom.gba", 0x3A6034, 0x1C
+
+gUnknown_83A6050:: @ 83A6050
+	.incbin "baserom.gba", 0x3A6050, 0x4
+
+gUnknown_83A6054:: @ 83A6054
+	.incbin "baserom.gba", 0x3A6054, 0x2C
+
+gUnknown_83A6080:: @ 83A6080
+	.incbin "baserom.gba", 0x3A6080, 0x14
+
+gUnknown_83A6094:: @ 83A6094
+	.incbin "baserom.gba", 0x3A6094, 0x1C
+
+gUnknown_83A60B0:: @ 83A60B0
+	.incbin "baserom.gba", 0x3A60B0, 0x4
+
+gUnknown_83A60B4:: @ 83A60B4
+	.incbin "baserom.gba", 0x3A60B4, 0x1C
+
+gUnknown_83A60D0:: @ 83A60D0
+	.incbin "baserom.gba", 0x3A60D0, 0x4
+
+gUnknown_83A60D4:: @ 83A60D4
+	.incbin "baserom.gba", 0x3A60D4, 0xC
+
+gUnknown_83A60E0:: @ 83A60E0
+	.incbin "baserom.gba", 0x3A60E0, 0x14
+
+gUnknown_83A60F4:: @ 83A60F4
+	.incbin "baserom.gba", 0x3A60F4, 0x14
+
+gUnknown_83A6108:: @ 83A6108
+	.incbin "baserom.gba", 0x3A6108, 0x14
+
+gUnknown_83A611C:: @ 83A611C
+	.incbin "baserom.gba", 0x3A611C, 0x4
+
+gUnknown_83A6120:: @ 83A6120
+	.incbin "baserom.gba", 0x3A6120, 0x14
+
+gUnknown_83A6134:: @ 83A6134
+	.incbin "baserom.gba", 0x3A6134, 0x4
+
+gUnknown_83A6138:: @ 83A6138
+	.incbin "baserom.gba", 0x3A6138, 0x14
+
+gUnknown_83A614C:: @ 83A614C
+	.incbin "baserom.gba", 0x3A614C, 0x4
+
+gUnknown_83A6150:: @ 83A6150
+	.incbin "baserom.gba", 0x3A6150, 0x14
+
+gUnknown_83A6164:: @ 83A6164
+	.incbin "baserom.gba", 0x3A6164, 0x4
+
+gUnknown_83A6168:: @ 83A6168
+	.incbin "baserom.gba", 0x3A6168, 0x14
+
+gUnknown_83A617C:: @ 83A617C
+	.incbin "baserom.gba", 0x3A617C, 0x4
+
+gUnknown_83A6180:: @ 83A6180
+	.incbin "baserom.gba", 0x3A6180, 0x14
+
+gUnknown_83A6194:: @ 83A6194
+	.incbin "baserom.gba", 0x3A6194, 0x4
+
+gUnknown_83A6198:: @ 83A6198
+	.incbin "baserom.gba", 0x3A6198, 0x14
+
+gUnknown_83A61AC:: @ 83A61AC
+	.incbin "baserom.gba", 0x3A61AC, 0x4
+
+gUnknown_83A61B0:: @ 83A61B0
+	.incbin "baserom.gba", 0x3A61B0, 0x14
+
+gUnknown_83A61C4:: @ 83A61C4
+	.incbin "baserom.gba", 0x3A61C4, 0x4
+
+gUnknown_83A61C8:: @ 83A61C8
+	.incbin "baserom.gba", 0x3A61C8, 0x10
+
+gUnknown_83A61D8:: @ 83A61D8
+	.incbin "baserom.gba", 0x3A61D8, 0x8
+
+gUnknown_83A61E0:: @ 83A61E0
+	.incbin "baserom.gba", 0x3A61E0, 0x10
+
+gUnknown_83A61F0:: @ 83A61F0
+	.incbin "baserom.gba", 0x3A61F0, 0x8
+
+gUnknown_83A61F8:: @ 83A61F8
+	.incbin "baserom.gba", 0x3A61F8, 0x10
+
+gUnknown_83A6208:: @ 83A6208
+	.incbin "baserom.gba", 0x3A6208, 0xC
+
+gUnknown_83A6214:: @ 83A6214
+	.incbin "baserom.gba", 0x3A6214, 0x4
+
+gUnknown_83A6218:: @ 83A6218
+	.incbin "baserom.gba", 0x3A6218, 0xC
+
+gUnknown_83A6224:: @ 83A6224
+	.incbin "baserom.gba", 0x3A6224, 0x4
+
+gUnknown_83A6228:: @ 83A6228
+	.incbin "baserom.gba", 0x3A6228, 0xC
+
+gUnknown_83A6234:: @ 83A6234
+	.incbin "baserom.gba", 0x3A6234, 0x4
+
+gUnknown_83A6238:: @ 83A6238
+	.incbin "baserom.gba", 0x3A6238, 0xC
+
+gUnknown_83A6244:: @ 83A6244
+	.incbin "baserom.gba", 0x3A6244, 0x4
+
+gUnknown_83A6248:: @ 83A6248
+	.incbin "baserom.gba", 0x3A6248, 0xC
+
+gUnknown_83A6254:: @ 83A6254
+	.incbin "baserom.gba", 0x3A6254, 0x4
+
+gUnknown_83A6258:: @ 83A6258
+	.incbin "baserom.gba", 0x3A6258, 0xC
+
+gUnknown_83A6264:: @ 83A6264
+	.incbin "baserom.gba", 0x3A6264, 0x4
+
+gUnknown_83A6268:: @ 83A6268
+	.incbin "baserom.gba", 0x3A6268, 0xC
+
+gUnknown_83A6274:: @ 83A6274
+	.incbin "baserom.gba", 0x3A6274, 0xC
+
+gUnknown_83A6280:: @ 83A6280
+	.incbin "baserom.gba", 0x3A6280, 0x4
+
+gUnknown_83A6284:: @ 83A6284
+	.incbin "baserom.gba", 0x3A6284, 0xC
+
+gUnknown_83A6290:: @ 83A6290
+	.incbin "baserom.gba", 0x3A6290, 0x4
+
+gUnknown_83A6294:: @ 83A6294
+	.incbin "baserom.gba", 0x3A6294, 0xC
+
+gUnknown_83A62A0:: @ 83A62A0
+	.incbin "baserom.gba", 0x3A62A0, 0x4
+
+gUnknown_83A62A4:: @ 83A62A4
+	.incbin "baserom.gba", 0x3A62A4, 0xC
+
+gUnknown_83A62B0:: @ 83A62B0
+	.incbin "baserom.gba", 0x3A62B0, 0x4
+
+gUnknown_83A62B4:: @ 83A62B4
+	.incbin "baserom.gba", 0x3A62B4, 0xC
+
+gUnknown_83A62C0:: @ 83A62C0
+	.incbin "baserom.gba", 0x3A62C0, 0x4
+
+gUnknown_83A62C4:: @ 83A62C4
+	.incbin "baserom.gba", 0x3A62C4, 0xC
+
+gUnknown_83A62D0:: @ 83A62D0
+	.incbin "baserom.gba", 0x3A62D0, 0x4
+
+gUnknown_83A62D4:: @ 83A62D4
+	.incbin "baserom.gba", 0x3A62D4, 0xC
+
+gUnknown_83A62E0:: @ 83A62E0
+	.incbin "baserom.gba", 0x3A62E0, 0x4
+
+gUnknown_83A62E4:: @ 83A62E4
+	.incbin "baserom.gba", 0x3A62E4, 0xC
+
+gUnknown_83A62F0:: @ 83A62F0
+	.incbin "baserom.gba", 0x3A62F0, 0x4
+
+gUnknown_83A62F4:: @ 83A62F4
+	.incbin "baserom.gba", 0x3A62F4, 0xC
+
+gUnknown_83A6300:: @ 83A6300
+	.incbin "baserom.gba", 0x3A6300, 0x4
+
+gUnknown_83A6304:: @ 83A6304
+	.incbin "baserom.gba", 0x3A6304, 0xC
+
+gUnknown_83A6310:: @ 83A6310
+	.incbin "baserom.gba", 0x3A6310, 0x4
+
+gUnknown_83A6314:: @ 83A6314
+	.incbin "baserom.gba", 0x3A6314, 0xC
+
+gUnknown_83A6320:: @ 83A6320
+	.incbin "baserom.gba", 0x3A6320, 0x4
+
+gUnknown_83A6324:: @ 83A6324
+	.incbin "baserom.gba", 0x3A6324, 0xC
+
+gUnknown_83A6330:: @ 83A6330
+	.incbin "baserom.gba", 0x3A6330, 0x4
+
+gUnknown_83A6334:: @ 83A6334
+	.incbin "baserom.gba", 0x3A6334, 0xC
+
+gUnknown_83A6340:: @ 83A6340
+	.incbin "baserom.gba", 0x3A6340, 0x4
+
+gUnknown_83A6344:: @ 83A6344
+	.incbin "baserom.gba", 0x3A6344, 0xC
+
+gUnknown_83A6350:: @ 83A6350
+	.incbin "baserom.gba", 0x3A6350, 0x4
+
+gUnknown_83A6354:: @ 83A6354
+	.incbin "baserom.gba", 0x3A6354, 0xC
+
+gUnknown_83A6360:: @ 83A6360
+	.incbin "baserom.gba", 0x3A6360, 0x4
+
+gUnknown_83A6364:: @ 83A6364
+	.incbin "baserom.gba", 0x3A6364, 0xC
+
+gUnknown_83A6370:: @ 83A6370
+	.incbin "baserom.gba", 0x3A6370, 0x4
+
+gUnknown_83A6374:: @ 83A6374
+	.incbin "baserom.gba", 0x3A6374, 0xC
+
+gUnknown_83A6380:: @ 83A6380
+	.incbin "baserom.gba", 0x3A6380, 0x4
+
+gUnknown_83A6384:: @ 83A6384
+	.incbin "baserom.gba", 0x3A6384, 0xC
+
+gUnknown_83A6390:: @ 83A6390
+	.incbin "baserom.gba", 0x3A6390, 0x2C
+
+gUnknown_83A63BC:: @ 83A63BC
+	.incbin "baserom.gba", 0x3A63BC, 0xC
+
+gUnknown_83A63C8:: @ 83A63C8
+	.incbin "baserom.gba", 0x3A63C8, 0x4
+
+gUnknown_83A63CC:: @ 83A63CC
+	.incbin "baserom.gba", 0x3A63CC, 0x8
+
+gUnknown_83A63D4:: @ 83A63D4
+	.incbin "baserom.gba", 0x3A63D4, 0x8
+
+gUnknown_83A63DC:: @ 83A63DC
+	.incbin "baserom.gba", 0x3A63DC, 0x8
+
+gUnknown_83A63E4:: @ 83A63E4
+	.incbin "baserom.gba", 0x3A63E4, 0xC
+
+gUnknown_83A63F0:: @ 83A63F0
+	.incbin "baserom.gba", 0x3A63F0, 0xC
+
+gUnknown_83A63FC:: @ 83A63FC
+	.incbin "baserom.gba", 0x3A63FC, 0x8
+
+gUnknown_83A6404:: @ 83A6404
+	.incbin "baserom.gba", 0x3A6404, 0x8
+
+gUnknown_83A640C:: @ 83A640C
+	.incbin "baserom.gba", 0x3A640C, 0x9
+
+gUnknown_83A6415:: @ 83A6415
+	.incbin "baserom.gba", 0x3A6415, 0x9
+
+gUnknown_83A641E:: @ 83A641E
+	.incbin "baserom.gba", 0x3A641E, 0x9
+
+gUnknown_83A6427:: @ 83A6427
+	.incbin "baserom.gba", 0x3A6427, 0x9
+
+gUnknown_83A6430:: @ 83A6430
+	.incbin "baserom.gba", 0x3A6430, 0x9
+
+gUnknown_83A6439:: @ 83A6439
+	.incbin "baserom.gba", 0x3A6439, 0x9
+
+gUnknown_83A6442:: @ 83A6442
+	.incbin "baserom.gba", 0x3A6442, 0x9
+
+gUnknown_83A644B:: @ 83A644B
+	.incbin "baserom.gba", 0x3A644B, 0x9
+
+gUnknown_83A6454:: @ 83A6454
+	.incbin "baserom.gba", 0x3A6454, 0x9
+
+gUnknown_83A645D:: @ 83A645D
+	.incbin "baserom.gba", 0x3A645D, 0x9
+
+gUnknown_83A6466:: @ 83A6466
+	.incbin "baserom.gba", 0x3A6466, 0x9
+
+gUnknown_83A646F:: @ 83A646F
+	.incbin "baserom.gba", 0x3A646F, 0x9
+
+gUnknown_83A6478:: @ 83A6478
+	.incbin "baserom.gba", 0x3A6478, 0x9
+
+gUnknown_83A6481:: @ 83A6481
+	.incbin "baserom.gba", 0x3A6481, 0x9
+
+gUnknown_83A648A:: @ 83A648A
+	.incbin "baserom.gba", 0x3A648A, 0x9
+
+gUnknown_83A6493:: @ 83A6493
+	.incbin "baserom.gba", 0x3A6493, 0x9
+
+gUnknown_83A649C:: @ 83A649C
+	.incbin "baserom.gba", 0x3A649C, 0xC
+
+gUnknown_83A64A8:: @ 83A64A8
+	.incbin "baserom.gba", 0x3A64A8, 0x10
+
+gUnknown_83A64B8:: @ 83A64B8
+	.incbin "baserom.gba", 0x3A64B8, 0x10
+
+gUnknown_83A64C8:: @ 83A64C8
+	.incbin "baserom.gba", 0x3A64C8, 0x24
+
+gUnknown_83A64EC:: @ 83A64EC
+	.incbin "baserom.gba", 0x3A64EC, 0x5
+
+gUnknown_83A64F1:: @ 83A64F1
+	.incbin "baserom.gba", 0x3A64F1, 0x5
+
+gUnknown_83A64F6:: @ 83A64F6
+	.incbin "baserom.gba", 0x3A64F6, 0x5
+
+gUnknown_83A64FB:: @ 83A64FB
+	.incbin "baserom.gba", 0x3A64FB, 0x5
+
+gUnknown_83A6500:: @ 83A6500
+	.incbin "baserom.gba", 0x3A6500, 0x5
+
+gUnknown_83A6505:: @ 83A6505
+	.incbin "baserom.gba", 0x3A6505, 0x5
+
+gUnknown_83A650A:: @ 83A650A
+	.incbin "baserom.gba", 0x3A650A, 0x5
+
+gUnknown_83A650F:: @ 83A650F
+	.incbin "baserom.gba", 0x3A650F, 0x5
+
+gUnknown_83A6514:: @ 83A6514
+	.incbin "baserom.gba", 0x3A6514, 0x5
+
+gUnknown_83A6519:: @ 83A6519
+	.incbin "baserom.gba", 0x3A6519, 0x5
+
+gUnknown_83A651E:: @ 83A651E
+	.incbin "baserom.gba", 0x3A651E, 0x5
+
+gUnknown_83A6523:: @ 83A6523
+	.incbin "baserom.gba", 0x3A6523, 0x5
+
+gUnknown_83A6528:: @ 83A6528
+	.incbin "baserom.gba", 0x3A6528, 0x5
+
+gUnknown_83A652D:: @ 83A652D
+	.incbin "baserom.gba", 0x3A652D, 0x5
+
+gUnknown_83A6532:: @ 83A6532
+	.incbin "baserom.gba", 0x3A6532, 0x5
+
+gUnknown_83A6537:: @ 83A6537
+	.incbin "baserom.gba", 0x3A6537, 0x5
+
+gUnknown_83A653C:: @ 83A653C
+	.incbin "baserom.gba", 0x3A653C, 0x5
+
+gUnknown_83A6541:: @ 83A6541
+	.incbin "baserom.gba", 0x3A6541, 0x5
+
+gUnknown_83A6546:: @ 83A6546
+	.incbin "baserom.gba", 0x3A6546, 0x5
+
+gUnknown_83A654B:: @ 83A654B
+	.incbin "baserom.gba", 0x3A654B, 0x5
+
+gUnknown_83A6550:: @ 83A6550
+	.incbin "baserom.gba", 0x3A6550, 0x5
+
+gUnknown_83A6555:: @ 83A6555
+	.incbin "baserom.gba", 0x3A6555, 0x5
+
+gUnknown_83A655A:: @ 83A655A
+	.incbin "baserom.gba", 0x3A655A, 0x5
+
+gUnknown_83A655F:: @ 83A655F
+	.incbin "baserom.gba", 0x3A655F, 0x5
+
+gUnknown_83A6564:: @ 83A6564
+	.incbin "baserom.gba", 0x3A6564, 0x5
+
+gUnknown_83A6569:: @ 83A6569
+	.incbin "baserom.gba", 0x3A6569, 0x5
+
+gUnknown_83A656E:: @ 83A656E
+	.incbin "baserom.gba", 0x3A656E, 0x5
+
+gUnknown_83A6573:: @ 83A6573
+	.incbin "baserom.gba", 0x3A6573, 0x5
+
+gUnknown_83A6578:: @ 83A6578
+	.incbin "baserom.gba", 0x3A6578, 0x5
+
+gUnknown_83A657D:: @ 83A657D
+	.incbin "baserom.gba", 0x3A657D, 0x5
+
+gUnknown_83A6582:: @ 83A6582
+	.incbin "baserom.gba", 0x3A6582, 0x5
+
+gUnknown_83A6587:: @ 83A6587
+	.incbin "baserom.gba", 0x3A6587, 0x5
+
+gUnknown_83A658C:: @ 83A658C
+	.incbin "baserom.gba", 0x3A658C, 0x5
+
+gUnknown_83A6591:: @ 83A6591
+	.incbin "baserom.gba", 0x3A6591, 0x8
+
+gUnknown_83A6599:: @ 83A6599
+	.incbin "baserom.gba", 0x3A6599, 0x10
+
+gUnknown_83A65A9:: @ 83A65A9
+	.incbin "baserom.gba", 0x3A65A9, 0x13
+
+gUnknown_83A65BC:: @ 83A65BC
+	.incbin "baserom.gba", 0x3A65BC, 0x2C8
+
+gUnknown_83A6884:: @ 83A6884
+	.incbin "baserom.gba", 0x3A6884, 0xD4
+
+gUnknown_83A6958:: @ 83A6958
+	.incbin "baserom.gba", 0x3A6958, 0x6
+
+gUnknown_83A695E:: @ 83A695E
+	.incbin "baserom.gba", 0x3A695E, 0x6C6
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
new file mode 100644
index 000000000..c11bc74b3
--- /dev/null
+++ b/data/field_player_avatar.s
@@ -0,0 +1,73 @@
+	.section .rodata
+	.align 2
+gUnknown_835B764:: @ 835B764
+	.incbin "baserom.gba", 0x35B764, 0xB0
+
+gUnknown_835B814:: @ 835B814
+	.incbin "baserom.gba", 0x35B814, 0xC
+
+gUnknown_835B820:: @ 835B820
+	.incbin "baserom.gba", 0x35B820, 0x8
+
+gUnknown_835B828:: @ 835B828
+	.incbin "baserom.gba", 0x35B828, 0x14
+
+gUnknown_835B83C:: @ 835B83C
+	.incbin "baserom.gba", 0x35B83C, 0x8
+
+gUnknown_835B844:: @ 835B844
+	.incbin "baserom.gba", 0x35B844, 0x20
+
+gUnknown_835B864:: @ 835B864
+	.incbin "baserom.gba", 0x35B864, 0x10
+
+gUnknown_835B874:: @ 835B874
+	.incbin "baserom.gba", 0x35B874, 0xC
+
+gUnknown_835B880:: @ 835B880
+	.incbin "baserom.gba", 0x35B880, 0x2
+
+gUnknown_835B882:: @ 835B882
+	.incbin "baserom.gba", 0x35B882, 0xC
+
+gUnknown_835B88E:: @ 835B88E
+	.incbin "baserom.gba", 0x35B88E, 0x2
+
+gUnknown_835B890:: @ 835B890
+	.incbin "baserom.gba", 0x35B890, 0x10
+
+gUnknown_835B8A0:: @ 835B8A0
+	.incbin "baserom.gba", 0x35B8A0, 0xC
+
+gUnknown_835B8AC:: @ 835B8AC
+	.incbin "baserom.gba", 0x35B8AC, 0x4
+
+gUnknown_835B8B0:: @ 835B8B0
+	.incbin "baserom.gba", 0x35B8B0, 0x10
+
+gUnknown_835B8C0:: @ 835B8C0
+	.incbin "baserom.gba", 0x35B8C0, 0x4
+
+gUnknown_835B8C4:: @ 835B8C4
+	.incbin "baserom.gba", 0x35B8C4, 0x8
+
+gUnknown_835B8CC:: @ 835B8CC
+	.incbin "baserom.gba", 0x35B8CC, 0x40
+
+gUnknown_835B90C:: @ 835B90C
+	.incbin "baserom.gba", 0x35B90C, 0x6
+
+gUnknown_835B912:: @ 835B912
+	.incbin "baserom.gba", 0x35B912, 0x6
+
+gUnknown_835B918:: @ 835B918
+	.incbin "baserom.gba", 0x35B918, 0x2
+
+gUnknown_835B91A:: @ 835B91A
+	.incbin "baserom.gba", 0x35B91A, 0x6
+
+gUnknown_835B920:: @ 835B920
+	.incbin "baserom.gba", 0x35B920, 0xC
+
+gUnknown_835B92C:: @ 835B92C
+	.incbin "baserom.gba", 0x35B92C, 0x8
diff --git a/data/field_tasks.s b/data/field_tasks.s
new file mode 100644
index 000000000..a91e6cec9
--- /dev/null
+++ b/data/field_tasks.s
@@ -0,0 +1,7 @@
+	.section .rodata
+	.align 2
+gUnknown_83A7310:: @ 83A7310
+	.incbin "baserom.gba", 0x3A7310, 0x20
+
+gUnknown_83A7330:: @ 83A7330
+	.incbin "baserom.gba", 0x3A7330, 0x14
diff --git a/data/field_weather.s b/data/field_weather.s
new file mode 100644
index 000000000..a25e44344
--- /dev/null
+++ b/data/field_weather.s
@@ -0,0 +1,101 @@
+	.section .rodata
+	.align 2
+
+gUnknown_83C2BBC:: @ 83C2BBC
+	.incbin "baserom.gba", 0x3C2BBC, 0x4
+
+gUnknown_83C2BC0:: @ 83C2BC0
+	.incbin "baserom.gba", 0x3C2BC0, 0xF0
+
+gUnknown_83C2CB0:: @ 83C2CB0
+	.incbin "baserom.gba", 0x3C2CB0, 0x10
+
+gUnknown_83C2CC0:: @ 83C2CC0
+	.incbin "baserom.gba", 0x3C2CC0, 0x20
+
+gUnknown_83C2CE0:: @ 83C2CE0
+	.incbin "baserom.gba", 0x3C2CE0, 0x20
+
+gUnknown_83C2D00:: @ 83C2D00
+	.incbin "baserom.gba", 0x3C2D00, 0x20
+
+gUnknown_83C2D20:: @ 83C2D20
+	.incbin "baserom.gba", 0x3C2D20, 0x820
+
+gUnknown_83C3540:: @ 83C3540
+	.incbin "baserom.gba", 0x3C3540, 0x3080
+
+gUnknown_83C65C0:: @ 83C65C0
+	.incbin "baserom.gba", 0x3C65C0, 0x4
+
+gUnknown_83C65C4:: @ 83C65C4
+	.incbin "baserom.gba", 0x3C65C4, 0x4
+
+gUnknown_83C65C8:: @ 83C65C8
+	.incbin "baserom.gba", 0x3C65C8, 0xC
+
+gUnknown_83C65D4:: @ 83C65D4
+	.incbin "baserom.gba", 0x3C65D4, 0x1C
+
+gUnknown_83C65F0:: @ 83C65F0
+	.incbin "baserom.gba", 0x3C65F0, 0x18
+
+gUnknown_83C6608:: @ 83C6608
+	.incbin "baserom.gba", 0x3C6608, 0x9C
+
+gUnknown_83C66A4:: @ 83C66A4
+	.incbin "baserom.gba", 0x3C66A4, 0x18
+
+gUnknown_83C66BC:: @ 83C66BC
+	.incbin "baserom.gba", 0x3C66BC, 0x8
+
+gUnknown_83C66C4:: @ 83C66C4
+	.incbin "baserom.gba", 0x3C66C4, 0x8
+
+gUnknown_83C66CC:: @ 83C66CC
+	.incbin "baserom.gba", 0x3C66CC, 0x38
+
+gUnknown_83C6704:: @ 83C6704
+	.incbin "baserom.gba", 0x3C6704, 0x8C
+
+gUnknown_83C6790:: @ 83C6790
+	.incbin "baserom.gba", 0x3C6790, 0x18
+
+gUnknown_83C67A8:: @ 83C67A8
+	.incbin "baserom.gba", 0x3C67A8, 0x8
+
+gUnknown_83C67B0:: @ 83C67B0
+	.incbin "baserom.gba", 0x3C67B0, 0x20
+
+gUnknown_83C67D0:: @ 83C67D0
+	.incbin "baserom.gba", 0x3C67D0, 0x18
+
+gUnknown_83C67E8:: @ 83C67E8
+	.incbin "baserom.gba", 0x3C67E8, 0x1C
+
+gUnknown_83C6804:: @ 83C6804
+	.incbin "baserom.gba", 0x3C6804, 0x38
+
+gUnknown_83C683C:: @ 83C683C
+	.incbin "baserom.gba", 0x3C683C, 0x18
+
+gUnknown_83C6854:: @ 83C6854
+	.incbin "baserom.gba", 0x3C6854, 0x8
+
+gUnknown_83C685C:: @ 83C685C
+	.incbin "baserom.gba", 0x3C685C, 0xC
+
+gUnknown_83C6868:: @ 83C6868
+	.incbin "baserom.gba", 0x3C6868, 0x8
+
+gUnknown_83C6870:: @ 83C6870
+	.incbin "baserom.gba", 0x3C6870, 0x8
+
+gUnknown_83C6878:: @ 83C6878
+	.incbin "baserom.gba", 0x3C6878, 0x44
+
+gUnknown_83C68BC:: @ 83C68BC
+	.incbin "baserom.gba", 0x3C68BC, 0x18
+
+gUnknown_83C68D4:: @ 83C68D4
+	.incbin "baserom.gba", 0x3C68D4, 0xC
diff --git a/data/graphics.s b/data/graphics.s
index a1e421f2c..35d5873fa 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1,9 +1,9 @@
 	.section gfx_data, "aw", %progbits
 
-gUnknown_8D00000:: @ 8D00000
+gBattleTextboxTiles:: @ 8D00000
 	.incbin "baserom.gba", 0xD00000, 0x4D8
 
-gUnknown_8D004D8:: @ 8D004D8
+gBattleTextboxPalette:: @ 8D004D8
 	.incbin "baserom.gba", 0xD004D8, 0x44
 
 	.align 2
@@ -19,11 +19,11 @@ gUnknown_8D0098C:: @ 8D0098C
 
 	.align 2
 gFile_graphics_pokemon_palettes_circled_question_mark_palette:: @ 8D00BD0
-	.incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz"
+	.incbin "graphics/pokemon/question_mark/circled/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_circled_question_mark_shiny_palette:: @ 8D00BE8
-	.incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/question_mark/circled/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_unused_old_charmap_sheet:: @ 8D00C00
@@ -2590,9625 +2590,9625 @@ gUnknown_8D2FBB4:: @ 8D2FBB4
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bulbasaur_still_front_pic:: @ 8D2FBD4
-	.incbin "graphics/pokemon/front_pics/bulbasaur_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bulbasaur/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bulbasaur_palette:: @ 8D2FE78
-	.incbin "graphics/pokemon/palettes/bulbasaur_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bulbasaur/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bulbasaur_back_pic:: @ 8D2FEA0
-	.incbin "graphics/pokemon/back_pics/bulbasaur_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bulbasaur/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bulbasaur_shiny_palette:: @ 8D30164
-	.incbin "graphics/pokemon/palettes/bulbasaur_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bulbasaur/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bulbasaur_icon:: @ 8D3018C
-	.incbin "graphics/pokemon/icons/bulbasaur_icon.4bpp"
+	.incbin "graphics/pokemon/bulbasaur/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bulbasaur_footprint:: @ 8D3058C
-	.incbin "graphics/pokemon/footprints/bulbasaur_footprint.1bpp"
+	.incbin "graphics/pokemon/bulbasaur/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ivysaur_still_front_pic:: @ 8D305AC
-	.incbin "graphics/pokemon/front_pics/ivysaur_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ivysaur/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ivysaur_palette:: @ 8D308E8
-	.incbin "graphics/pokemon/palettes/ivysaur_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ivysaur/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ivysaur_back_pic:: @ 8D30910
-	.incbin "graphics/pokemon/back_pics/ivysaur_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ivysaur/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ivysaur_shiny_palette:: @ 8D30C64
-	.incbin "graphics/pokemon/palettes/ivysaur_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ivysaur/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ivysaur_icon:: @ 8D30C8C
-	.incbin "graphics/pokemon/icons/ivysaur_icon.4bpp"
+	.incbin "graphics/pokemon/ivysaur/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ivysaur_footprint:: @ 8D3108C
-	.incbin "graphics/pokemon/footprints/ivysaur_footprint.1bpp"
+	.incbin "graphics/pokemon/ivysaur/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_venusaur_still_front_pic:: @ 8D310AC
-	.incbin "graphics/pokemon/front_pics/venusaur_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venusaur/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venusaur_palette:: @ 8D315EC
-	.incbin "graphics/pokemon/palettes/venusaur_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venusaur/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_venusaur_back_pic:: @ 8D31614
-	.incbin "graphics/pokemon/back_pics/venusaur_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venusaur/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venusaur_shiny_palette:: @ 8D31ADC
-	.incbin "graphics/pokemon/palettes/venusaur_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venusaur/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_venusaur_icon:: @ 8D31B04
-	.incbin "graphics/pokemon/icons/venusaur_icon.4bpp"
+	.incbin "graphics/pokemon/venusaur/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_venusaur_footprint:: @ 8D31F04
-	.incbin "graphics/pokemon/footprints/venusaur_footprint.1bpp"
+	.incbin "graphics/pokemon/venusaur/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_charmander_still_front_pic:: @ 8D31F24
-	.incbin "graphics/pokemon/front_pics/charmander_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charmander/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charmander_palette:: @ 8D321C4
-	.incbin "graphics/pokemon/palettes/charmander_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charmander/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_charmander_back_pic:: @ 8D321EC
-	.incbin "graphics/pokemon/back_pics/charmander_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charmander/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charmander_shiny_palette:: @ 8D32470
-	.incbin "graphics/pokemon/palettes/charmander_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charmander/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_charmander_icon:: @ 8D32498
-	.incbin "graphics/pokemon/icons/charmander_icon.4bpp"
+	.incbin "graphics/pokemon/charmander/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_charmander_footprint:: @ 8D32898
-	.incbin "graphics/pokemon/footprints/charmander_footprint.1bpp"
+	.incbin "graphics/pokemon/charmander/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_charmeleon_still_front_pic:: @ 8D328B8
-	.incbin "graphics/pokemon/front_pics/charmeleon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charmeleon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charmeleon_palette:: @ 8D32C64
-	.incbin "graphics/pokemon/palettes/charmeleon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charmeleon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_charmeleon_back_pic:: @ 8D32C8C
-	.incbin "graphics/pokemon/back_pics/charmeleon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charmeleon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charmeleon_shiny_palette:: @ 8D32F80
-	.incbin "graphics/pokemon/palettes/charmeleon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charmeleon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_charmeleon_icon:: @ 8D32FA8
-	.incbin "graphics/pokemon/icons/charmeleon_icon.4bpp"
+	.incbin "graphics/pokemon/charmeleon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_charmeleon_footprint:: @ 8D333A8
-	.incbin "graphics/pokemon/footprints/charmeleon_footprint.1bpp"
+	.incbin "graphics/pokemon/charmeleon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_charizard_still_front_pic:: @ 8D333C8
-	.incbin "graphics/pokemon/front_pics/charizard_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charizard/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charizard_palette:: @ 8D338C4
-	.incbin "graphics/pokemon/palettes/charizard_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charizard/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_charizard_back_pic:: @ 8D338EC
-	.incbin "graphics/pokemon/back_pics/charizard_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charizard/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charizard_shiny_palette:: @ 8D33CF8
-	.incbin "graphics/pokemon/palettes/charizard_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charizard/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_charizard_icon:: @ 8D33D20
-	.incbin "graphics/pokemon/icons/charizard_icon.4bpp"
+	.incbin "graphics/pokemon/charizard/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_charizard_footprint:: @ 8D34120
-	.incbin "graphics/pokemon/footprints/charizard_footprint.1bpp"
+	.incbin "graphics/pokemon/charizard/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_squirtle_still_front_pic:: @ 8D34140
-	.incbin "graphics/pokemon/front_pics/squirtle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/squirtle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_squirtle_palette:: @ 8D343DC
-	.incbin "graphics/pokemon/palettes/squirtle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/squirtle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_squirtle_back_pic:: @ 8D34404
-	.incbin "graphics/pokemon/back_pics/squirtle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/squirtle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_squirtle_shiny_palette:: @ 8D3468C
-	.incbin "graphics/pokemon/palettes/squirtle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/squirtle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_squirtle_icon:: @ 8D346B4
-	.incbin "graphics/pokemon/icons/squirtle_icon.4bpp"
+	.incbin "graphics/pokemon/squirtle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_squirtle_footprint:: @ 8D34AB4
-	.incbin "graphics/pokemon/footprints/squirtle_footprint.1bpp"
+	.incbin "graphics/pokemon/squirtle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wartortle_still_front_pic:: @ 8D34AD4
-	.incbin "graphics/pokemon/front_pics/wartortle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wartortle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wartortle_palette:: @ 8D34E80
-	.incbin "graphics/pokemon/palettes/wartortle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wartortle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wartortle_back_pic:: @ 8D34EA8
-	.incbin "graphics/pokemon/back_pics/wartortle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wartortle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wartortle_shiny_palette:: @ 8D351F0
-	.incbin "graphics/pokemon/palettes/wartortle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wartortle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wartortle_icon:: @ 8D35218
-	.incbin "graphics/pokemon/icons/wartortle_icon.4bpp"
+	.incbin "graphics/pokemon/wartortle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wartortle_footprint:: @ 8D35618
-	.incbin "graphics/pokemon/footprints/wartortle_footprint.1bpp"
+	.incbin "graphics/pokemon/wartortle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_blastoise_still_front_pic:: @ 8D35638
-	.incbin "graphics/pokemon/front_pics/blastoise_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blastoise/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blastoise_palette:: @ 8D35B3C
-	.incbin "graphics/pokemon/palettes/blastoise_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blastoise/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_blastoise_back_pic:: @ 8D35B64
-	.incbin "graphics/pokemon/back_pics/blastoise_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blastoise/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blastoise_shiny_palette:: @ 8D35F78
-	.incbin "graphics/pokemon/palettes/blastoise_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blastoise/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_blastoise_icon:: @ 8D35FA0
-	.incbin "graphics/pokemon/icons/blastoise_icon.4bpp"
+	.incbin "graphics/pokemon/blastoise/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_blastoise_footprint:: @ 8D363A0
-	.incbin "graphics/pokemon/footprints/blastoise_footprint.1bpp"
+	.incbin "graphics/pokemon/blastoise/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_caterpie_still_front_pic:: @ 8D363C0
-	.incbin "graphics/pokemon/front_pics/caterpie_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/caterpie/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_caterpie_palette:: @ 8D36618
-	.incbin "graphics/pokemon/palettes/caterpie_palette.gbapal.lz"
+	.incbin "graphics/pokemon/caterpie/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_caterpie_back_pic:: @ 8D36640
-	.incbin "graphics/pokemon/back_pics/caterpie_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/caterpie/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_caterpie_shiny_palette:: @ 8D368C8
-	.incbin "graphics/pokemon/palettes/caterpie_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/caterpie/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_caterpie_icon:: @ 8D368F0
-	.incbin "graphics/pokemon/icons/caterpie_icon.4bpp"
+	.incbin "graphics/pokemon/caterpie/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_caterpie_footprint:: @ 8D36CF0
-	.incbin "graphics/pokemon/footprints/caterpie_footprint.1bpp"
+	.incbin "graphics/pokemon/caterpie/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_metapod_still_front_pic:: @ 8D36D10
-	.incbin "graphics/pokemon/front_pics/metapod_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metapod/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metapod_palette:: @ 8D36F2C
-	.incbin "graphics/pokemon/palettes/metapod_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metapod/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_metapod_back_pic:: @ 8D36F4C
-	.incbin "graphics/pokemon/back_pics/metapod_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metapod/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metapod_shiny_palette:: @ 8D37168
-	.incbin "graphics/pokemon/palettes/metapod_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metapod/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_metapod_icon:: @ 8D37188
-	.incbin "graphics/pokemon/icons/metapod_icon.4bpp"
+	.incbin "graphics/pokemon/metapod/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_metapod_footprint:: @ 8D37588
-	.incbin "graphics/pokemon/footprints/metapod_footprint.1bpp"
+	.incbin "graphics/pokemon/metapod/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_butterfree_still_front_pic:: @ 8D375A8
-	.incbin "graphics/pokemon/front_pics/butterfree_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/butterfree/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_butterfree_palette:: @ 8D37920
-	.incbin "graphics/pokemon/palettes/butterfree_palette.gbapal.lz"
+	.incbin "graphics/pokemon/butterfree/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_butterfree_back_pic:: @ 8D37948
-	.incbin "graphics/pokemon/back_pics/butterfree_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/butterfree/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_butterfree_shiny_palette:: @ 8D37D4C
-	.incbin "graphics/pokemon/palettes/butterfree_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/butterfree/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_butterfree_icon:: @ 8D37D74
-	.incbin "graphics/pokemon/icons/butterfree_icon.4bpp"
+	.incbin "graphics/pokemon/butterfree/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_butterfree_footprint:: @ 8D38174
-	.incbin "graphics/pokemon/footprints/butterfree_footprint.1bpp"
+	.incbin "graphics/pokemon/butterfree/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_weedle_still_front_pic:: @ 8D38194
-	.incbin "graphics/pokemon/front_pics/weedle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weedle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weedle_palette:: @ 8D383D0
-	.incbin "graphics/pokemon/palettes/weedle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weedle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_weedle_back_pic:: @ 8D383F8
-	.incbin "graphics/pokemon/back_pics/weedle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weedle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weedle_shiny_palette:: @ 8D38660
-	.incbin "graphics/pokemon/palettes/weedle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weedle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_weedle_icon:: @ 8D38688
-	.incbin "graphics/pokemon/icons/weedle_icon.4bpp"
+	.incbin "graphics/pokemon/weedle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_weedle_footprint:: @ 8D38A88
-	.incbin "graphics/pokemon/footprints/weedle_footprint.1bpp"
+	.incbin "graphics/pokemon/weedle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kakuna_still_front_pic:: @ 8D38AA8
-	.incbin "graphics/pokemon/front_pics/kakuna_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kakuna/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kakuna_palette:: @ 8D38CE8
-	.incbin "graphics/pokemon/palettes/kakuna_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kakuna/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kakuna_back_pic:: @ 8D38D0C
-	.incbin "graphics/pokemon/back_pics/kakuna_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kakuna/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kakuna_shiny_palette:: @ 8D38F90
-	.incbin "graphics/pokemon/palettes/kakuna_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kakuna/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kakuna_icon:: @ 8D38FB4
-	.incbin "graphics/pokemon/icons/kakuna_icon.4bpp"
+	.incbin "graphics/pokemon/kakuna/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kakuna_footprint:: @ 8D393B4
-	.incbin "graphics/pokemon/footprints/kakuna_footprint.1bpp"
+	.incbin "graphics/pokemon/kakuna/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_beedrill_still_front_pic:: @ 8D393D4
-	.incbin "graphics/pokemon/front_pics/beedrill_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beedrill/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beedrill_palette:: @ 8D397F4
-	.incbin "graphics/pokemon/palettes/beedrill_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beedrill/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_beedrill_back_pic:: @ 8D3981C
-	.incbin "graphics/pokemon/back_pics/beedrill_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beedrill/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beedrill_shiny_palette:: @ 8D39B90
-	.incbin "graphics/pokemon/palettes/beedrill_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beedrill/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_beedrill_icon:: @ 8D39BB8
-	.incbin "graphics/pokemon/icons/beedrill_icon.4bpp"
+	.incbin "graphics/pokemon/beedrill/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_beedrill_footprint:: @ 8D39FB8
-	.incbin "graphics/pokemon/footprints/beedrill_footprint.1bpp"
+	.incbin "graphics/pokemon/beedrill/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pidgey_still_front_pic:: @ 8D39FD8
-	.incbin "graphics/pokemon/front_pics/pidgey_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgey/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgey_palette:: @ 8D3A250
-	.incbin "graphics/pokemon/palettes/pidgey_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgey/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pidgey_back_pic:: @ 8D3A278
-	.incbin "graphics/pokemon/back_pics/pidgey_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgey/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgey_shiny_palette:: @ 8D3A5CC
-	.incbin "graphics/pokemon/palettes/pidgey_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgey/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pidgey_icon:: @ 8D3A5F4
-	.incbin "graphics/pokemon/icons/pidgey_icon.4bpp"
+	.incbin "graphics/pokemon/pidgey/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pidgey_footprint:: @ 8D3A9F4
-	.incbin "graphics/pokemon/footprints/pidgey_footprint.1bpp"
+	.incbin "graphics/pokemon/pidgey/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pidgeotto_still_front_pic:: @ 8D3AA14
-	.incbin "graphics/pokemon/front_pics/pidgeotto_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgeotto/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgeotto_palette:: @ 8D3ADAC
-	.incbin "graphics/pokemon/palettes/pidgeotto_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgeotto/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pidgeotto_back_pic:: @ 8D3ADD4
-	.incbin "graphics/pokemon/back_pics/pidgeotto_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgeotto/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgeotto_shiny_palette:: @ 8D3B120
-	.incbin "graphics/pokemon/palettes/pidgeotto_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgeotto/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pidgeotto_icon:: @ 8D3B148
-	.incbin "graphics/pokemon/icons/pidgeotto_icon.4bpp"
+	.incbin "graphics/pokemon/pidgeotto/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pidgeotto_footprint:: @ 8D3B548
-	.incbin "graphics/pokemon/footprints/pidgeotto_footprint.1bpp"
+	.incbin "graphics/pokemon/pidgeotto/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pidgeot_still_front_pic:: @ 8D3B568
-	.incbin "graphics/pokemon/front_pics/pidgeot_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgeot/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgeot_palette:: @ 8D3BA54
-	.incbin "graphics/pokemon/palettes/pidgeot_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgeot/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pidgeot_back_pic:: @ 8D3BA7C
-	.incbin "graphics/pokemon/back_pics/pidgeot_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgeot/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgeot_shiny_palette:: @ 8D3BE64
-	.incbin "graphics/pokemon/palettes/pidgeot_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgeot/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pidgeot_icon:: @ 8D3BE8C
-	.incbin "graphics/pokemon/icons/pidgeot_icon.4bpp"
+	.incbin "graphics/pokemon/pidgeot/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pidgeot_footprint:: @ 8D3C28C
-	.incbin "graphics/pokemon/footprints/pidgeot_footprint.1bpp"
+	.incbin "graphics/pokemon/pidgeot/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rattata_still_front_pic:: @ 8D3C2AC
-	.incbin "graphics/pokemon/front_pics/rattata_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rattata/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rattata_palette:: @ 8D3C504
-	.incbin "graphics/pokemon/palettes/rattata_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rattata/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rattata_back_pic:: @ 8D3C52C
-	.incbin "graphics/pokemon/back_pics/rattata_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rattata/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rattata_shiny_palette:: @ 8D3C7E4
-	.incbin "graphics/pokemon/palettes/rattata_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rattata/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rattata_icon:: @ 8D3C80C
-	.incbin "graphics/pokemon/icons/rattata_icon.4bpp"
+	.incbin "graphics/pokemon/rattata/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rattata_footprint:: @ 8D3CC0C
-	.incbin "graphics/pokemon/footprints/rattata_footprint.1bpp"
+	.incbin "graphics/pokemon/rattata/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_raticate_still_front_pic:: @ 8D3CC2C
-	.incbin "graphics/pokemon/front_pics/raticate_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raticate/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raticate_palette:: @ 8D3CFBC
-	.incbin "graphics/pokemon/palettes/raticate_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raticate/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_raticate_back_pic:: @ 8D3CFE4
-	.incbin "graphics/pokemon/back_pics/raticate_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raticate/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raticate_shiny_palette:: @ 8D3D2F4
-	.incbin "graphics/pokemon/palettes/raticate_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raticate/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_raticate_icon:: @ 8D3D31C
-	.incbin "graphics/pokemon/icons/raticate_icon.4bpp"
+	.incbin "graphics/pokemon/raticate/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_raticate_footprint:: @ 8D3D71C
-	.incbin "graphics/pokemon/footprints/raticate_footprint.1bpp"
+	.incbin "graphics/pokemon/raticate/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spearow_still_front_pic:: @ 8D3D73C
-	.incbin "graphics/pokemon/front_pics/spearow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spearow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spearow_palette:: @ 8D3D9FC
-	.incbin "graphics/pokemon/palettes/spearow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spearow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spearow_back_pic:: @ 8D3DA24
-	.incbin "graphics/pokemon/back_pics/spearow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spearow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spearow_shiny_palette:: @ 8D3DD00
-	.incbin "graphics/pokemon/palettes/spearow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spearow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spearow_icon:: @ 8D3DD28
-	.incbin "graphics/pokemon/icons/spearow_icon.4bpp"
+	.incbin "graphics/pokemon/spearow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spearow_footprint:: @ 8D3E128
-	.incbin "graphics/pokemon/footprints/spearow_footprint.1bpp"
+	.incbin "graphics/pokemon/spearow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_fearow_still_front_pic:: @ 8D3E148
-	.incbin "graphics/pokemon/front_pics/fearow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/fearow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_fearow_palette:: @ 8D3E604
-	.incbin "graphics/pokemon/palettes/fearow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/fearow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_fearow_back_pic:: @ 8D3E62C
-	.incbin "graphics/pokemon/back_pics/fearow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/fearow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_fearow_shiny_palette:: @ 8D3E924
-	.incbin "graphics/pokemon/palettes/fearow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/fearow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_fearow_icon:: @ 8D3E94C
-	.incbin "graphics/pokemon/icons/fearow_icon.4bpp"
+	.incbin "graphics/pokemon/fearow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_fearow_footprint:: @ 8D3ED4C
-	.incbin "graphics/pokemon/footprints/fearow_footprint.1bpp"
+	.incbin "graphics/pokemon/fearow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ekans_still_front_pic:: @ 8D3ED6C
-	.incbin "graphics/pokemon/front_pics/ekans_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ekans/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ekans_palette:: @ 8D3F034
-	.incbin "graphics/pokemon/palettes/ekans_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ekans/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ekans_back_pic:: @ 8D3F05C
-	.incbin "graphics/pokemon/back_pics/ekans_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ekans/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ekans_shiny_palette:: @ 8D3F34C
-	.incbin "graphics/pokemon/palettes/ekans_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ekans/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ekans_icon:: @ 8D3F374
-	.incbin "graphics/pokemon/icons/ekans_icon.4bpp"
+	.incbin "graphics/pokemon/ekans/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ekans_footprint:: @ 8D3F774
-	.incbin "graphics/pokemon/footprints/ekans_footprint.1bpp"
+	.incbin "graphics/pokemon/ekans/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_arbok_still_front_pic:: @ 8D3F794
-	.incbin "graphics/pokemon/front_pics/arbok_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/arbok/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_arbok_palette:: @ 8D3FC08
-	.incbin "graphics/pokemon/palettes/arbok_palette.gbapal.lz"
+	.incbin "graphics/pokemon/arbok/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_arbok_back_pic:: @ 8D3FC30
-	.incbin "graphics/pokemon/back_pics/arbok_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/arbok/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_arbok_shiny_palette:: @ 8D3FEB8
-	.incbin "graphics/pokemon/palettes/arbok_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/arbok/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_arbok_icon:: @ 8D3FEE0
-	.incbin "graphics/pokemon/icons/arbok_icon.4bpp"
+	.incbin "graphics/pokemon/arbok/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_arbok_footprint:: @ 8D402E0
-	.incbin "graphics/pokemon/footprints/arbok_footprint.1bpp"
+	.incbin "graphics/pokemon/arbok/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pikachu_still_front_pic:: @ 8D40300
-	.incbin "graphics/pokemon/front_pics/pikachu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pikachu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pikachu_palette:: @ 8D405D0
-	.incbin "graphics/pokemon/palettes/pikachu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pikachu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pikachu_back_pic:: @ 8D405F8
-	.incbin "graphics/pokemon/back_pics/pikachu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pikachu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pikachu_shiny_palette:: @ 8D408D0
-	.incbin "graphics/pokemon/palettes/pikachu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pikachu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pikachu_icon:: @ 8D408F8
-	.incbin "graphics/pokemon/icons/pikachu_icon.4bpp"
+	.incbin "graphics/pokemon/pikachu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pikachu_footprint:: @ 8D40CF8
-	.incbin "graphics/pokemon/footprints/pikachu_footprint.1bpp"
+	.incbin "graphics/pokemon/pikachu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_raichu_still_front_pic:: @ 8D40D18
-	.incbin "graphics/pokemon/front_pics/raichu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raichu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raichu_palette:: @ 8D41110
-	.incbin "graphics/pokemon/palettes/raichu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raichu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_raichu_back_pic:: @ 8D41138
-	.incbin "graphics/pokemon/back_pics/raichu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raichu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raichu_shiny_palette:: @ 8D41458
-	.incbin "graphics/pokemon/palettes/raichu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raichu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_raichu_icon:: @ 8D41480
-	.incbin "graphics/pokemon/icons/raichu_icon.4bpp"
+	.incbin "graphics/pokemon/raichu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_raichu_footprint:: @ 8D41880
-	.incbin "graphics/pokemon/footprints/raichu_footprint.1bpp"
+	.incbin "graphics/pokemon/raichu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sandshrew_still_front_pic:: @ 8D418A0
-	.incbin "graphics/pokemon/front_pics/sandshrew_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sandshrew/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sandshrew_palette:: @ 8D41B7C
-	.incbin "graphics/pokemon/palettes/sandshrew_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sandshrew/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sandshrew_back_pic:: @ 8D41BA4
-	.incbin "graphics/pokemon/back_pics/sandshrew_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sandshrew/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sandshrew_shiny_palette:: @ 8D41ECC
-	.incbin "graphics/pokemon/palettes/sandshrew_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sandshrew/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sandshrew_icon:: @ 8D41EF4
-	.incbin "graphics/pokemon/icons/sandshrew_icon.4bpp"
+	.incbin "graphics/pokemon/sandshrew/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sandshrew_footprint:: @ 8D422F4
-	.incbin "graphics/pokemon/footprints/sandshrew_footprint.1bpp"
+	.incbin "graphics/pokemon/sandshrew/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sandslash_still_front_pic:: @ 8D42314
-	.incbin "graphics/pokemon/front_pics/sandslash_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sandslash/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sandslash_palette:: @ 8D4272C
-	.incbin "graphics/pokemon/palettes/sandslash_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sandslash/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sandslash_back_pic:: @ 8D42754
-	.incbin "graphics/pokemon/back_pics/sandslash_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sandslash/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sandslash_shiny_palette:: @ 8D42B70
-	.incbin "graphics/pokemon/palettes/sandslash_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sandslash/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sandslash_icon:: @ 8D42B98
-	.incbin "graphics/pokemon/icons/sandslash_icon.4bpp"
+	.incbin "graphics/pokemon/sandslash/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sandslash_footprint:: @ 8D42F98
-	.incbin "graphics/pokemon/footprints/sandslash_footprint.1bpp"
+	.incbin "graphics/pokemon/sandslash/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidoran_f_still_front_pic:: @ 8D42FB8
-	.incbin "graphics/pokemon/front_pics/nidoran_f_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoran_f/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoran_f_palette:: @ 8D4321C
-	.incbin "graphics/pokemon/palettes/nidoran_f_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoran_f/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidoran_f_back_pic:: @ 8D43244
-	.incbin "graphics/pokemon/back_pics/nidoran_f_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoran_f/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoran_f_shiny_palette:: @ 8D43524
-	.incbin "graphics/pokemon/palettes/nidoran_f_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoran_f/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidoran_f_icon:: @ 8D4354C
-	.incbin "graphics/pokemon/icons/nidoran_f_icon.4bpp"
+	.incbin "graphics/pokemon/nidoran_f/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidoran_f_footprint:: @ 8D4394C
-	.incbin "graphics/pokemon/footprints/nidoran_f_footprint.1bpp"
+	.incbin "graphics/pokemon/nidoran_f/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidorina_still_front_pic:: @ 8D4396C
-	.incbin "graphics/pokemon/front_pics/nidorina_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidorina/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidorina_palette:: @ 8D43C8C
-	.incbin "graphics/pokemon/palettes/nidorina_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidorina/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidorina_back_pic:: @ 8D43CB4
-	.incbin "graphics/pokemon/back_pics/nidorina_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidorina/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidorina_shiny_palette:: @ 8D44048
-	.incbin "graphics/pokemon/palettes/nidorina_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidorina/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidorina_icon:: @ 8D44070
-	.incbin "graphics/pokemon/icons/nidorina_icon.4bpp"
+	.incbin "graphics/pokemon/nidorina/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidorina_footprint:: @ 8D44470
-	.incbin "graphics/pokemon/footprints/nidorina_footprint.1bpp"
+	.incbin "graphics/pokemon/nidorina/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidoqueen_still_front_pic:: @ 8D44490
-	.incbin "graphics/pokemon/front_pics/nidoqueen_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoqueen/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoqueen_palette:: @ 8D448BC
-	.incbin "graphics/pokemon/palettes/nidoqueen_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoqueen/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidoqueen_back_pic:: @ 8D448E4
-	.incbin "graphics/pokemon/back_pics/nidoqueen_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoqueen/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoqueen_shiny_palette:: @ 8D44CA8
-	.incbin "graphics/pokemon/palettes/nidoqueen_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoqueen/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidoqueen_icon:: @ 8D44CD0
-	.incbin "graphics/pokemon/icons/nidoqueen_icon.4bpp"
+	.incbin "graphics/pokemon/nidoqueen/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidoqueen_footprint:: @ 8D450D0
-	.incbin "graphics/pokemon/footprints/nidoqueen_footprint.1bpp"
+	.incbin "graphics/pokemon/nidoqueen/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidoran_m_still_front_pic:: @ 8D450F0
-	.incbin "graphics/pokemon/front_pics/nidoran_m_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoran_m/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoran_m_palette:: @ 8D4537C
-	.incbin "graphics/pokemon/palettes/nidoran_m_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoran_m/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidoran_m_back_pic:: @ 8D453A4
-	.incbin "graphics/pokemon/back_pics/nidoran_m_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoran_m/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoran_m_shiny_palette:: @ 8D456D8
-	.incbin "graphics/pokemon/palettes/nidoran_m_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoran_m/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidoran_m_icon:: @ 8D45700
-	.incbin "graphics/pokemon/icons/nidoran_m_icon.4bpp"
+	.incbin "graphics/pokemon/nidoran_m/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidoran_m_footprint:: @ 8D45B00
-	.incbin "graphics/pokemon/footprints/nidoran_m_footprint.1bpp"
+	.incbin "graphics/pokemon/nidoran_m/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidorino_still_front_pic:: @ 8D45B20
-	.incbin "graphics/pokemon/front_pics/nidorino_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidorino/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidorino_palette:: @ 8D45EA4
-	.incbin "graphics/pokemon/palettes/nidorino_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidorino/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidorino_back_pic:: @ 8D45ECC
-	.incbin "graphics/pokemon/back_pics/nidorino_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidorino/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidorino_shiny_palette:: @ 8D46288
-	.incbin "graphics/pokemon/palettes/nidorino_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidorino/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidorino_icon:: @ 8D462B0
-	.incbin "graphics/pokemon/icons/nidorino_icon.4bpp"
+	.incbin "graphics/pokemon/nidorino/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidorino_footprint:: @ 8D466B0
-	.incbin "graphics/pokemon/footprints/nidorino_footprint.1bpp"
+	.incbin "graphics/pokemon/nidorino/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidoking_still_front_pic:: @ 8D466D0
-	.incbin "graphics/pokemon/front_pics/nidoking_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoking/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoking_palette:: @ 8D46C0C
-	.incbin "graphics/pokemon/palettes/nidoking_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoking/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidoking_back_pic:: @ 8D46C34
-	.incbin "graphics/pokemon/back_pics/nidoking_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoking/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoking_shiny_palette:: @ 8D47070
-	.incbin "graphics/pokemon/palettes/nidoking_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoking/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidoking_icon:: @ 8D47098
-	.incbin "graphics/pokemon/icons/nidoking_icon.4bpp"
+	.incbin "graphics/pokemon/nidoking/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidoking_footprint:: @ 8D47498
-	.incbin "graphics/pokemon/footprints/nidoking_footprint.1bpp"
+	.incbin "graphics/pokemon/nidoking/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_clefairy_still_front_pic:: @ 8D474B8
-	.incbin "graphics/pokemon/front_pics/clefairy_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clefairy/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clefairy_palette:: @ 8D47754
-	.incbin "graphics/pokemon/palettes/clefairy_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clefairy/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_clefairy_back_pic:: @ 8D4777C
-	.incbin "graphics/pokemon/back_pics/clefairy_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clefairy/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clefairy_shiny_palette:: @ 8D47A4C
-	.incbin "graphics/pokemon/palettes/clefairy_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clefairy/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_clefairy_icon:: @ 8D47A74
-	.incbin "graphics/pokemon/icons/clefairy_icon.4bpp"
+	.incbin "graphics/pokemon/clefairy/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_clefairy_footprint:: @ 8D47E74
-	.incbin "graphics/pokemon/footprints/clefairy_footprint.1bpp"
+	.incbin "graphics/pokemon/clefairy/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_clefable_still_front_pic:: @ 8D47E94
-	.incbin "graphics/pokemon/front_pics/clefable_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clefable/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clefable_palette:: @ 8D481D4
-	.incbin "graphics/pokemon/palettes/clefable_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clefable/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_clefable_back_pic:: @ 8D481FC
-	.incbin "graphics/pokemon/back_pics/clefable_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clefable/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clefable_shiny_palette:: @ 8D48534
-	.incbin "graphics/pokemon/palettes/clefable_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clefable/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_clefable_icon:: @ 8D4855C
-	.incbin "graphics/pokemon/icons/clefable_icon.4bpp"
+	.incbin "graphics/pokemon/clefable/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_clefable_footprint:: @ 8D4895C
-	.incbin "graphics/pokemon/footprints/clefable_footprint.1bpp"
+	.incbin "graphics/pokemon/clefable/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vulpix_still_front_pic:: @ 8D4897C
-	.incbin "graphics/pokemon/front_pics/vulpix_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vulpix/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vulpix_palette:: @ 8D48CA8
-	.incbin "graphics/pokemon/palettes/vulpix_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vulpix/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vulpix_back_pic:: @ 8D48CD0
-	.incbin "graphics/pokemon/back_pics/vulpix_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vulpix/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vulpix_shiny_palette:: @ 8D48FD4
-	.incbin "graphics/pokemon/palettes/vulpix_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vulpix/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vulpix_icon:: @ 8D48FFC
-	.incbin "graphics/pokemon/icons/vulpix_icon.4bpp"
+	.incbin "graphics/pokemon/vulpix/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vulpix_footprint:: @ 8D493FC
-	.incbin "graphics/pokemon/footprints/vulpix_footprint.1bpp"
+	.incbin "graphics/pokemon/vulpix/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ninetales_still_front_pic:: @ 8D4941C
-	.incbin "graphics/pokemon/front_pics/ninetales_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ninetales/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ninetales_palette:: @ 8D49870
-	.incbin "graphics/pokemon/palettes/ninetales_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ninetales/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ninetales_back_pic:: @ 8D49894
-	.incbin "graphics/pokemon/back_pics/ninetales_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ninetales/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ninetales_shiny_palette:: @ 8D49C84
-	.incbin "graphics/pokemon/palettes/ninetales_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ninetales/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ninetales_icon:: @ 8D49CA8
-	.incbin "graphics/pokemon/icons/ninetales_icon.4bpp"
+	.incbin "graphics/pokemon/ninetales/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ninetales_footprint:: @ 8D4A0A8
-	.incbin "graphics/pokemon/footprints/ninetales_footprint.1bpp"
+	.incbin "graphics/pokemon/ninetales/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jigglypuff_still_front_pic:: @ 8D4A0C8
-	.incbin "graphics/pokemon/front_pics/jigglypuff_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jigglypuff/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jigglypuff_palette:: @ 8D4A34C
-	.incbin "graphics/pokemon/palettes/jigglypuff_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jigglypuff/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jigglypuff_back_pic:: @ 8D4A374
-	.incbin "graphics/pokemon/back_pics/jigglypuff_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jigglypuff/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jigglypuff_shiny_palette:: @ 8D4A5D0
-	.incbin "graphics/pokemon/palettes/jigglypuff_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jigglypuff/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jigglypuff_icon:: @ 8D4A5F8
-	.incbin "graphics/pokemon/icons/jigglypuff_icon.4bpp"
+	.incbin "graphics/pokemon/jigglypuff/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jigglypuff_footprint:: @ 8D4A9F8
-	.incbin "graphics/pokemon/footprints/jigglypuff_footprint.1bpp"
+	.incbin "graphics/pokemon/jigglypuff/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wigglytuff_still_front_pic:: @ 8D4AA18
-	.incbin "graphics/pokemon/front_pics/wigglytuff_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wigglytuff/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wigglytuff_palette:: @ 8D4AD8C
-	.incbin "graphics/pokemon/palettes/wigglytuff_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wigglytuff/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wigglytuff_back_pic:: @ 8D4ADB4
-	.incbin "graphics/pokemon/back_pics/wigglytuff_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wigglytuff/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wigglytuff_shiny_palette:: @ 8D4B04C
-	.incbin "graphics/pokemon/palettes/wigglytuff_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wigglytuff/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wigglytuff_icon:: @ 8D4B074
-	.incbin "graphics/pokemon/icons/wigglytuff_icon.4bpp"
+	.incbin "graphics/pokemon/wigglytuff/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wigglytuff_footprint:: @ 8D4B474
-	.incbin "graphics/pokemon/footprints/wigglytuff_footprint.1bpp"
+	.incbin "graphics/pokemon/wigglytuff/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_zubat_still_front_pic:: @ 8D4B494
-	.incbin "graphics/pokemon/front_pics/zubat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zubat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zubat_palette:: @ 8D4B750
-	.incbin "graphics/pokemon/palettes/zubat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zubat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_zubat_back_pic:: @ 8D4B778
-	.incbin "graphics/pokemon/back_pics/zubat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zubat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zubat_shiny_palette:: @ 8D4BA34
-	.incbin "graphics/pokemon/palettes/zubat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zubat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_zubat_icon:: @ 8D4BA5C
-	.incbin "graphics/pokemon/icons/zubat_icon.4bpp"
+	.incbin "graphics/pokemon/zubat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_zubat_footprint:: @ 8D4BE5C
-	.incbin "graphics/pokemon/footprints/zubat_footprint.1bpp"
+	.incbin "graphics/pokemon/zubat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_golbat_still_front_pic:: @ 8D4BE7C
-	.incbin "graphics/pokemon/front_pics/golbat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golbat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golbat_palette:: @ 8D4C21C
-	.incbin "graphics/pokemon/palettes/golbat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golbat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_golbat_back_pic:: @ 8D4C244
-	.incbin "graphics/pokemon/back_pics/golbat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golbat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golbat_shiny_palette:: @ 8D4C500
-	.incbin "graphics/pokemon/palettes/golbat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golbat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_golbat_icon:: @ 8D4C528
-	.incbin "graphics/pokemon/icons/golbat_icon.4bpp"
+	.incbin "graphics/pokemon/golbat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_golbat_footprint:: @ 8D4C928
-	.incbin "graphics/pokemon/footprints/golbat_footprint.1bpp"
+	.incbin "graphics/pokemon/golbat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_oddish_still_front_pic:: @ 8D4C948
-	.incbin "graphics/pokemon/front_pics/oddish_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/oddish/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_oddish_palette:: @ 8D4CB88
-	.incbin "graphics/pokemon/palettes/oddish_palette.gbapal.lz"
+	.incbin "graphics/pokemon/oddish/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_oddish_back_pic:: @ 8D4CBB0
-	.incbin "graphics/pokemon/back_pics/oddish_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/oddish/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_oddish_shiny_palette:: @ 8D4CE74
-	.incbin "graphics/pokemon/palettes/oddish_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/oddish/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_oddish_icon:: @ 8D4CE9C
-	.incbin "graphics/pokemon/icons/oddish_icon.4bpp"
+	.incbin "graphics/pokemon/oddish/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_oddish_footprint:: @ 8D4D29C
-	.incbin "graphics/pokemon/footprints/oddish_footprint.1bpp"
+	.incbin "graphics/pokemon/oddish/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gloom_still_front_pic:: @ 8D4D2BC
-	.incbin "graphics/pokemon/front_pics/gloom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gloom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gloom_palette:: @ 8D4D624
-	.incbin "graphics/pokemon/palettes/gloom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gloom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gloom_back_pic:: @ 8D4D64C
-	.incbin "graphics/pokemon/back_pics/gloom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gloom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gloom_shiny_palette:: @ 8D4D9CC
-	.incbin "graphics/pokemon/palettes/gloom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gloom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gloom_icon:: @ 8D4D9F4
-	.incbin "graphics/pokemon/icons/gloom_icon.4bpp"
+	.incbin "graphics/pokemon/gloom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gloom_footprint:: @ 8D4DDF4
-	.incbin "graphics/pokemon/footprints/gloom_footprint.1bpp"
+	.incbin "graphics/pokemon/gloom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vileplume_still_front_pic:: @ 8D4DE14
-	.incbin "graphics/pokemon/front_pics/vileplume_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vileplume/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vileplume_palette:: @ 8D4E168
-	.incbin "graphics/pokemon/palettes/vileplume_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vileplume/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vileplume_back_pic:: @ 8D4E190
-	.incbin "graphics/pokemon/back_pics/vileplume_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vileplume/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vileplume_shiny_palette:: @ 8D4E5DC
-	.incbin "graphics/pokemon/palettes/vileplume_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vileplume/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vileplume_icon:: @ 8D4E604
-	.incbin "graphics/pokemon/icons/vileplume_icon.4bpp"
+	.incbin "graphics/pokemon/vileplume/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vileplume_footprint:: @ 8D4EA04
-	.incbin "graphics/pokemon/footprints/vileplume_footprint.1bpp"
+	.incbin "graphics/pokemon/vileplume/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_paras_still_front_pic:: @ 8D4EA24
-	.incbin "graphics/pokemon/front_pics/paras_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/paras/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_paras_palette:: @ 8D4EC90
-	.incbin "graphics/pokemon/palettes/paras_palette.gbapal.lz"
+	.incbin "graphics/pokemon/paras/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_paras_back_pic:: @ 8D4ECB8
-	.incbin "graphics/pokemon/back_pics/paras_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/paras/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_paras_shiny_palette:: @ 8D4EF58
-	.incbin "graphics/pokemon/palettes/paras_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/paras/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_paras_icon:: @ 8D4EF80
-	.incbin "graphics/pokemon/icons/paras_icon.4bpp"
+	.incbin "graphics/pokemon/paras/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_paras_footprint:: @ 8D4F380
-	.incbin "graphics/pokemon/footprints/paras_footprint.1bpp"
+	.incbin "graphics/pokemon/paras/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_parasect_still_front_pic:: @ 8D4F3A0
-	.incbin "graphics/pokemon/front_pics/parasect_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/parasect/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_parasect_palette:: @ 8D4F730
-	.incbin "graphics/pokemon/palettes/parasect_palette.gbapal.lz"
+	.incbin "graphics/pokemon/parasect/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_parasect_back_pic:: @ 8D4F758
-	.incbin "graphics/pokemon/back_pics/parasect_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/parasect/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_parasect_shiny_palette:: @ 8D4FA54
-	.incbin "graphics/pokemon/palettes/parasect_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/parasect/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_parasect_icon:: @ 8D4FA7C
-	.incbin "graphics/pokemon/icons/parasect_icon.4bpp"
+	.incbin "graphics/pokemon/parasect/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_parasect_footprint:: @ 8D4FE7C
-	.incbin "graphics/pokemon/footprints/parasect_footprint.1bpp"
+	.incbin "graphics/pokemon/parasect/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_venonat_still_front_pic:: @ 8D4FE9C
-	.incbin "graphics/pokemon/front_pics/venonat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venonat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venonat_palette:: @ 8D501BC
-	.incbin "graphics/pokemon/palettes/venonat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venonat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_venonat_back_pic:: @ 8D501E4
-	.incbin "graphics/pokemon/back_pics/venonat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venonat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venonat_shiny_palette:: @ 8D50514
-	.incbin "graphics/pokemon/palettes/venonat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venonat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_venonat_icon:: @ 8D5053C
-	.incbin "graphics/pokemon/icons/venonat_icon.4bpp"
+	.incbin "graphics/pokemon/venonat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_venonat_footprint:: @ 8D5093C
-	.incbin "graphics/pokemon/footprints/venonat_footprint.1bpp"
+	.incbin "graphics/pokemon/venonat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_venomoth_still_front_pic:: @ 8D5095C
-	.incbin "graphics/pokemon/front_pics/venomoth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venomoth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venomoth_palette:: @ 8D50D60
-	.incbin "graphics/pokemon/palettes/venomoth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venomoth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_venomoth_back_pic:: @ 8D50D88
-	.incbin "graphics/pokemon/back_pics/venomoth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venomoth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venomoth_shiny_palette:: @ 8D5112C
-	.incbin "graphics/pokemon/palettes/venomoth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venomoth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_venomoth_icon:: @ 8D51154
-	.incbin "graphics/pokemon/icons/venomoth_icon.4bpp"
+	.incbin "graphics/pokemon/venomoth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_venomoth_footprint:: @ 8D51554
-	.incbin "graphics/pokemon/footprints/venomoth_footprint.1bpp"
+	.incbin "graphics/pokemon/venomoth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_diglett_still_front_pic:: @ 8D51574
-	.incbin "graphics/pokemon/front_pics/diglett_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/diglett/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_diglett_palette:: @ 8D51784
-	.incbin "graphics/pokemon/palettes/diglett_palette.gbapal.lz"
+	.incbin "graphics/pokemon/diglett/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_diglett_back_pic:: @ 8D517AC
-	.incbin "graphics/pokemon/back_pics/diglett_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/diglett/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_diglett_shiny_palette:: @ 8D519B8
-	.incbin "graphics/pokemon/palettes/diglett_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/diglett/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_diglett_icon:: @ 8D519E0
-	.incbin "graphics/pokemon/icons/diglett_icon.4bpp"
+	.incbin "graphics/pokemon/diglett/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_diglett_footprint:: @ 8D51DE0
-	.incbin "graphics/pokemon/footprints/diglett_footprint.1bpp"
+	.incbin "graphics/pokemon/diglett/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dugtrio_still_front_pic:: @ 8D51E00
-	.incbin "graphics/pokemon/front_pics/dugtrio_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dugtrio/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dugtrio_palette:: @ 8D5212C
-	.incbin "graphics/pokemon/palettes/dugtrio_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dugtrio/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dugtrio_back_pic:: @ 8D52154
-	.incbin "graphics/pokemon/back_pics/dugtrio_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dugtrio/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dugtrio_shiny_palette:: @ 8D52400
-	.incbin "graphics/pokemon/palettes/dugtrio_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dugtrio/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dugtrio_icon:: @ 8D52428
-	.incbin "graphics/pokemon/icons/dugtrio_icon.4bpp"
+	.incbin "graphics/pokemon/dugtrio/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dugtrio_footprint:: @ 8D52828
-	.incbin "graphics/pokemon/footprints/dugtrio_footprint.1bpp"
+	.incbin "graphics/pokemon/dugtrio/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_meowth_still_front_pic:: @ 8D52848
-	.incbin "graphics/pokemon/front_pics/meowth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meowth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meowth_palette:: @ 8D52B34
-	.incbin "graphics/pokemon/palettes/meowth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meowth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_meowth_back_pic:: @ 8D52B5C
-	.incbin "graphics/pokemon/back_pics/meowth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meowth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meowth_shiny_palette:: @ 8D52E40
-	.incbin "graphics/pokemon/palettes/meowth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meowth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_meowth_icon:: @ 8D52E68
-	.incbin "graphics/pokemon/icons/meowth_icon.4bpp"
+	.incbin "graphics/pokemon/meowth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_meowth_footprint:: @ 8D53268
-	.incbin "graphics/pokemon/footprints/meowth_footprint.1bpp"
+	.incbin "graphics/pokemon/meowth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_persian_still_front_pic:: @ 8D53288
-	.incbin "graphics/pokemon/front_pics/persian_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/persian/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_persian_palette:: @ 8D53600
-	.incbin "graphics/pokemon/palettes/persian_palette.gbapal.lz"
+	.incbin "graphics/pokemon/persian/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_persian_back_pic:: @ 8D53628
-	.incbin "graphics/pokemon/back_pics/persian_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/persian/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_persian_shiny_palette:: @ 8D53968
-	.incbin "graphics/pokemon/palettes/persian_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/persian/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_persian_icon:: @ 8D53990
-	.incbin "graphics/pokemon/icons/persian_icon.4bpp"
+	.incbin "graphics/pokemon/persian/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_persian_footprint:: @ 8D53D90
-	.incbin "graphics/pokemon/footprints/persian_footprint.1bpp"
+	.incbin "graphics/pokemon/persian/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_psyduck_still_front_pic:: @ 8D53DB0
-	.incbin "graphics/pokemon/front_pics/psyduck_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/psyduck/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_psyduck_palette:: @ 8D54094
-	.incbin "graphics/pokemon/palettes/psyduck_palette.gbapal.lz"
+	.incbin "graphics/pokemon/psyduck/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_psyduck_back_pic:: @ 8D540BC
-	.incbin "graphics/pokemon/back_pics/psyduck_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/psyduck/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_psyduck_shiny_palette:: @ 8D54358
-	.incbin "graphics/pokemon/palettes/psyduck_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/psyduck/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_psyduck_icon:: @ 8D54380
-	.incbin "graphics/pokemon/icons/psyduck_icon.4bpp"
+	.incbin "graphics/pokemon/psyduck/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_psyduck_footprint:: @ 8D54780
-	.incbin "graphics/pokemon/footprints/psyduck_footprint.1bpp"
+	.incbin "graphics/pokemon/psyduck/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_golduck_still_front_pic:: @ 8D547A0
-	.incbin "graphics/pokemon/front_pics/golduck_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golduck/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golduck_palette:: @ 8D54B58
-	.incbin "graphics/pokemon/palettes/golduck_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golduck/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_golduck_back_pic:: @ 8D54B80
-	.incbin "graphics/pokemon/back_pics/golduck_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golduck/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golduck_shiny_palette:: @ 8D54EAC
-	.incbin "graphics/pokemon/palettes/golduck_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golduck/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_golduck_icon:: @ 8D54ED4
-	.incbin "graphics/pokemon/icons/golduck_icon.4bpp"
+	.incbin "graphics/pokemon/golduck/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_golduck_footprint:: @ 8D552D4
-	.incbin "graphics/pokemon/footprints/golduck_footprint.1bpp"
+	.incbin "graphics/pokemon/golduck/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mankey_still_front_pic:: @ 8D552F4
-	.incbin "graphics/pokemon/front_pics/mankey_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mankey/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mankey_palette:: @ 8D555EC
-	.incbin "graphics/pokemon/palettes/mankey_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mankey/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mankey_back_pic:: @ 8D55614
-	.incbin "graphics/pokemon/back_pics/mankey_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mankey/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mankey_shiny_palette:: @ 8D5597C
-	.incbin "graphics/pokemon/palettes/mankey_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mankey/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mankey_icon:: @ 8D559A4
-	.incbin "graphics/pokemon/icons/mankey_icon.4bpp"
+	.incbin "graphics/pokemon/mankey/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mankey_footprint:: @ 8D55DA4
-	.incbin "graphics/pokemon/footprints/mankey_footprint.1bpp"
+	.incbin "graphics/pokemon/mankey/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_primeape_still_front_pic:: @ 8D55DC4
-	.incbin "graphics/pokemon/front_pics/primeape_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/primeape/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_primeape_palette:: @ 8D56150
-	.incbin "graphics/pokemon/palettes/primeape_palette.gbapal.lz"
+	.incbin "graphics/pokemon/primeape/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_primeape_back_pic:: @ 8D56178
-	.incbin "graphics/pokemon/back_pics/primeape_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/primeape/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_primeape_shiny_palette:: @ 8D564E8
-	.incbin "graphics/pokemon/palettes/primeape_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/primeape/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_primeape_icon:: @ 8D56510
-	.incbin "graphics/pokemon/icons/primeape_icon.4bpp"
+	.incbin "graphics/pokemon/primeape/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_primeape_footprint:: @ 8D56910
-	.incbin "graphics/pokemon/footprints/primeape_footprint.1bpp"
+	.incbin "graphics/pokemon/primeape/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_growlithe_still_front_pic:: @ 8D56930
-	.incbin "graphics/pokemon/front_pics/growlithe_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/growlithe/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_growlithe_palette:: @ 8D56C58
-	.incbin "graphics/pokemon/palettes/growlithe_palette.gbapal.lz"
+	.incbin "graphics/pokemon/growlithe/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_growlithe_back_pic:: @ 8D56C80
-	.incbin "graphics/pokemon/back_pics/growlithe_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/growlithe/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_growlithe_shiny_palette:: @ 8D56FBC
-	.incbin "graphics/pokemon/palettes/growlithe_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/growlithe/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_growlithe_icon:: @ 8D56FE4
-	.incbin "graphics/pokemon/icons/growlithe_icon.4bpp"
+	.incbin "graphics/pokemon/growlithe/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_growlithe_footprint:: @ 8D573E4
-	.incbin "graphics/pokemon/footprints/growlithe_footprint.1bpp"
+	.incbin "graphics/pokemon/growlithe/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_arcanine_still_front_pic:: @ 8D57404
-	.incbin "graphics/pokemon/front_pics/arcanine_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/arcanine/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_arcanine_palette:: @ 8D57900
-	.incbin "graphics/pokemon/palettes/arcanine_palette.gbapal.lz"
+	.incbin "graphics/pokemon/arcanine/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_arcanine_back_pic:: @ 8D57928
-	.incbin "graphics/pokemon/back_pics/arcanine_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/arcanine/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_arcanine_shiny_palette:: @ 8D57D08
-	.incbin "graphics/pokemon/palettes/arcanine_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/arcanine/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_arcanine_icon:: @ 8D57D30
-	.incbin "graphics/pokemon/icons/arcanine_icon.4bpp"
+	.incbin "graphics/pokemon/arcanine/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_arcanine_footprint:: @ 8D58130
-	.incbin "graphics/pokemon/footprints/arcanine_footprint.1bpp"
+	.incbin "graphics/pokemon/arcanine/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_poliwag_still_front_pic:: @ 8D58150
-	.incbin "graphics/pokemon/front_pics/poliwag_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwag/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwag_palette:: @ 8D583EC
-	.incbin "graphics/pokemon/palettes/poliwag_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwag/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_poliwag_back_pic:: @ 8D58414
-	.incbin "graphics/pokemon/back_pics/poliwag_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwag/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwag_shiny_palette:: @ 8D58678
-	.incbin "graphics/pokemon/palettes/poliwag_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwag/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_poliwag_icon:: @ 8D586A0
-	.incbin "graphics/pokemon/icons/poliwag_icon.4bpp"
+	.incbin "graphics/pokemon/poliwag/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_poliwag_footprint:: @ 8D58AA0
-	.incbin "graphics/pokemon/footprints/poliwag_footprint.1bpp"
+	.incbin "graphics/pokemon/poliwag/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_poliwhirl_still_front_pic:: @ 8D58AC0
-	.incbin "graphics/pokemon/front_pics/poliwhirl_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwhirl/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwhirl_palette:: @ 8D58E40
-	.incbin "graphics/pokemon/palettes/poliwhirl_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwhirl/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_poliwhirl_back_pic:: @ 8D58E68
-	.incbin "graphics/pokemon/back_pics/poliwhirl_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwhirl/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwhirl_shiny_palette:: @ 8D590E4
-	.incbin "graphics/pokemon/palettes/poliwhirl_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwhirl/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_poliwhirl_icon:: @ 8D5910C
-	.incbin "graphics/pokemon/icons/poliwhirl_icon.4bpp"
+	.incbin "graphics/pokemon/poliwhirl/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_poliwhirl_footprint:: @ 8D5950C
-	.incbin "graphics/pokemon/footprints/poliwhirl_footprint.1bpp"
+	.incbin "graphics/pokemon/poliwhirl/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_poliwrath_still_front_pic:: @ 8D5952C
-	.incbin "graphics/pokemon/front_pics/poliwrath_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwrath/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwrath_palette:: @ 8D598F0
-	.incbin "graphics/pokemon/palettes/poliwrath_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwrath/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_poliwrath_back_pic:: @ 8D59918
-	.incbin "graphics/pokemon/back_pics/poliwrath_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwrath/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwrath_shiny_palette:: @ 8D59C0C
-	.incbin "graphics/pokemon/palettes/poliwrath_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwrath/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_poliwrath_icon:: @ 8D59C34
-	.incbin "graphics/pokemon/icons/poliwrath_icon.4bpp"
+	.incbin "graphics/pokemon/poliwrath/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_poliwrath_footprint:: @ 8D5A034
-	.incbin "graphics/pokemon/footprints/poliwrath_footprint.1bpp"
+	.incbin "graphics/pokemon/poliwrath/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_abra_still_front_pic:: @ 8D5A054
-	.incbin "graphics/pokemon/front_pics/abra_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/abra/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_abra_palette:: @ 8D5A328
-	.incbin "graphics/pokemon/palettes/abra_palette.gbapal.lz"
+	.incbin "graphics/pokemon/abra/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_abra_back_pic:: @ 8D5A34C
-	.incbin "graphics/pokemon/back_pics/abra_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/abra/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_abra_shiny_palette:: @ 8D5A620
-	.incbin "graphics/pokemon/palettes/abra_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/abra/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_abra_icon:: @ 8D5A644
-	.incbin "graphics/pokemon/icons/abra_icon.4bpp"
+	.incbin "graphics/pokemon/abra/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_abra_footprint:: @ 8D5AA44
-	.incbin "graphics/pokemon/footprints/abra_footprint.1bpp"
+	.incbin "graphics/pokemon/abra/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kadabra_still_front_pic:: @ 8D5AA64
-	.incbin "graphics/pokemon/front_pics/kadabra_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kadabra/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kadabra_palette:: @ 8D5AF2C
-	.incbin "graphics/pokemon/palettes/kadabra_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kadabra/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kadabra_back_pic:: @ 8D5AF54
-	.incbin "graphics/pokemon/back_pics/kadabra_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kadabra/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kadabra_shiny_palette:: @ 8D5B300
-	.incbin "graphics/pokemon/palettes/kadabra_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kadabra/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kadabra_icon:: @ 8D5B328
-	.incbin "graphics/pokemon/icons/kadabra_icon.4bpp"
+	.incbin "graphics/pokemon/kadabra/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kadabra_footprint:: @ 8D5B728
-	.incbin "graphics/pokemon/footprints/kadabra_footprint.1bpp"
+	.incbin "graphics/pokemon/kadabra/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_alakazam_still_front_pic:: @ 8D5B748
-	.incbin "graphics/pokemon/front_pics/alakazam_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/alakazam/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_alakazam_palette:: @ 8D5BBE0
-	.incbin "graphics/pokemon/palettes/alakazam_palette.gbapal.lz"
+	.incbin "graphics/pokemon/alakazam/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_alakazam_back_pic:: @ 8D5BC08
-	.incbin "graphics/pokemon/back_pics/alakazam_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/alakazam/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_alakazam_shiny_palette:: @ 8D5BF88
-	.incbin "graphics/pokemon/palettes/alakazam_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/alakazam/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_alakazam_icon:: @ 8D5BFB0
-	.incbin "graphics/pokemon/icons/alakazam_icon.4bpp"
+	.incbin "graphics/pokemon/alakazam/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_alakazam_footprint:: @ 8D5C3B0
-	.incbin "graphics/pokemon/footprints/alakazam_footprint.1bpp"
+	.incbin "graphics/pokemon/alakazam/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_machop_still_front_pic:: @ 8D5C3D0
-	.incbin "graphics/pokemon/front_pics/machop_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machop/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machop_palette:: @ 8D5C65C
-	.incbin "graphics/pokemon/palettes/machop_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machop/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_machop_back_pic:: @ 8D5C684
-	.incbin "graphics/pokemon/back_pics/machop_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machop/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machop_shiny_palette:: @ 8D5C964
-	.incbin "graphics/pokemon/palettes/machop_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machop/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_machop_icon:: @ 8D5C98C
-	.incbin "graphics/pokemon/icons/machop_icon.4bpp"
+	.incbin "graphics/pokemon/machop/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_machop_footprint:: @ 8D5CD8C
-	.incbin "graphics/pokemon/footprints/machop_footprint.1bpp"
+	.incbin "graphics/pokemon/machop/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_machoke_still_front_pic:: @ 8D5CDAC
-	.incbin "graphics/pokemon/front_pics/machoke_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machoke/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machoke_palette:: @ 8D5D178
-	.incbin "graphics/pokemon/palettes/machoke_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machoke/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_machoke_back_pic:: @ 8D5D1A0
-	.incbin "graphics/pokemon/back_pics/machoke_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machoke/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machoke_shiny_palette:: @ 8D5D4F0
-	.incbin "graphics/pokemon/palettes/machoke_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machoke/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_machoke_icon:: @ 8D5D518
-	.incbin "graphics/pokemon/icons/machoke_icon.4bpp"
+	.incbin "graphics/pokemon/machoke/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_machoke_footprint:: @ 8D5D918
-	.incbin "graphics/pokemon/footprints/machoke_footprint.1bpp"
+	.incbin "graphics/pokemon/machoke/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_machamp_still_front_pic:: @ 8D5D938
-	.incbin "graphics/pokemon/front_pics/machamp_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machamp/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machamp_palette:: @ 8D5DE24
-	.incbin "graphics/pokemon/palettes/machamp_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machamp/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_machamp_back_pic:: @ 8D5DE4C
-	.incbin "graphics/pokemon/back_pics/machamp_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machamp/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machamp_shiny_palette:: @ 8D5E2A8
-	.incbin "graphics/pokemon/palettes/machamp_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machamp/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_machamp_icon:: @ 8D5E2D0
-	.incbin "graphics/pokemon/icons/machamp_icon.4bpp"
+	.incbin "graphics/pokemon/machamp/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_machamp_footprint:: @ 8D5E6D0
-	.incbin "graphics/pokemon/footprints/machamp_footprint.1bpp"
+	.incbin "graphics/pokemon/machamp/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bellsprout_still_front_pic:: @ 8D5E6F0
-	.incbin "graphics/pokemon/front_pics/bellsprout_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bellsprout/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bellsprout_palette:: @ 8D5E97C
-	.incbin "graphics/pokemon/palettes/bellsprout_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bellsprout/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bellsprout_back_pic:: @ 8D5E9A4
-	.incbin "graphics/pokemon/back_pics/bellsprout_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bellsprout/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bellsprout_shiny_palette:: @ 8D5EC40
-	.incbin "graphics/pokemon/palettes/bellsprout_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bellsprout/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bellsprout_icon:: @ 8D5EC68
-	.incbin "graphics/pokemon/icons/bellsprout_icon.4bpp"
+	.incbin "graphics/pokemon/bellsprout/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bellsprout_footprint:: @ 8D5F068
-	.incbin "graphics/pokemon/footprints/bellsprout_footprint.1bpp"
+	.incbin "graphics/pokemon/bellsprout/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_weepinbell_still_front_pic:: @ 8D5F088
-	.incbin "graphics/pokemon/front_pics/weepinbell_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weepinbell/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weepinbell_palette:: @ 8D5F3AC
-	.incbin "graphics/pokemon/palettes/weepinbell_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weepinbell/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_weepinbell_back_pic:: @ 8D5F3D4
-	.incbin "graphics/pokemon/back_pics/weepinbell_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weepinbell/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weepinbell_shiny_palette:: @ 8D5F6D0
-	.incbin "graphics/pokemon/palettes/weepinbell_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weepinbell/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_weepinbell_icon:: @ 8D5F6F8
-	.incbin "graphics/pokemon/icons/weepinbell_icon.4bpp"
+	.incbin "graphics/pokemon/weepinbell/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_weepinbell_footprint:: @ 8D5FAF8
-	.incbin "graphics/pokemon/footprints/weepinbell_footprint.1bpp"
+	.incbin "graphics/pokemon/weepinbell/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_victreebel_still_front_pic:: @ 8D5FB18
-	.incbin "graphics/pokemon/front_pics/victreebel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/victreebel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_victreebel_palette:: @ 8D5FF44
-	.incbin "graphics/pokemon/palettes/victreebel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/victreebel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_victreebel_back_pic:: @ 8D5FF6C
-	.incbin "graphics/pokemon/back_pics/victreebel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/victreebel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_victreebel_shiny_palette:: @ 8D60304
-	.incbin "graphics/pokemon/palettes/victreebel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/victreebel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_victreebel_icon:: @ 8D6032C
-	.incbin "graphics/pokemon/icons/victreebel_icon.4bpp"
+	.incbin "graphics/pokemon/victreebel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_victreebel_footprint:: @ 8D6072C
-	.incbin "graphics/pokemon/footprints/victreebel_footprint.1bpp"
+	.incbin "graphics/pokemon/victreebel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tentacool_still_front_pic:: @ 8D6074C
-	.incbin "graphics/pokemon/front_pics/tentacool_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tentacool/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tentacool_palette:: @ 8D609F4
-	.incbin "graphics/pokemon/palettes/tentacool_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tentacool/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tentacool_back_pic:: @ 8D60A1C
-	.incbin "graphics/pokemon/back_pics/tentacool_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tentacool/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tentacool_shiny_palette:: @ 8D60CE8
-	.incbin "graphics/pokemon/palettes/tentacool_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tentacool/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tentacool_icon:: @ 8D60D10
-	.incbin "graphics/pokemon/icons/tentacool_icon.4bpp"
+	.incbin "graphics/pokemon/tentacool/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tentacool_footprint:: @ 8D61110
-	.incbin "graphics/pokemon/footprints/tentacool_footprint.1bpp"
+	.incbin "graphics/pokemon/tentacool/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tentacruel_still_front_pic:: @ 8D61130
-	.incbin "graphics/pokemon/front_pics/tentacruel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tentacruel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tentacruel_palette:: @ 8D61624
-	.incbin "graphics/pokemon/palettes/tentacruel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tentacruel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tentacruel_back_pic:: @ 8D6164C
-	.incbin "graphics/pokemon/back_pics/tentacruel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tentacruel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tentacruel_shiny_palette:: @ 8D619E8
-	.incbin "graphics/pokemon/palettes/tentacruel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tentacruel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tentacruel_icon:: @ 8D61A10
-	.incbin "graphics/pokemon/icons/tentacruel_icon.4bpp"
+	.incbin "graphics/pokemon/tentacruel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tentacruel_footprint:: @ 8D61E10
-	.incbin "graphics/pokemon/footprints/tentacruel_footprint.1bpp"
+	.incbin "graphics/pokemon/tentacruel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_geodude_still_front_pic:: @ 8D61E30
-	.incbin "graphics/pokemon/front_pics/geodude_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/geodude/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_geodude_palette:: @ 8D620C4
-	.incbin "graphics/pokemon/palettes/geodude_palette.gbapal.lz"
+	.incbin "graphics/pokemon/geodude/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_geodude_back_pic:: @ 8D620E0
-	.incbin "graphics/pokemon/back_pics/geodude_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/geodude/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_geodude_shiny_palette:: @ 8D62374
-	.incbin "graphics/pokemon/palettes/geodude_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/geodude/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_geodude_icon:: @ 8D62390
-	.incbin "graphics/pokemon/icons/geodude_icon.4bpp"
+	.incbin "graphics/pokemon/geodude/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_geodude_footprint:: @ 8D62790
-	.incbin "graphics/pokemon/footprints/geodude_footprint.1bpp"
+	.incbin "graphics/pokemon/geodude/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_graveler_still_front_pic:: @ 8D627B0
-	.incbin "graphics/pokemon/front_pics/graveler_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/graveler/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_graveler_palette:: @ 8D62BAC
-	.incbin "graphics/pokemon/palettes/graveler_palette.gbapal.lz"
+	.incbin "graphics/pokemon/graveler/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_graveler_back_pic:: @ 8D62BD0
-	.incbin "graphics/pokemon/back_pics/graveler_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/graveler/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_graveler_shiny_palette:: @ 8D62E4C
-	.incbin "graphics/pokemon/palettes/graveler_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/graveler/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_graveler_icon:: @ 8D62E70
-	.incbin "graphics/pokemon/icons/graveler_icon.4bpp"
+	.incbin "graphics/pokemon/graveler/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_graveler_footprint:: @ 8D63270
-	.incbin "graphics/pokemon/footprints/graveler_footprint.1bpp"
+	.incbin "graphics/pokemon/graveler/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_golem_still_front_pic:: @ 8D63290
-	.incbin "graphics/pokemon/front_pics/golem_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golem/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golem_palette:: @ 8D636C0
-	.incbin "graphics/pokemon/palettes/golem_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golem/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_golem_back_pic:: @ 8D636E8
-	.incbin "graphics/pokemon/back_pics/golem_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golem/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golem_shiny_palette:: @ 8D639A8
-	.incbin "graphics/pokemon/palettes/golem_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golem/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_golem_icon:: @ 8D639D0
-	.incbin "graphics/pokemon/icons/golem_icon.4bpp"
+	.incbin "graphics/pokemon/golem/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_golem_footprint:: @ 8D63DD0
-	.incbin "graphics/pokemon/footprints/golem_footprint.1bpp"
+	.incbin "graphics/pokemon/golem/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ponyta_still_front_pic:: @ 8D63DF0
-	.incbin "graphics/pokemon/front_pics/ponyta_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ponyta/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ponyta_palette:: @ 8D64180
-	.incbin "graphics/pokemon/palettes/ponyta_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ponyta/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ponyta_back_pic:: @ 8D641A8
-	.incbin "graphics/pokemon/back_pics/ponyta_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ponyta/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ponyta_shiny_palette:: @ 8D644E4
-	.incbin "graphics/pokemon/palettes/ponyta_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ponyta/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ponyta_icon:: @ 8D6450C
-	.incbin "graphics/pokemon/icons/ponyta_icon.4bpp"
+	.incbin "graphics/pokemon/ponyta/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ponyta_footprint:: @ 8D6490C
-	.incbin "graphics/pokemon/footprints/ponyta_footprint.1bpp"
+	.incbin "graphics/pokemon/ponyta/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rapidash_still_front_pic:: @ 8D6492C
-	.incbin "graphics/pokemon/front_pics/rapidash_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rapidash/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rapidash_palette:: @ 8D64DB4
-	.incbin "graphics/pokemon/palettes/rapidash_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rapidash/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rapidash_back_pic:: @ 8D64DDC
-	.incbin "graphics/pokemon/back_pics/rapidash_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rapidash/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rapidash_shiny_palette:: @ 8D651EC
-	.incbin "graphics/pokemon/palettes/rapidash_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rapidash/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rapidash_icon:: @ 8D65214
-	.incbin "graphics/pokemon/icons/rapidash_icon.4bpp"
+	.incbin "graphics/pokemon/rapidash/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rapidash_footprint:: @ 8D65614
-	.incbin "graphics/pokemon/footprints/rapidash_footprint.1bpp"
+	.incbin "graphics/pokemon/rapidash/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slowpoke_still_front_pic:: @ 8D65634
-	.incbin "graphics/pokemon/front_pics/slowpoke_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowpoke/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowpoke_palette:: @ 8D65908
-	.incbin "graphics/pokemon/palettes/slowpoke_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowpoke/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slowpoke_back_pic:: @ 8D65930
-	.incbin "graphics/pokemon/back_pics/slowpoke_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowpoke/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowpoke_shiny_palette:: @ 8D65B94
-	.incbin "graphics/pokemon/palettes/slowpoke_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowpoke/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slowpoke_icon:: @ 8D65BBC
-	.incbin "graphics/pokemon/icons/slowpoke_icon.4bpp"
+	.incbin "graphics/pokemon/slowpoke/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slowpoke_footprint:: @ 8D65FBC
-	.incbin "graphics/pokemon/footprints/slowpoke_footprint.1bpp"
+	.incbin "graphics/pokemon/slowpoke/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slowbro_still_front_pic:: @ 8D65FDC
-	.incbin "graphics/pokemon/front_pics/slowbro_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowbro/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowbro_palette:: @ 8D6647C
-	.incbin "graphics/pokemon/palettes/slowbro_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowbro/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slowbro_back_pic:: @ 8D664A4
-	.incbin "graphics/pokemon/back_pics/slowbro_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowbro/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowbro_shiny_palette:: @ 8D66840
-	.incbin "graphics/pokemon/palettes/slowbro_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowbro/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slowbro_icon:: @ 8D66868
-	.incbin "graphics/pokemon/icons/slowbro_icon.4bpp"
+	.incbin "graphics/pokemon/slowbro/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slowbro_footprint:: @ 8D66C68
-	.incbin "graphics/pokemon/footprints/slowbro_footprint.1bpp"
+	.incbin "graphics/pokemon/slowbro/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magnemite_still_front_pic:: @ 8D66C88
-	.incbin "graphics/pokemon/front_pics/magnemite_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magnemite/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magnemite_palette:: @ 8D66E60
-	.incbin "graphics/pokemon/palettes/magnemite_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magnemite/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magnemite_back_pic:: @ 8D66E88
-	.incbin "graphics/pokemon/back_pics/magnemite_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magnemite/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magnemite_shiny_palette:: @ 8D67070
-	.incbin "graphics/pokemon/palettes/magnemite_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magnemite/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magnemite_icon:: @ 8D67094
-	.incbin "graphics/pokemon/icons/magnemite_icon.4bpp"
+	.incbin "graphics/pokemon/magnemite/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magnemite_footprint:: @ 8D67494
-	.incbin "graphics/pokemon/footprints/magnemite_footprint.1bpp"
+	.incbin "graphics/pokemon/magnemite/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magneton_still_front_pic:: @ 8D674B4
-	.incbin "graphics/pokemon/front_pics/magneton_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magneton/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magneton_palette:: @ 8D677F0
-	.incbin "graphics/pokemon/palettes/magneton_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magneton/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magneton_back_pic:: @ 8D67818
-	.incbin "graphics/pokemon/back_pics/magneton_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magneton/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magneton_shiny_palette:: @ 8D67B98
-	.incbin "graphics/pokemon/palettes/magneton_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magneton/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magneton_icon:: @ 8D67BC0
-	.incbin "graphics/pokemon/icons/magneton_icon.4bpp"
+	.incbin "graphics/pokemon/magneton/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magneton_footprint:: @ 8D67FC0
-	.incbin "graphics/pokemon/footprints/magneton_footprint.1bpp"
+	.incbin "graphics/pokemon/magneton/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_farfetch_d_still_front_pic:: @ 8D67FE0
-	.incbin "graphics/pokemon/front_pics/farfetch_d_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/farfetch_d/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_farfetch_d_palette:: @ 8D68334
-	.incbin "graphics/pokemon/palettes/farfetch_d_palette.gbapal.lz"
+	.incbin "graphics/pokemon/farfetch_d/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_farfetch_d_back_pic:: @ 8D6835C
-	.incbin "graphics/pokemon/back_pics/farfetch_d_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/farfetch_d/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_farfetch_d_shiny_palette:: @ 8D686C8
-	.incbin "graphics/pokemon/palettes/farfetch_d_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/farfetch_d/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_farfetch_d_icon:: @ 8D686F0
-	.incbin "graphics/pokemon/icons/farfetch_d_icon.4bpp"
+	.incbin "graphics/pokemon/farfetch_d/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_farfetch_d_footprint:: @ 8D68AF0
-	.incbin "graphics/pokemon/footprints/farfetch_d_footprint.1bpp"
+	.incbin "graphics/pokemon/farfetch_d/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_doduo_still_front_pic:: @ 8D68B10
-	.incbin "graphics/pokemon/front_pics/doduo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/doduo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_doduo_palette:: @ 8D68DFC
-	.incbin "graphics/pokemon/palettes/doduo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/doduo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_doduo_back_pic:: @ 8D68E20
-	.incbin "graphics/pokemon/back_pics/doduo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/doduo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_doduo_shiny_palette:: @ 8D69138
-	.incbin "graphics/pokemon/palettes/doduo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/doduo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_doduo_icon:: @ 8D6915C
-	.incbin "graphics/pokemon/icons/doduo_icon.4bpp"
+	.incbin "graphics/pokemon/doduo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_doduo_footprint:: @ 8D6955C
-	.incbin "graphics/pokemon/footprints/doduo_footprint.1bpp"
+	.incbin "graphics/pokemon/doduo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dodrio_still_front_pic:: @ 8D6957C
-	.incbin "graphics/pokemon/front_pics/dodrio_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dodrio/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dodrio_palette:: @ 8D699BC
-	.incbin "graphics/pokemon/palettes/dodrio_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dodrio/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dodrio_back_pic:: @ 8D699E4
-	.incbin "graphics/pokemon/back_pics/dodrio_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dodrio/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dodrio_shiny_palette:: @ 8D69E48
-	.incbin "graphics/pokemon/palettes/dodrio_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dodrio/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dodrio_icon:: @ 8D69E70
-	.incbin "graphics/pokemon/icons/dodrio_icon.4bpp"
+	.incbin "graphics/pokemon/dodrio/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dodrio_footprint:: @ 8D6A270
-	.incbin "graphics/pokemon/footprints/dodrio_footprint.1bpp"
+	.incbin "graphics/pokemon/dodrio/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seel_still_front_pic:: @ 8D6A290
-	.incbin "graphics/pokemon/front_pics/seel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seel_palette:: @ 8D6A5B4
-	.incbin "graphics/pokemon/palettes/seel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seel_back_pic:: @ 8D6A5DC
-	.incbin "graphics/pokemon/back_pics/seel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seel_shiny_palette:: @ 8D6A8C8
-	.incbin "graphics/pokemon/palettes/seel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seel_icon:: @ 8D6A8F0
-	.incbin "graphics/pokemon/icons/seel_icon.4bpp"
+	.incbin "graphics/pokemon/seel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seel_footprint:: @ 8D6ACF0
-	.incbin "graphics/pokemon/footprints/seel_footprint.1bpp"
+	.incbin "graphics/pokemon/seel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dewgong_still_front_pic:: @ 8D6AD10
-	.incbin "graphics/pokemon/front_pics/dewgong_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dewgong/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dewgong_palette:: @ 8D6B0E0
-	.incbin "graphics/pokemon/palettes/dewgong_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dewgong/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dewgong_back_pic:: @ 8D6B104
-	.incbin "graphics/pokemon/back_pics/dewgong_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dewgong/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dewgong_shiny_palette:: @ 8D6B398
-	.incbin "graphics/pokemon/palettes/dewgong_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dewgong/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dewgong_icon:: @ 8D6B3BC
-	.incbin "graphics/pokemon/icons/dewgong_icon.4bpp"
+	.incbin "graphics/pokemon/dewgong/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dewgong_footprint:: @ 8D6B7BC
-	.incbin "graphics/pokemon/footprints/dewgong_footprint.1bpp"
+	.incbin "graphics/pokemon/dewgong/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_grimer_still_front_pic:: @ 8D6B7DC
-	.incbin "graphics/pokemon/front_pics/grimer_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grimer/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grimer_palette:: @ 8D6BB04
-	.incbin "graphics/pokemon/palettes/grimer_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grimer/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_grimer_back_pic:: @ 8D6BB28
-	.incbin "graphics/pokemon/back_pics/grimer_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grimer/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grimer_shiny_palette:: @ 8D6BDEC
-	.incbin "graphics/pokemon/palettes/grimer_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grimer/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_grimer_icon:: @ 8D6BE10
-	.incbin "graphics/pokemon/icons/grimer_icon.4bpp"
+	.incbin "graphics/pokemon/grimer/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_grimer_footprint:: @ 8D6C210
-	.incbin "graphics/pokemon/footprints/grimer_footprint.1bpp"
+	.incbin "graphics/pokemon/grimer/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_muk_still_front_pic:: @ 8D6C230
-	.incbin "graphics/pokemon/front_pics/muk_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/muk/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_muk_palette:: @ 8D6C5C0
-	.incbin "graphics/pokemon/palettes/muk_palette.gbapal.lz"
+	.incbin "graphics/pokemon/muk/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_muk_back_pic:: @ 8D6C5E4
-	.incbin "graphics/pokemon/back_pics/muk_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/muk/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_muk_shiny_palette:: @ 8D6C8DC
-	.incbin "graphics/pokemon/palettes/muk_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/muk/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_muk_icon:: @ 8D6C900
-	.incbin "graphics/pokemon/icons/muk_icon.4bpp"
+	.incbin "graphics/pokemon/muk/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_muk_footprint:: @ 8D6CD00
-	.incbin "graphics/pokemon/footprints/muk_footprint.1bpp"
+	.incbin "graphics/pokemon/muk/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shellder_still_front_pic:: @ 8D6CD20
-	.incbin "graphics/pokemon/front_pics/shellder_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shellder/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shellder_palette:: @ 8D6CF94
-	.incbin "graphics/pokemon/palettes/shellder_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shellder/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shellder_back_pic:: @ 8D6CFB8
-	.incbin "graphics/pokemon/back_pics/shellder_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shellder/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shellder_shiny_palette:: @ 8D6D2CC
-	.incbin "graphics/pokemon/palettes/shellder_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shellder/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shellder_icon:: @ 8D6D2F0
-	.incbin "graphics/pokemon/icons/shellder_icon.4bpp"
+	.incbin "graphics/pokemon/shellder/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shellder_footprint:: @ 8D6D6F0
-	.incbin "graphics/pokemon/footprints/shellder_footprint.1bpp"
+	.incbin "graphics/pokemon/shellder/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cloyster_still_front_pic:: @ 8D6D710
-	.incbin "graphics/pokemon/front_pics/cloyster_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cloyster/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cloyster_palette:: @ 8D6DB4C
-	.incbin "graphics/pokemon/palettes/cloyster_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cloyster/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cloyster_back_pic:: @ 8D6DB70
-	.incbin "graphics/pokemon/back_pics/cloyster_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cloyster/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cloyster_shiny_palette:: @ 8D6DF7C
-	.incbin "graphics/pokemon/palettes/cloyster_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cloyster/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cloyster_icon:: @ 8D6DFA0
-	.incbin "graphics/pokemon/icons/cloyster_icon.4bpp"
+	.incbin "graphics/pokemon/cloyster/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cloyster_footprint:: @ 8D6E3A0
-	.incbin "graphics/pokemon/footprints/cloyster_footprint.1bpp"
+	.incbin "graphics/pokemon/cloyster/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gastly_still_front_pic:: @ 8D6E3C0
-	.incbin "graphics/pokemon/front_pics/gastly_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gastly/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gastly_palette:: @ 8D6E778
-	.incbin "graphics/pokemon/palettes/gastly_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gastly/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gastly_back_pic:: @ 8D6E7A0
-	.incbin "graphics/pokemon/back_pics/gastly_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gastly/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gastly_shiny_palette:: @ 8D6EAC4
-	.incbin "graphics/pokemon/palettes/gastly_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gastly/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gastly_icon:: @ 8D6EAEC
-	.incbin "graphics/pokemon/icons/gastly_icon.4bpp"
+	.incbin "graphics/pokemon/gastly/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gastly_footprint:: @ 8D6EEEC
-	.incbin "graphics/pokemon/footprints/gastly_footprint.1bpp"
+	.incbin "graphics/pokemon/gastly/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_haunter_still_front_pic:: @ 8D6EF0C
-	.incbin "graphics/pokemon/front_pics/haunter_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/haunter/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_haunter_palette:: @ 8D6F2F4
-	.incbin "graphics/pokemon/palettes/haunter_palette.gbapal.lz"
+	.incbin "graphics/pokemon/haunter/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_haunter_back_pic:: @ 8D6F318
-	.incbin "graphics/pokemon/back_pics/haunter_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/haunter/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_haunter_shiny_palette:: @ 8D6F5FC
-	.incbin "graphics/pokemon/palettes/haunter_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/haunter/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_haunter_icon:: @ 8D6F620
-	.incbin "graphics/pokemon/icons/haunter_icon.4bpp"
+	.incbin "graphics/pokemon/haunter/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_haunter_footprint:: @ 8D6FA20
-	.incbin "graphics/pokemon/footprints/haunter_footprint.1bpp"
+	.incbin "graphics/pokemon/haunter/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gengar_still_front_pic:: @ 8D6FA40
-	.incbin "graphics/pokemon/front_pics/gengar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gengar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gengar_palette:: @ 8D6FD9C
-	.incbin "graphics/pokemon/palettes/gengar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gengar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gengar_back_pic:: @ 8D6FDC0
-	.incbin "graphics/pokemon/back_pics/gengar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gengar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gengar_shiny_palette:: @ 8D70104
-	.incbin "graphics/pokemon/palettes/gengar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gengar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gengar_icon:: @ 8D70128
-	.incbin "graphics/pokemon/icons/gengar_icon.4bpp"
+	.incbin "graphics/pokemon/gengar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gengar_footprint:: @ 8D70528
-	.incbin "graphics/pokemon/footprints/gengar_footprint.1bpp"
+	.incbin "graphics/pokemon/gengar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_onix_still_front_pic:: @ 8D70548
-	.incbin "graphics/pokemon/front_pics/onix_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/onix/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_onix_palette:: @ 8D70A18
-	.incbin "graphics/pokemon/palettes/onix_palette.gbapal.lz"
+	.incbin "graphics/pokemon/onix/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_onix_back_pic:: @ 8D70A34
-	.incbin "graphics/pokemon/back_pics/onix_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/onix/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_onix_shiny_palette:: @ 8D70DB0
-	.incbin "graphics/pokemon/palettes/onix_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/onix/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_onix_icon:: @ 8D70DCC
-	.incbin "graphics/pokemon/icons/onix_icon.4bpp"
+	.incbin "graphics/pokemon/onix/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_onix_footprint:: @ 8D711CC
-	.incbin "graphics/pokemon/footprints/onix_footprint.1bpp"
+	.incbin "graphics/pokemon/onix/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_drowzee_still_front_pic:: @ 8D711EC
-	.incbin "graphics/pokemon/front_pics/drowzee_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/drowzee/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_drowzee_palette:: @ 8D7152C
-	.incbin "graphics/pokemon/palettes/drowzee_palette.gbapal.lz"
+	.incbin "graphics/pokemon/drowzee/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_drowzee_back_pic:: @ 8D71550
-	.incbin "graphics/pokemon/back_pics/drowzee_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/drowzee/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_drowzee_shiny_palette:: @ 8D7178C
-	.incbin "graphics/pokemon/palettes/drowzee_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/drowzee/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_drowzee_icon:: @ 8D717B0
-	.incbin "graphics/pokemon/icons/drowzee_icon.4bpp"
+	.incbin "graphics/pokemon/drowzee/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_drowzee_footprint:: @ 8D71BB0
-	.incbin "graphics/pokemon/footprints/drowzee_footprint.1bpp"
+	.incbin "graphics/pokemon/drowzee/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hypno_still_front_pic:: @ 8D71BD0
-	.incbin "graphics/pokemon/front_pics/hypno_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hypno/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hypno_palette:: @ 8D72008
-	.incbin "graphics/pokemon/palettes/hypno_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hypno/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hypno_back_pic:: @ 8D7202C
-	.incbin "graphics/pokemon/back_pics/hypno_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hypno/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hypno_shiny_palette:: @ 8D7235C
-	.incbin "graphics/pokemon/palettes/hypno_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hypno/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hypno_icon:: @ 8D72380
-	.incbin "graphics/pokemon/icons/hypno_icon.4bpp"
+	.incbin "graphics/pokemon/hypno/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hypno_footprint:: @ 8D72780
-	.incbin "graphics/pokemon/footprints/hypno_footprint.1bpp"
+	.incbin "graphics/pokemon/hypno/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_krabby_still_front_pic:: @ 8D727A0
-	.incbin "graphics/pokemon/front_pics/krabby_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/krabby/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_krabby_palette:: @ 8D72AC4
-	.incbin "graphics/pokemon/palettes/krabby_palette.gbapal.lz"
+	.incbin "graphics/pokemon/krabby/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_krabby_back_pic:: @ 8D72AEC
-	.incbin "graphics/pokemon/back_pics/krabby_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/krabby/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_krabby_shiny_palette:: @ 8D72E78
-	.incbin "graphics/pokemon/palettes/krabby_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/krabby/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_krabby_icon:: @ 8D72EA0
-	.incbin "graphics/pokemon/icons/krabby_icon.4bpp"
+	.incbin "graphics/pokemon/krabby/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_krabby_footprint:: @ 8D732A0
-	.incbin "graphics/pokemon/footprints/krabby_footprint.1bpp"
+	.incbin "graphics/pokemon/krabby/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kingler_still_front_pic:: @ 8D732C0
-	.incbin "graphics/pokemon/front_pics/kingler_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kingler/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kingler_palette:: @ 8D73740
-	.incbin "graphics/pokemon/palettes/kingler_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kingler/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kingler_back_pic:: @ 8D73768
-	.incbin "graphics/pokemon/back_pics/kingler_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kingler/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kingler_shiny_palette:: @ 8D73AEC
-	.incbin "graphics/pokemon/palettes/kingler_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kingler/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kingler_icon:: @ 8D73B14
-	.incbin "graphics/pokemon/icons/kingler_icon.4bpp"
+	.incbin "graphics/pokemon/kingler/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kingler_footprint:: @ 8D73F14
-	.incbin "graphics/pokemon/footprints/kingler_footprint.1bpp"
+	.incbin "graphics/pokemon/kingler/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_voltorb_still_front_pic:: @ 8D73F34
-	.incbin "graphics/pokemon/front_pics/voltorb_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/voltorb/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_voltorb_palette:: @ 8D7413C
-	.incbin "graphics/pokemon/palettes/voltorb_palette.gbapal.lz"
+	.incbin "graphics/pokemon/voltorb/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_voltorb_back_pic:: @ 8D74160
-	.incbin "graphics/pokemon/back_pics/voltorb_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/voltorb/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_voltorb_shiny_palette:: @ 8D743D4
-	.incbin "graphics/pokemon/palettes/voltorb_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/voltorb/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_voltorb_icon:: @ 8D743F8
-	.incbin "graphics/pokemon/icons/voltorb_icon.4bpp"
+	.incbin "graphics/pokemon/voltorb/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_voltorb_footprint:: @ 8D747F8
-	.incbin "graphics/pokemon/footprints/voltorb_footprint.1bpp"
+	.incbin "graphics/pokemon/voltorb/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_electrode_still_front_pic:: @ 8D74818
-	.incbin "graphics/pokemon/front_pics/electrode_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electrode/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electrode_palette:: @ 8D74A84
-	.incbin "graphics/pokemon/palettes/electrode_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electrode/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_electrode_back_pic:: @ 8D74AA8
-	.incbin "graphics/pokemon/back_pics/electrode_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electrode/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electrode_shiny_palette:: @ 8D74D18
-	.incbin "graphics/pokemon/palettes/electrode_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electrode/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_electrode_icon:: @ 8D74D3C
-	.incbin "graphics/pokemon/icons/electrode_icon.4bpp"
+	.incbin "graphics/pokemon/electrode/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_electrode_footprint:: @ 8D7513C
-	.incbin "graphics/pokemon/footprints/electrode_footprint.1bpp"
+	.incbin "graphics/pokemon/electrode/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_exeggcute_still_front_pic:: @ 8D7515C
-	.incbin "graphics/pokemon/front_pics/exeggcute_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exeggcute/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exeggcute_palette:: @ 8D754EC
-	.incbin "graphics/pokemon/palettes/exeggcute_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exeggcute/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_exeggcute_back_pic:: @ 8D75510
-	.incbin "graphics/pokemon/back_pics/exeggcute_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exeggcute/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exeggcute_shiny_palette:: @ 8D75818
-	.incbin "graphics/pokemon/palettes/exeggcute_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exeggcute/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_exeggcute_icon:: @ 8D7583C
-	.incbin "graphics/pokemon/icons/exeggcute_icon.4bpp"
+	.incbin "graphics/pokemon/exeggcute/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_exeggcute_footprint:: @ 8D75C3C
-	.incbin "graphics/pokemon/footprints/exeggcute_footprint.1bpp"
+	.incbin "graphics/pokemon/exeggcute/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_exeggutor_still_front_pic:: @ 8D75C5C
-	.incbin "graphics/pokemon/front_pics/exeggutor_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exeggutor/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exeggutor_palette:: @ 8D760AC
-	.incbin "graphics/pokemon/palettes/exeggutor_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exeggutor/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_exeggutor_back_pic:: @ 8D760D4
-	.incbin "graphics/pokemon/back_pics/exeggutor_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exeggutor/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exeggutor_shiny_palette:: @ 8D764A0
-	.incbin "graphics/pokemon/palettes/exeggutor_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exeggutor/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_exeggutor_icon:: @ 8D764C8
-	.incbin "graphics/pokemon/icons/exeggutor_icon.4bpp"
+	.incbin "graphics/pokemon/exeggutor/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_exeggutor_footprint:: @ 8D768C8
-	.incbin "graphics/pokemon/footprints/exeggutor_footprint.1bpp"
+	.incbin "graphics/pokemon/exeggutor/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cubone_still_front_pic:: @ 8D768E8
-	.incbin "graphics/pokemon/front_pics/cubone_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cubone/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cubone_palette:: @ 8D76BA4
-	.incbin "graphics/pokemon/palettes/cubone_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cubone/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cubone_back_pic:: @ 8D76BCC
-	.incbin "graphics/pokemon/back_pics/cubone_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cubone/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cubone_shiny_palette:: @ 8D76F0C
-	.incbin "graphics/pokemon/palettes/cubone_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cubone/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cubone_icon:: @ 8D76F34
-	.incbin "graphics/pokemon/icons/cubone_icon.4bpp"
+	.incbin "graphics/pokemon/cubone/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cubone_footprint:: @ 8D77334
-	.incbin "graphics/pokemon/footprints/cubone_footprint.1bpp"
+	.incbin "graphics/pokemon/cubone/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_marowak_still_front_pic:: @ 8D77354
-	.incbin "graphics/pokemon/front_pics/marowak_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marowak/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marowak_palette:: @ 8D776D4
-	.incbin "graphics/pokemon/palettes/marowak_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marowak/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_marowak_back_pic:: @ 8D776FC
-	.incbin "graphics/pokemon/back_pics/marowak_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marowak/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marowak_shiny_palette:: @ 8D77A10
-	.incbin "graphics/pokemon/palettes/marowak_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marowak/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_marowak_icon:: @ 8D77A38
-	.incbin "graphics/pokemon/icons/marowak_icon.4bpp"
+	.incbin "graphics/pokemon/marowak/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_marowak_footprint:: @ 8D77E38
-	.incbin "graphics/pokemon/footprints/marowak_footprint.1bpp"
+	.incbin "graphics/pokemon/marowak/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hitmonlee_still_front_pic:: @ 8D77E58
-	.incbin "graphics/pokemon/front_pics/hitmonlee_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmonlee/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmonlee_palette:: @ 8D781CC
-	.incbin "graphics/pokemon/palettes/hitmonlee_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmonlee/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hitmonlee_back_pic:: @ 8D781F4
-	.incbin "graphics/pokemon/back_pics/hitmonlee_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmonlee/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmonlee_shiny_palette:: @ 8D78498
-	.incbin "graphics/pokemon/palettes/hitmonlee_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmonlee/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hitmonlee_icon:: @ 8D784C0
-	.incbin "graphics/pokemon/icons/hitmonlee_icon.4bpp"
+	.incbin "graphics/pokemon/hitmonlee/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hitmonlee_footprint:: @ 8D788C0
-	.incbin "graphics/pokemon/footprints/hitmonlee_footprint.1bpp"
+	.incbin "graphics/pokemon/hitmonlee/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hitmonchan_still_front_pic:: @ 8D788E0
-	.incbin "graphics/pokemon/front_pics/hitmonchan_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmonchan/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmonchan_palette:: @ 8D78C20
-	.incbin "graphics/pokemon/palettes/hitmonchan_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmonchan/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hitmonchan_back_pic:: @ 8D78C48
-	.incbin "graphics/pokemon/back_pics/hitmonchan_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmonchan/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmonchan_shiny_palette:: @ 8D78F8C
-	.incbin "graphics/pokemon/palettes/hitmonchan_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmonchan/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hitmonchan_icon:: @ 8D78FB4
-	.incbin "graphics/pokemon/icons/hitmonchan_icon.4bpp"
+	.incbin "graphics/pokemon/hitmonchan/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hitmonchan_footprint:: @ 8D793B4
-	.incbin "graphics/pokemon/footprints/hitmonchan_footprint.1bpp"
+	.incbin "graphics/pokemon/hitmonchan/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lickitung_still_front_pic:: @ 8D793D4
-	.incbin "graphics/pokemon/front_pics/lickitung_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lickitung/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lickitung_palette:: @ 8D797AC
-	.incbin "graphics/pokemon/palettes/lickitung_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lickitung/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lickitung_back_pic:: @ 8D797D4
-	.incbin "graphics/pokemon/back_pics/lickitung_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lickitung/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lickitung_shiny_palette:: @ 8D79A78
-	.incbin "graphics/pokemon/palettes/lickitung_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lickitung/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lickitung_icon:: @ 8D79AA0
-	.incbin "graphics/pokemon/icons/lickitung_icon.4bpp"
+	.incbin "graphics/pokemon/lickitung/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lickitung_footprint:: @ 8D79EA0
-	.incbin "graphics/pokemon/footprints/lickitung_footprint.1bpp"
+	.incbin "graphics/pokemon/lickitung/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_koffing_still_front_pic:: @ 8D79EC0
-	.incbin "graphics/pokemon/front_pics/koffing_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/koffing/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_koffing_palette:: @ 8D7A1C0
-	.incbin "graphics/pokemon/palettes/koffing_palette.gbapal.lz"
+	.incbin "graphics/pokemon/koffing/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_koffing_back_pic:: @ 8D7A1E8
-	.incbin "graphics/pokemon/back_pics/koffing_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/koffing/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_koffing_shiny_palette:: @ 8D7A4E8
-	.incbin "graphics/pokemon/palettes/koffing_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/koffing/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_koffing_icon:: @ 8D7A510
-	.incbin "graphics/pokemon/icons/koffing_icon.4bpp"
+	.incbin "graphics/pokemon/koffing/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_koffing_footprint:: @ 8D7A910
-	.incbin "graphics/pokemon/footprints/koffing_footprint.1bpp"
+	.incbin "graphics/pokemon/koffing/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_weezing_still_front_pic:: @ 8D7A930
-	.incbin "graphics/pokemon/front_pics/weezing_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weezing/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weezing_palette:: @ 8D7ADEC
-	.incbin "graphics/pokemon/palettes/weezing_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weezing/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_weezing_back_pic:: @ 8D7AE14
-	.incbin "graphics/pokemon/back_pics/weezing_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weezing/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weezing_shiny_palette:: @ 8D7B198
-	.incbin "graphics/pokemon/palettes/weezing_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weezing/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_weezing_icon:: @ 8D7B1C0
-	.incbin "graphics/pokemon/icons/weezing_icon.4bpp"
+	.incbin "graphics/pokemon/weezing/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_weezing_footprint:: @ 8D7B5C0
-	.incbin "graphics/pokemon/footprints/weezing_footprint.1bpp"
+	.incbin "graphics/pokemon/weezing/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rhyhorn_still_front_pic:: @ 8D7B5E0
-	.incbin "graphics/pokemon/front_pics/rhyhorn_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rhyhorn/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rhyhorn_palette:: @ 8D7B9DC
-	.incbin "graphics/pokemon/palettes/rhyhorn_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rhyhorn/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rhyhorn_back_pic:: @ 8D7B9FC
-	.incbin "graphics/pokemon/back_pics/rhyhorn_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rhyhorn/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rhyhorn_shiny_palette:: @ 8D7BD44
-	.incbin "graphics/pokemon/palettes/rhyhorn_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rhyhorn/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rhyhorn_icon:: @ 8D7BD64
-	.incbin "graphics/pokemon/icons/rhyhorn_icon.4bpp"
+	.incbin "graphics/pokemon/rhyhorn/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rhyhorn_footprint:: @ 8D7C164
-	.incbin "graphics/pokemon/footprints/rhyhorn_footprint.1bpp"
+	.incbin "graphics/pokemon/rhyhorn/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rhydon_still_front_pic:: @ 8D7C184
-	.incbin "graphics/pokemon/front_pics/rhydon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rhydon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rhydon_palette:: @ 8D7C678
-	.incbin "graphics/pokemon/palettes/rhydon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rhydon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rhydon_back_pic:: @ 8D7C6A0
-	.incbin "graphics/pokemon/back_pics/rhydon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rhydon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rhydon_shiny_palette:: @ 8D7CAF0
-	.incbin "graphics/pokemon/palettes/rhydon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rhydon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rhydon_icon:: @ 8D7CB18
-	.incbin "graphics/pokemon/icons/rhydon_icon.4bpp"
+	.incbin "graphics/pokemon/rhydon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rhydon_footprint:: @ 8D7CF18
-	.incbin "graphics/pokemon/footprints/rhydon_footprint.1bpp"
+	.incbin "graphics/pokemon/rhydon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_chansey_still_front_pic:: @ 8D7CF38
-	.incbin "graphics/pokemon/front_pics/chansey_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chansey/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chansey_palette:: @ 8D7D274
-	.incbin "graphics/pokemon/palettes/chansey_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chansey/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_chansey_back_pic:: @ 8D7D298
-	.incbin "graphics/pokemon/back_pics/chansey_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chansey/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chansey_shiny_palette:: @ 8D7D4E8
-	.incbin "graphics/pokemon/palettes/chansey_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chansey/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_chansey_icon:: @ 8D7D50C
-	.incbin "graphics/pokemon/icons/chansey_icon.4bpp"
+	.incbin "graphics/pokemon/chansey/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_chansey_footprint:: @ 8D7D90C
-	.incbin "graphics/pokemon/footprints/chansey_footprint.1bpp"
+	.incbin "graphics/pokemon/chansey/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tangela_still_front_pic:: @ 8D7D92C
-	.incbin "graphics/pokemon/front_pics/tangela_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tangela/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tangela_palette:: @ 8D7DD00
-	.incbin "graphics/pokemon/palettes/tangela_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tangela/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tangela_back_pic:: @ 8D7DD24
-	.incbin "graphics/pokemon/back_pics/tangela_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tangela/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tangela_shiny_palette:: @ 8D7E0D0
-	.incbin "graphics/pokemon/palettes/tangela_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tangela/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tangela_icon:: @ 8D7E0F4
-	.incbin "graphics/pokemon/icons/tangela_icon.4bpp"
+	.incbin "graphics/pokemon/tangela/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tangela_footprint:: @ 8D7E4F4
-	.incbin "graphics/pokemon/footprints/tangela_footprint.1bpp"
+	.incbin "graphics/pokemon/tangela/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kangaskhan_still_front_pic:: @ 8D7E514
-	.incbin "graphics/pokemon/front_pics/kangaskhan_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kangaskhan/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kangaskhan_palette:: @ 8D7E9BC
-	.incbin "graphics/pokemon/palettes/kangaskhan_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kangaskhan/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kangaskhan_back_pic:: @ 8D7E9E4
-	.incbin "graphics/pokemon/back_pics/kangaskhan_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kangaskhan/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kangaskhan_shiny_palette:: @ 8D7EE14
-	.incbin "graphics/pokemon/palettes/kangaskhan_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kangaskhan/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kangaskhan_icon:: @ 8D7EE3C
-	.incbin "graphics/pokemon/icons/kangaskhan_icon.4bpp"
+	.incbin "graphics/pokemon/kangaskhan/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kangaskhan_footprint:: @ 8D7F23C
-	.incbin "graphics/pokemon/footprints/kangaskhan_footprint.1bpp"
+	.incbin "graphics/pokemon/kangaskhan/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_horsea_still_front_pic:: @ 8D7F25C
-	.incbin "graphics/pokemon/front_pics/horsea_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/horsea/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_horsea_palette:: @ 8D7F4C8
-	.incbin "graphics/pokemon/palettes/horsea_palette.gbapal.lz"
+	.incbin "graphics/pokemon/horsea/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_horsea_back_pic:: @ 8D7F4F0
-	.incbin "graphics/pokemon/back_pics/horsea_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/horsea/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_horsea_shiny_palette:: @ 8D7F7D0
-	.incbin "graphics/pokemon/palettes/horsea_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/horsea/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_horsea_icon:: @ 8D7F7F8
-	.incbin "graphics/pokemon/icons/horsea_icon.4bpp"
+	.incbin "graphics/pokemon/horsea/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_horsea_footprint:: @ 8D7FBF8
-	.incbin "graphics/pokemon/footprints/horsea_footprint.1bpp"
+	.incbin "graphics/pokemon/horsea/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seadra_still_front_pic:: @ 8D7FC18
-	.incbin "graphics/pokemon/front_pics/seadra_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seadra/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seadra_palette:: @ 8D7FFA0
-	.incbin "graphics/pokemon/palettes/seadra_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seadra/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seadra_back_pic:: @ 8D7FFC8
-	.incbin "graphics/pokemon/back_pics/seadra_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seadra/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seadra_shiny_palette:: @ 8D80368
-	.incbin "graphics/pokemon/palettes/seadra_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seadra/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seadra_icon:: @ 8D80390
-	.incbin "graphics/pokemon/icons/seadra_icon.4bpp"
+	.incbin "graphics/pokemon/seadra/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seadra_footprint:: @ 8D80790
-	.incbin "graphics/pokemon/footprints/seadra_footprint.1bpp"
+	.incbin "graphics/pokemon/seadra/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_goldeen_still_front_pic:: @ 8D807B0
-	.incbin "graphics/pokemon/front_pics/goldeen_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/goldeen/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_goldeen_palette:: @ 8D80B18
-	.incbin "graphics/pokemon/palettes/goldeen_palette.gbapal.lz"
+	.incbin "graphics/pokemon/goldeen/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_goldeen_back_pic:: @ 8D80B40
-	.incbin "graphics/pokemon/back_pics/goldeen_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/goldeen/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_goldeen_shiny_palette:: @ 8D80EB0
-	.incbin "graphics/pokemon/palettes/goldeen_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/goldeen/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_goldeen_icon:: @ 8D80ED8
-	.incbin "graphics/pokemon/icons/goldeen_icon.4bpp"
+	.incbin "graphics/pokemon/goldeen/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_goldeen_footprint:: @ 8D812D8
-	.incbin "graphics/pokemon/footprints/goldeen_footprint.1bpp"
+	.incbin "graphics/pokemon/goldeen/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seaking_still_front_pic:: @ 8D812F8
-	.incbin "graphics/pokemon/front_pics/seaking_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seaking/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seaking_palette:: @ 8D8176C
-	.incbin "graphics/pokemon/palettes/seaking_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seaking/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seaking_back_pic:: @ 8D81794
-	.incbin "graphics/pokemon/back_pics/seaking_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seaking/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seaking_shiny_palette:: @ 8D81AE4
-	.incbin "graphics/pokemon/palettes/seaking_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seaking/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seaking_icon:: @ 8D81B0C
-	.incbin "graphics/pokemon/icons/seaking_icon.4bpp"
+	.incbin "graphics/pokemon/seaking/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seaking_footprint:: @ 8D81F0C
-	.incbin "graphics/pokemon/footprints/seaking_footprint.1bpp"
+	.incbin "graphics/pokemon/seaking/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_staryu_still_front_pic:: @ 8D81F2C
-	.incbin "graphics/pokemon/front_pics/staryu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/staryu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_staryu_palette:: @ 8D821DC
-	.incbin "graphics/pokemon/palettes/staryu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/staryu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_staryu_back_pic:: @ 8D82204
-	.incbin "graphics/pokemon/back_pics/staryu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/staryu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_staryu_shiny_palette:: @ 8D8246C
-	.incbin "graphics/pokemon/palettes/staryu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/staryu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_staryu_icon:: @ 8D82494
-	.incbin "graphics/pokemon/icons/staryu_icon.4bpp"
+	.incbin "graphics/pokemon/staryu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_staryu_footprint:: @ 8D82894
-	.incbin "graphics/pokemon/footprints/staryu_footprint.1bpp"
+	.incbin "graphics/pokemon/staryu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_starmie_still_front_pic:: @ 8D828B4
-	.incbin "graphics/pokemon/front_pics/starmie_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/starmie/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_starmie_palette:: @ 8D82C54
-	.incbin "graphics/pokemon/palettes/starmie_palette.gbapal.lz"
+	.incbin "graphics/pokemon/starmie/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_starmie_back_pic:: @ 8D82C7C
-	.incbin "graphics/pokemon/back_pics/starmie_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/starmie/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_starmie_shiny_palette:: @ 8D82F20
-	.incbin "graphics/pokemon/palettes/starmie_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/starmie/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_starmie_icon:: @ 8D82F48
-	.incbin "graphics/pokemon/icons/starmie_icon.4bpp"
+	.incbin "graphics/pokemon/starmie/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_starmie_footprint:: @ 8D83348
-	.incbin "graphics/pokemon/footprints/starmie_footprint.1bpp"
+	.incbin "graphics/pokemon/starmie/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mr_mime_still_front_pic:: @ 8D83368
-	.incbin "graphics/pokemon/front_pics/mr_mime_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mr_mime/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mr_mime_palette:: @ 8D83724
-	.incbin "graphics/pokemon/palettes/mr_mime_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mr_mime/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mr_mime_back_pic:: @ 8D8374C
-	.incbin "graphics/pokemon/back_pics/mr_mime_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mr_mime/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mr_mime_shiny_palette:: @ 8D83A80
-	.incbin "graphics/pokemon/palettes/mr_mime_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mr_mime/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mr_mime_icon:: @ 8D83AA8
-	.incbin "graphics/pokemon/icons/mr_mime_icon.4bpp"
+	.incbin "graphics/pokemon/mr_mime/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mr_mime_footprint:: @ 8D83EA8
-	.incbin "graphics/pokemon/footprints/mr_mime_footprint.1bpp"
+	.incbin "graphics/pokemon/mr_mime/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_scyther_still_front_pic:: @ 8D83EC8
-	.incbin "graphics/pokemon/front_pics/scyther_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/scyther/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_scyther_palette:: @ 8D842F0
-	.incbin "graphics/pokemon/palettes/scyther_palette.gbapal.lz"
+	.incbin "graphics/pokemon/scyther/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_scyther_back_pic:: @ 8D84318
-	.incbin "graphics/pokemon/back_pics/scyther_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/scyther/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_scyther_shiny_palette:: @ 8D84730
-	.incbin "graphics/pokemon/palettes/scyther_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/scyther/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_scyther_icon:: @ 8D84758
-	.incbin "graphics/pokemon/icons/scyther_icon.4bpp"
+	.incbin "graphics/pokemon/scyther/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_scyther_footprint:: @ 8D84B58
-	.incbin "graphics/pokemon/footprints/scyther_footprint.1bpp"
+	.incbin "graphics/pokemon/scyther/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jynx_still_front_pic:: @ 8D84B78
-	.incbin "graphics/pokemon/front_pics/jynx_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jynx/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jynx_palette:: @ 8D84F44
-	.incbin "graphics/pokemon/palettes/jynx_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jynx/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jynx_back_pic:: @ 8D84F6C
-	.incbin "graphics/pokemon/back_pics/jynx_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jynx/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jynx_shiny_palette:: @ 8D85258
-	.incbin "graphics/pokemon/palettes/jynx_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jynx/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jynx_icon:: @ 8D85280
-	.incbin "graphics/pokemon/icons/jynx_icon.4bpp"
+	.incbin "graphics/pokemon/jynx/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jynx_footprint:: @ 8D85680
-	.incbin "graphics/pokemon/footprints/jynx_footprint.1bpp"
+	.incbin "graphics/pokemon/jynx/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_electabuzz_still_front_pic:: @ 8D856A0
-	.incbin "graphics/pokemon/front_pics/electabuzz_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electabuzz/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electabuzz_palette:: @ 8D85AF8
-	.incbin "graphics/pokemon/palettes/electabuzz_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electabuzz/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_electabuzz_back_pic:: @ 8D85B20
-	.incbin "graphics/pokemon/back_pics/electabuzz_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electabuzz/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electabuzz_shiny_palette:: @ 8D85E30
-	.incbin "graphics/pokemon/palettes/electabuzz_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electabuzz/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_electabuzz_icon:: @ 8D85E58
-	.incbin "graphics/pokemon/icons/electabuzz_icon.4bpp"
+	.incbin "graphics/pokemon/electabuzz/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_electabuzz_footprint:: @ 8D86258
-	.incbin "graphics/pokemon/footprints/electabuzz_footprint.1bpp"
+	.incbin "graphics/pokemon/electabuzz/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magmar_still_front_pic:: @ 8D86278
-	.incbin "graphics/pokemon/front_pics/magmar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magmar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magmar_palette:: @ 8D866A8
-	.incbin "graphics/pokemon/palettes/magmar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magmar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magmar_back_pic:: @ 8D866D0
-	.incbin "graphics/pokemon/back_pics/magmar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magmar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magmar_shiny_palette:: @ 8D86A08
-	.incbin "graphics/pokemon/palettes/magmar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magmar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magmar_icon:: @ 8D86A30
-	.incbin "graphics/pokemon/icons/magmar_icon.4bpp"
+	.incbin "graphics/pokemon/magmar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magmar_footprint:: @ 8D86E30
-	.incbin "graphics/pokemon/footprints/magmar_footprint.1bpp"
+	.incbin "graphics/pokemon/magmar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pinsir_still_front_pic:: @ 8D86E50
-	.incbin "graphics/pokemon/front_pics/pinsir_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pinsir/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pinsir_palette:: @ 8D87280
-	.incbin "graphics/pokemon/palettes/pinsir_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pinsir/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pinsir_back_pic:: @ 8D872A4
-	.incbin "graphics/pokemon/back_pics/pinsir_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pinsir/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pinsir_shiny_palette:: @ 8D875F8
-	.incbin "graphics/pokemon/palettes/pinsir_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pinsir/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pinsir_icon:: @ 8D8761C
-	.incbin "graphics/pokemon/icons/pinsir_icon.4bpp"
+	.incbin "graphics/pokemon/pinsir/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pinsir_footprint:: @ 8D87A1C
-	.incbin "graphics/pokemon/footprints/pinsir_footprint.1bpp"
+	.incbin "graphics/pokemon/pinsir/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tauros_still_front_pic:: @ 8D87A3C
-	.incbin "graphics/pokemon/front_pics/tauros_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tauros/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tauros_palette:: @ 8D87E9C
-	.incbin "graphics/pokemon/palettes/tauros_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tauros/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tauros_back_pic:: @ 8D87EC4
-	.incbin "graphics/pokemon/back_pics/tauros_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tauros/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tauros_shiny_palette:: @ 8D88178
-	.incbin "graphics/pokemon/palettes/tauros_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tauros/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tauros_icon:: @ 8D881A0
-	.incbin "graphics/pokemon/icons/tauros_icon.4bpp"
+	.incbin "graphics/pokemon/tauros/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tauros_footprint:: @ 8D885A0
-	.incbin "graphics/pokemon/footprints/tauros_footprint.1bpp"
+	.incbin "graphics/pokemon/tauros/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magikarp_still_front_pic:: @ 8D885C0
-	.incbin "graphics/pokemon/front_pics/magikarp_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magikarp/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magikarp_palette:: @ 8D88908
-	.incbin "graphics/pokemon/palettes/magikarp_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magikarp/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magikarp_back_pic:: @ 8D88930
-	.incbin "graphics/pokemon/back_pics/magikarp_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magikarp/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magikarp_shiny_palette:: @ 8D88C60
-	.incbin "graphics/pokemon/palettes/magikarp_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magikarp/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magikarp_icon:: @ 8D88C88
-	.incbin "graphics/pokemon/icons/magikarp_icon.4bpp"
+	.incbin "graphics/pokemon/magikarp/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magikarp_footprint:: @ 8D89088
-	.incbin "graphics/pokemon/footprints/magikarp_footprint.1bpp"
+	.incbin "graphics/pokemon/magikarp/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gyarados_still_front_pic:: @ 8D890A8
-	.incbin "graphics/pokemon/front_pics/gyarados_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gyarados/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gyarados_palette:: @ 8D8964C
-	.incbin "graphics/pokemon/palettes/gyarados_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gyarados/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gyarados_back_pic:: @ 8D89674
-	.incbin "graphics/pokemon/back_pics/gyarados_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gyarados/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gyarados_shiny_palette:: @ 8D89B2C
-	.incbin "graphics/pokemon/palettes/gyarados_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gyarados/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gyarados_icon:: @ 8D89B54
-	.incbin "graphics/pokemon/icons/gyarados_icon.4bpp"
+	.incbin "graphics/pokemon/gyarados/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gyarados_footprint:: @ 8D89F54
-	.incbin "graphics/pokemon/footprints/gyarados_footprint.1bpp"
+	.incbin "graphics/pokemon/gyarados/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lapras_still_front_pic:: @ 8D89F74
-	.incbin "graphics/pokemon/front_pics/lapras_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lapras/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lapras_palette:: @ 8D8A354
-	.incbin "graphics/pokemon/palettes/lapras_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lapras/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lapras_back_pic:: @ 8D8A37C
-	.incbin "graphics/pokemon/back_pics/lapras_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lapras/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lapras_shiny_palette:: @ 8D8A6C0
-	.incbin "graphics/pokemon/palettes/lapras_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lapras/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lapras_icon:: @ 8D8A6E8
-	.incbin "graphics/pokemon/icons/lapras_icon.4bpp"
+	.incbin "graphics/pokemon/lapras/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lapras_footprint:: @ 8D8AAE8
-	.incbin "graphics/pokemon/footprints/lapras_footprint.1bpp"
+	.incbin "graphics/pokemon/lapras/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ditto_still_front_pic:: @ 8D8AB08
-	.incbin "graphics/pokemon/front_pics/ditto_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ditto/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ditto_palette:: @ 8D8ACF8
-	.incbin "graphics/pokemon/palettes/ditto_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ditto/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ditto_back_pic:: @ 8D8AD18
-	.incbin "graphics/pokemon/back_pics/ditto_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ditto/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ditto_shiny_palette:: @ 8D8AF18
-	.incbin "graphics/pokemon/palettes/ditto_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ditto/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ditto_icon:: @ 8D8AF38
-	.incbin "graphics/pokemon/icons/ditto_icon.4bpp"
+	.incbin "graphics/pokemon/ditto/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ditto_footprint:: @ 8D8B338
-	.incbin "graphics/pokemon/footprints/ditto_footprint.1bpp"
+	.incbin "graphics/pokemon/ditto/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_eevee_still_front_pic:: @ 8D8B358
-	.incbin "graphics/pokemon/front_pics/eevee_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/eevee/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_eevee_palette:: @ 8D8B644
-	.incbin "graphics/pokemon/palettes/eevee_palette.gbapal.lz"
+	.incbin "graphics/pokemon/eevee/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_eevee_back_pic:: @ 8D8B66C
-	.incbin "graphics/pokemon/back_pics/eevee_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/eevee/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_eevee_shiny_palette:: @ 8D8B994
-	.incbin "graphics/pokemon/palettes/eevee_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/eevee/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_eevee_icon:: @ 8D8B9BC
-	.incbin "graphics/pokemon/icons/eevee_icon.4bpp"
+	.incbin "graphics/pokemon/eevee/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_eevee_footprint:: @ 8D8BDBC
-	.incbin "graphics/pokemon/footprints/eevee_footprint.1bpp"
+	.incbin "graphics/pokemon/eevee/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vaporeon_still_front_pic:: @ 8D8BDDC
-	.incbin "graphics/pokemon/front_pics/vaporeon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vaporeon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vaporeon_palette:: @ 8D8C170
-	.incbin "graphics/pokemon/palettes/vaporeon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vaporeon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vaporeon_back_pic:: @ 8D8C198
-	.incbin "graphics/pokemon/back_pics/vaporeon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vaporeon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vaporeon_shiny_palette:: @ 8D8C460
-	.incbin "graphics/pokemon/palettes/vaporeon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vaporeon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vaporeon_icon:: @ 8D8C488
-	.incbin "graphics/pokemon/icons/vaporeon_icon.4bpp"
+	.incbin "graphics/pokemon/vaporeon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vaporeon_footprint:: @ 8D8C888
-	.incbin "graphics/pokemon/footprints/vaporeon_footprint.1bpp"
+	.incbin "graphics/pokemon/vaporeon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jolteon_still_front_pic:: @ 8D8C8A8
-	.incbin "graphics/pokemon/front_pics/jolteon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jolteon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jolteon_palette:: @ 8D8CBF8
-	.incbin "graphics/pokemon/palettes/jolteon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jolteon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jolteon_back_pic:: @ 8D8CC20
-	.incbin "graphics/pokemon/back_pics/jolteon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jolteon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jolteon_shiny_palette:: @ 8D8CFCC
-	.incbin "graphics/pokemon/palettes/jolteon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jolteon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jolteon_icon:: @ 8D8CFF4
-	.incbin "graphics/pokemon/icons/jolteon_icon.4bpp"
+	.incbin "graphics/pokemon/jolteon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jolteon_footprint:: @ 8D8D3F4
-	.incbin "graphics/pokemon/footprints/jolteon_footprint.1bpp"
+	.incbin "graphics/pokemon/jolteon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_flareon_still_front_pic:: @ 8D8D414
-	.incbin "graphics/pokemon/front_pics/flareon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flareon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flareon_palette:: @ 8D8D798
-	.incbin "graphics/pokemon/palettes/flareon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flareon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_flareon_back_pic:: @ 8D8D7C0
-	.incbin "graphics/pokemon/back_pics/flareon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flareon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flareon_shiny_palette:: @ 8D8DB50
-	.incbin "graphics/pokemon/palettes/flareon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flareon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_flareon_icon:: @ 8D8DB78
-	.incbin "graphics/pokemon/icons/flareon_icon.4bpp"
+	.incbin "graphics/pokemon/flareon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_flareon_footprint:: @ 8D8DF78
-	.incbin "graphics/pokemon/footprints/flareon_footprint.1bpp"
+	.incbin "graphics/pokemon/flareon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_porygon_still_front_pic:: @ 8D8DF98
-	.incbin "graphics/pokemon/front_pics/porygon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/porygon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_porygon_palette:: @ 8D8E250
-	.incbin "graphics/pokemon/palettes/porygon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/porygon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_porygon_back_pic:: @ 8D8E274
-	.incbin "graphics/pokemon/back_pics/porygon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/porygon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_porygon_shiny_palette:: @ 8D8E52C
-	.incbin "graphics/pokemon/palettes/porygon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/porygon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_porygon_icon:: @ 8D8E550
-	.incbin "graphics/pokemon/icons/porygon_icon.4bpp"
+	.incbin "graphics/pokemon/porygon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_porygon_footprint:: @ 8D8E950
-	.incbin "graphics/pokemon/footprints/porygon_footprint.1bpp"
+	.incbin "graphics/pokemon/porygon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_omanyte_still_front_pic:: @ 8D8E970
-	.incbin "graphics/pokemon/front_pics/omanyte_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/omanyte/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_omanyte_palette:: @ 8D8EC00
-	.incbin "graphics/pokemon/palettes/omanyte_palette.gbapal.lz"
+	.incbin "graphics/pokemon/omanyte/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_omanyte_back_pic:: @ 8D8EC28
-	.incbin "graphics/pokemon/back_pics/omanyte_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/omanyte/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_omanyte_shiny_palette:: @ 8D8EF74
-	.incbin "graphics/pokemon/palettes/omanyte_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/omanyte/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_omanyte_icon:: @ 8D8EF9C
-	.incbin "graphics/pokemon/icons/omanyte_icon.4bpp"
+	.incbin "graphics/pokemon/omanyte/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_omanyte_footprint:: @ 8D8F39C
-	.incbin "graphics/pokemon/footprints/omanyte_footprint.1bpp"
+	.incbin "graphics/pokemon/omanyte/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_omastar_still_front_pic:: @ 8D8F3BC
-	.incbin "graphics/pokemon/front_pics/omastar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/omastar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_omastar_palette:: @ 8D8F77C
-	.incbin "graphics/pokemon/palettes/omastar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/omastar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_omastar_back_pic:: @ 8D8F7A4
-	.incbin "graphics/pokemon/back_pics/omastar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/omastar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_omastar_shiny_palette:: @ 8D8FAE4
-	.incbin "graphics/pokemon/palettes/omastar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/omastar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_omastar_icon:: @ 8D8FB0C
-	.incbin "graphics/pokemon/icons/omastar_icon.4bpp"
+	.incbin "graphics/pokemon/omastar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_omastar_footprint:: @ 8D8FF0C
-	.incbin "graphics/pokemon/footprints/omastar_footprint.1bpp"
+	.incbin "graphics/pokemon/omastar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kabuto_still_front_pic:: @ 8D8FF2C
-	.incbin "graphics/pokemon/front_pics/kabuto_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kabuto/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kabuto_palette:: @ 8D90154
-	.incbin "graphics/pokemon/palettes/kabuto_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kabuto/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kabuto_back_pic:: @ 8D9017C
-	.incbin "graphics/pokemon/back_pics/kabuto_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kabuto/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kabuto_shiny_palette:: @ 8D90414
-	.incbin "graphics/pokemon/palettes/kabuto_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kabuto/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kabuto_icon:: @ 8D9043C
-	.incbin "graphics/pokemon/icons/kabuto_icon.4bpp"
+	.incbin "graphics/pokemon/kabuto/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kabuto_footprint:: @ 8D9083C
-	.incbin "graphics/pokemon/footprints/kabuto_footprint.1bpp"
+	.incbin "graphics/pokemon/kabuto/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kabutops_still_front_pic:: @ 8D9085C
-	.incbin "graphics/pokemon/front_pics/kabutops_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kabutops/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kabutops_palette:: @ 8D90C6C
-	.incbin "graphics/pokemon/palettes/kabutops_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kabutops/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kabutops_back_pic:: @ 8D90C90
-	.incbin "graphics/pokemon/back_pics/kabutops_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kabutops/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kabutops_shiny_palette:: @ 8D91034
-	.incbin "graphics/pokemon/palettes/kabutops_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kabutops/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kabutops_icon:: @ 8D91058
-	.incbin "graphics/pokemon/icons/kabutops_icon.4bpp"
+	.incbin "graphics/pokemon/kabutops/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kabutops_footprint:: @ 8D91458
-	.incbin "graphics/pokemon/footprints/kabutops_footprint.1bpp"
+	.incbin "graphics/pokemon/kabutops/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_aerodactyl_still_front_pic:: @ 8D91478
-	.incbin "graphics/pokemon/front_pics/aerodactyl_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aerodactyl/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aerodactyl_palette:: @ 8D918C8
-	.incbin "graphics/pokemon/palettes/aerodactyl_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aerodactyl/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_aerodactyl_back_pic:: @ 8D918F0
-	.incbin "graphics/pokemon/back_pics/aerodactyl_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aerodactyl/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aerodactyl_shiny_palette:: @ 8D91BF4
-	.incbin "graphics/pokemon/palettes/aerodactyl_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aerodactyl/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_aerodactyl_icon:: @ 8D91C1C
-	.incbin "graphics/pokemon/icons/aerodactyl_icon.4bpp"
+	.incbin "graphics/pokemon/aerodactyl/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_aerodactyl_footprint:: @ 8D9201C
-	.incbin "graphics/pokemon/footprints/aerodactyl_footprint.1bpp"
+	.incbin "graphics/pokemon/aerodactyl/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_snorlax_still_front_pic:: @ 8D9203C
-	.incbin "graphics/pokemon/front_pics/snorlax_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snorlax/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snorlax_palette:: @ 8D92410
-	.incbin "graphics/pokemon/palettes/snorlax_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snorlax/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_snorlax_back_pic:: @ 8D92438
-	.incbin "graphics/pokemon/back_pics/snorlax_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snorlax/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snorlax_shiny_palette:: @ 8D92654
-	.incbin "graphics/pokemon/palettes/snorlax_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snorlax/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_snorlax_icon:: @ 8D9267C
-	.incbin "graphics/pokemon/icons/snorlax_icon.4bpp"
+	.incbin "graphics/pokemon/snorlax/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_snorlax_footprint:: @ 8D92A7C
-	.incbin "graphics/pokemon/footprints/snorlax_footprint.1bpp"
+	.incbin "graphics/pokemon/snorlax/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_articuno_still_front_pic:: @ 8D92A9C
-	.incbin "graphics/pokemon/front_pics/articuno_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/articuno/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_articuno_palette:: @ 8D92F94
-	.incbin "graphics/pokemon/palettes/articuno_palette.gbapal.lz"
+	.incbin "graphics/pokemon/articuno/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_articuno_back_pic:: @ 8D92FBC
-	.incbin "graphics/pokemon/back_pics/articuno_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/articuno/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_articuno_shiny_palette:: @ 8D93218
-	.incbin "graphics/pokemon/palettes/articuno_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/articuno/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_articuno_icon:: @ 8D93240
-	.incbin "graphics/pokemon/icons/articuno_icon.4bpp"
+	.incbin "graphics/pokemon/articuno/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_articuno_footprint:: @ 8D93640
-	.incbin "graphics/pokemon/footprints/articuno_footprint.1bpp"
+	.incbin "graphics/pokemon/articuno/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_zapdos_still_front_pic:: @ 8D93660
-	.incbin "graphics/pokemon/front_pics/zapdos_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zapdos/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zapdos_palette:: @ 8D93AB0
-	.incbin "graphics/pokemon/palettes/zapdos_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zapdos/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_zapdos_back_pic:: @ 8D93AD8
-	.incbin "graphics/pokemon/back_pics/zapdos_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zapdos/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zapdos_shiny_palette:: @ 8D93E14
-	.incbin "graphics/pokemon/palettes/zapdos_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zapdos/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_zapdos_icon:: @ 8D93E3C
-	.incbin "graphics/pokemon/icons/zapdos_icon.4bpp"
+	.incbin "graphics/pokemon/zapdos/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_zapdos_footprint:: @ 8D9423C
-	.incbin "graphics/pokemon/footprints/zapdos_footprint.1bpp"
+	.incbin "graphics/pokemon/zapdos/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_moltres_still_front_pic:: @ 8D9425C
-	.incbin "graphics/pokemon/front_pics/moltres_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/moltres/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_moltres_palette:: @ 8D94728
-	.incbin "graphics/pokemon/palettes/moltres_palette.gbapal.lz"
+	.incbin "graphics/pokemon/moltres/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_moltres_back_pic:: @ 8D94750
-	.incbin "graphics/pokemon/back_pics/moltres_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/moltres/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_moltres_shiny_palette:: @ 8D94A8C
-	.incbin "graphics/pokemon/palettes/moltres_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/moltres/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_moltres_icon:: @ 8D94AB4
-	.incbin "graphics/pokemon/icons/moltres_icon.4bpp"
+	.incbin "graphics/pokemon/moltres/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_moltres_footprint:: @ 8D94EB4
-	.incbin "graphics/pokemon/footprints/moltres_footprint.1bpp"
+	.incbin "graphics/pokemon/moltres/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dratini_still_front_pic:: @ 8D94ED4
-	.incbin "graphics/pokemon/front_pics/dratini_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dratini/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dratini_palette:: @ 8D95190
-	.incbin "graphics/pokemon/palettes/dratini_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dratini/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dratini_back_pic:: @ 8D951B4
-	.incbin "graphics/pokemon/back_pics/dratini_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dratini/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dratini_shiny_palette:: @ 8D95444
-	.incbin "graphics/pokemon/palettes/dratini_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dratini/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dratini_icon:: @ 8D95468
-	.incbin "graphics/pokemon/icons/dratini_icon.4bpp"
+	.incbin "graphics/pokemon/dratini/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dratini_footprint:: @ 8D95868
-	.incbin "graphics/pokemon/footprints/dratini_footprint.1bpp"
+	.incbin "graphics/pokemon/dratini/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dragonair_still_front_pic:: @ 8D95888
-	.incbin "graphics/pokemon/front_pics/dragonair_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dragonair/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dragonair_palette:: @ 8D95C20
-	.incbin "graphics/pokemon/palettes/dragonair_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dragonair/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dragonair_back_pic:: @ 8D95C48
-	.incbin "graphics/pokemon/back_pics/dragonair_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dragonair/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dragonair_shiny_palette:: @ 8D95F58
-	.incbin "graphics/pokemon/palettes/dragonair_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dragonair/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dragonair_icon:: @ 8D95F80
-	.incbin "graphics/pokemon/icons/dragonair_icon.4bpp"
+	.incbin "graphics/pokemon/dragonair/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dragonair_footprint:: @ 8D96380
-	.incbin "graphics/pokemon/footprints/dragonair_footprint.1bpp"
+	.incbin "graphics/pokemon/dragonair/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dragonite_still_front_pic:: @ 8D963A0
-	.incbin "graphics/pokemon/front_pics/dragonite_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dragonite/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dragonite_palette:: @ 8D968F0
-	.incbin "graphics/pokemon/palettes/dragonite_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dragonite/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dragonite_back_pic:: @ 8D96918
-	.incbin "graphics/pokemon/back_pics/dragonite_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dragonite/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dragonite_shiny_palette:: @ 8D96C10
-	.incbin "graphics/pokemon/palettes/dragonite_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dragonite/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dragonite_icon:: @ 8D96C38
-	.incbin "graphics/pokemon/icons/dragonite_icon.4bpp"
+	.incbin "graphics/pokemon/dragonite/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dragonite_footprint:: @ 8D97038
-	.incbin "graphics/pokemon/footprints/dragonite_footprint.1bpp"
+	.incbin "graphics/pokemon/dragonite/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mewtwo_still_front_pic:: @ 8D97058
-	.incbin "graphics/pokemon/front_pics/mewtwo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mewtwo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mewtwo_palette:: @ 8D97494
-	.incbin "graphics/pokemon/palettes/mewtwo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mewtwo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mewtwo_back_pic:: @ 8D974B8
-	.incbin "graphics/pokemon/back_pics/mewtwo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mewtwo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mewtwo_shiny_palette:: @ 8D97884
-	.incbin "graphics/pokemon/palettes/mewtwo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mewtwo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mewtwo_icon:: @ 8D978A8
-	.incbin "graphics/pokemon/icons/mewtwo_icon.4bpp"
+	.incbin "graphics/pokemon/mewtwo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mewtwo_footprint:: @ 8D97CA8
-	.incbin "graphics/pokemon/footprints/mewtwo_footprint.1bpp"
+	.incbin "graphics/pokemon/mewtwo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mew_still_front_pic:: @ 8D97CC8
-	.incbin "graphics/pokemon/front_pics/mew_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mew/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mew_palette:: @ 8D97F88
-	.incbin "graphics/pokemon/palettes/mew_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mew/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mew_back_pic:: @ 8D97FAC
-	.incbin "graphics/pokemon/back_pics/mew_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mew/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mew_shiny_palette:: @ 8D982FC
-	.incbin "graphics/pokemon/palettes/mew_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mew/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mew_icon:: @ 8D98320
-	.incbin "graphics/pokemon/icons/mew_icon.4bpp"
+	.incbin "graphics/pokemon/mew/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mew_footprint:: @ 8D98720
-	.incbin "graphics/pokemon/footprints/mew_footprint.1bpp"
+	.incbin "graphics/pokemon/mew/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_chikorita_still_front_pic:: @ 8D98740
-	.incbin "graphics/pokemon/front_pics/chikorita_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chikorita/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chikorita_palette:: @ 8D989A8
-	.incbin "graphics/pokemon/palettes/chikorita_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chikorita/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_chikorita_back_pic:: @ 8D989D0
-	.incbin "graphics/pokemon/back_pics/chikorita_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chikorita/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chikorita_shiny_palette:: @ 8D98C94
-	.incbin "graphics/pokemon/palettes/chikorita_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chikorita/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_chikorita_icon:: @ 8D98CBC
-	.incbin "graphics/pokemon/icons/chikorita_icon.4bpp"
+	.incbin "graphics/pokemon/chikorita/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_chikorita_footprint:: @ 8D990BC
-	.incbin "graphics/pokemon/footprints/chikorita_footprint.1bpp"
+	.incbin "graphics/pokemon/chikorita/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bayleef_still_front_pic:: @ 8D990DC
-	.incbin "graphics/pokemon/front_pics/bayleef_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bayleef/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bayleef_palette:: @ 8D994B0
-	.incbin "graphics/pokemon/palettes/bayleef_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bayleef/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bayleef_back_pic:: @ 8D994D8
-	.incbin "graphics/pokemon/back_pics/bayleef_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bayleef/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bayleef_shiny_palette:: @ 8D99868
-	.incbin "graphics/pokemon/palettes/bayleef_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bayleef/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bayleef_icon:: @ 8D99890
-	.incbin "graphics/pokemon/icons/bayleef_icon.4bpp"
+	.incbin "graphics/pokemon/bayleef/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bayleef_footprint:: @ 8D99C90
-	.incbin "graphics/pokemon/footprints/bayleef_footprint.1bpp"
+	.incbin "graphics/pokemon/bayleef/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_meganium_still_front_pic:: @ 8D99CB0
-	.incbin "graphics/pokemon/front_pics/meganium_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meganium/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meganium_palette:: @ 8D9A20C
-	.incbin "graphics/pokemon/palettes/meganium_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meganium/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_meganium_back_pic:: @ 8D9A234
-	.incbin "graphics/pokemon/back_pics/meganium_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meganium/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meganium_shiny_palette:: @ 8D9A584
-	.incbin "graphics/pokemon/palettes/meganium_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meganium/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_meganium_icon:: @ 8D9A5AC
-	.incbin "graphics/pokemon/icons/meganium_icon.4bpp"
+	.incbin "graphics/pokemon/meganium/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_meganium_footprint:: @ 8D9A9AC
-	.incbin "graphics/pokemon/footprints/meganium_footprint.1bpp"
+	.incbin "graphics/pokemon/meganium/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cyndaquil_still_front_pic:: @ 8D9A9CC
-	.incbin "graphics/pokemon/front_pics/cyndaquil_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cyndaquil/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cyndaquil_palette:: @ 8D9AC58
-	.incbin "graphics/pokemon/palettes/cyndaquil_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cyndaquil/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cyndaquil_back_pic:: @ 8D9AC80
-	.incbin "graphics/pokemon/back_pics/cyndaquil_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cyndaquil/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cyndaquil_shiny_palette:: @ 8D9AFAC
-	.incbin "graphics/pokemon/palettes/cyndaquil_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cyndaquil/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cyndaquil_icon:: @ 8D9AFD4
-	.incbin "graphics/pokemon/icons/cyndaquil_icon.4bpp"
+	.incbin "graphics/pokemon/cyndaquil/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cyndaquil_footprint:: @ 8D9B3D4
-	.incbin "graphics/pokemon/footprints/cyndaquil_footprint.1bpp"
+	.incbin "graphics/pokemon/cyndaquil/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_quilava_still_front_pic:: @ 8D9B3F4
-	.incbin "graphics/pokemon/front_pics/quilava_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/quilava/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_quilava_palette:: @ 8D9B710
-	.incbin "graphics/pokemon/palettes/quilava_palette.gbapal.lz"
+	.incbin "graphics/pokemon/quilava/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_quilava_back_pic:: @ 8D9B738
-	.incbin "graphics/pokemon/back_pics/quilava_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/quilava/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_quilava_shiny_palette:: @ 8D9BAAC
-	.incbin "graphics/pokemon/palettes/quilava_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/quilava/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_quilava_icon:: @ 8D9BAD4
-	.incbin "graphics/pokemon/icons/quilava_icon.4bpp"
+	.incbin "graphics/pokemon/quilava/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_quilava_footprint:: @ 8D9BED4
-	.incbin "graphics/pokemon/footprints/quilava_footprint.1bpp"
+	.incbin "graphics/pokemon/quilava/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_typhlosion_still_front_pic:: @ 8D9BEF4
-	.incbin "graphics/pokemon/front_pics/typhlosion_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/typhlosion/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_typhlosion_palette:: @ 8D9C31C
-	.incbin "graphics/pokemon/palettes/typhlosion_palette.gbapal.lz"
+	.incbin "graphics/pokemon/typhlosion/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_typhlosion_back_pic:: @ 8D9C344
-	.incbin "graphics/pokemon/back_pics/typhlosion_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/typhlosion/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_typhlosion_shiny_palette:: @ 8D9C748
-	.incbin "graphics/pokemon/palettes/typhlosion_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/typhlosion/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_typhlosion_icon:: @ 8D9C770
-	.incbin "graphics/pokemon/icons/typhlosion_icon.4bpp"
+	.incbin "graphics/pokemon/typhlosion/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_typhlosion_footprint:: @ 8D9CB70
-	.incbin "graphics/pokemon/footprints/typhlosion_footprint.1bpp"
+	.incbin "graphics/pokemon/typhlosion/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_totodile_still_front_pic:: @ 8D9CB90
-	.incbin "graphics/pokemon/front_pics/totodile_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/totodile/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_totodile_palette:: @ 8D9CE34
-	.incbin "graphics/pokemon/palettes/totodile_palette.gbapal.lz"
+	.incbin "graphics/pokemon/totodile/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_totodile_back_pic:: @ 8D9CE5C
-	.incbin "graphics/pokemon/back_pics/totodile_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/totodile/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_totodile_shiny_palette:: @ 8D9D13C
-	.incbin "graphics/pokemon/palettes/totodile_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/totodile/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_totodile_icon:: @ 8D9D164
-	.incbin "graphics/pokemon/icons/totodile_icon.4bpp"
+	.incbin "graphics/pokemon/totodile/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_totodile_footprint:: @ 8D9D564
-	.incbin "graphics/pokemon/footprints/totodile_footprint.1bpp"
+	.incbin "graphics/pokemon/totodile/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_croconaw_still_front_pic:: @ 8D9D584
-	.incbin "graphics/pokemon/front_pics/croconaw_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/croconaw/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_croconaw_palette:: @ 8D9D8EC
-	.incbin "graphics/pokemon/palettes/croconaw_palette.gbapal.lz"
+	.incbin "graphics/pokemon/croconaw/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_croconaw_back_pic:: @ 8D9D914
-	.incbin "graphics/pokemon/back_pics/croconaw_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/croconaw/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_croconaw_shiny_palette:: @ 8D9DC64
-	.incbin "graphics/pokemon/palettes/croconaw_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/croconaw/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_croconaw_icon:: @ 8D9DC8C
-	.incbin "graphics/pokemon/icons/croconaw_icon.4bpp"
+	.incbin "graphics/pokemon/croconaw/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_croconaw_footprint:: @ 8D9E08C
-	.incbin "graphics/pokemon/footprints/croconaw_footprint.1bpp"
+	.incbin "graphics/pokemon/croconaw/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_feraligatr_still_front_pic:: @ 8D9E0AC
-	.incbin "graphics/pokemon/front_pics/feraligatr_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/feraligatr/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_feraligatr_palette:: @ 8D9E618
-	.incbin "graphics/pokemon/palettes/feraligatr_palette.gbapal.lz"
+	.incbin "graphics/pokemon/feraligatr/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_feraligatr_back_pic:: @ 8D9E640
-	.incbin "graphics/pokemon/back_pics/feraligatr_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/feraligatr/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_feraligatr_shiny_palette:: @ 8D9EB0C
-	.incbin "graphics/pokemon/palettes/feraligatr_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/feraligatr/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_feraligatr_icon:: @ 8D9EB34
-	.incbin "graphics/pokemon/icons/feraligatr_icon.4bpp"
+	.incbin "graphics/pokemon/feraligatr/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_feraligatr_footprint:: @ 8D9EF34
-	.incbin "graphics/pokemon/footprints/feraligatr_footprint.1bpp"
+	.incbin "graphics/pokemon/feraligatr/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sentret_still_front_pic:: @ 8D9EF54
-	.incbin "graphics/pokemon/front_pics/sentret_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sentret/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sentret_palette:: @ 8D9F230
-	.incbin "graphics/pokemon/palettes/sentret_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sentret/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sentret_back_pic:: @ 8D9F258
-	.incbin "graphics/pokemon/back_pics/sentret_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sentret/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sentret_shiny_palette:: @ 8D9F4FC
-	.incbin "graphics/pokemon/palettes/sentret_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sentret/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sentret_icon:: @ 8D9F524
-	.incbin "graphics/pokemon/icons/sentret_icon.4bpp"
+	.incbin "graphics/pokemon/sentret/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sentret_footprint:: @ 8D9F924
-	.incbin "graphics/pokemon/footprints/sentret_footprint.1bpp"
+	.incbin "graphics/pokemon/sentret/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_furret_still_front_pic:: @ 8D9F944
-	.incbin "graphics/pokemon/front_pics/furret_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/furret/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_furret_palette:: @ 8D9FC78
-	.incbin "graphics/pokemon/palettes/furret_palette.gbapal.lz"
+	.incbin "graphics/pokemon/furret/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_furret_back_pic:: @ 8D9FCA0
-	.incbin "graphics/pokemon/back_pics/furret_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/furret/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_furret_shiny_palette:: @ 8D9FFC8
-	.incbin "graphics/pokemon/palettes/furret_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/furret/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_furret_icon:: @ 8D9FFF0
-	.incbin "graphics/pokemon/icons/furret_icon.4bpp"
+	.incbin "graphics/pokemon/furret/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_furret_footprint:: @ 8DA03F0
-	.incbin "graphics/pokemon/footprints/furret_footprint.1bpp"
+	.incbin "graphics/pokemon/furret/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hoothoot_still_front_pic:: @ 8DA0410
-	.incbin "graphics/pokemon/front_pics/hoothoot_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hoothoot/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hoothoot_palette:: @ 8DA0694
-	.incbin "graphics/pokemon/palettes/hoothoot_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hoothoot/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hoothoot_back_pic:: @ 8DA06BC
-	.incbin "graphics/pokemon/back_pics/hoothoot_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hoothoot/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hoothoot_shiny_palette:: @ 8DA09C4
-	.incbin "graphics/pokemon/palettes/hoothoot_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hoothoot/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hoothoot_icon:: @ 8DA09EC
-	.incbin "graphics/pokemon/icons/hoothoot_icon.4bpp"
+	.incbin "graphics/pokemon/hoothoot/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hoothoot_footprint:: @ 8DA0DEC
-	.incbin "graphics/pokemon/footprints/hoothoot_footprint.1bpp"
+	.incbin "graphics/pokemon/hoothoot/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_noctowl_still_front_pic:: @ 8DA0E0C
-	.incbin "graphics/pokemon/front_pics/noctowl_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/noctowl/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_noctowl_palette:: @ 8DA1160
-	.incbin "graphics/pokemon/palettes/noctowl_palette.gbapal.lz"
+	.incbin "graphics/pokemon/noctowl/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_noctowl_back_pic:: @ 8DA1188
-	.incbin "graphics/pokemon/back_pics/noctowl_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/noctowl/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_noctowl_shiny_palette:: @ 8DA14E4
-	.incbin "graphics/pokemon/palettes/noctowl_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/noctowl/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_noctowl_icon:: @ 8DA150C
-	.incbin "graphics/pokemon/icons/noctowl_icon.4bpp"
+	.incbin "graphics/pokemon/noctowl/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_noctowl_footprint:: @ 8DA190C
-	.incbin "graphics/pokemon/footprints/noctowl_footprint.1bpp"
+	.incbin "graphics/pokemon/noctowl/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ledyba_still_front_pic:: @ 8DA192C
-	.incbin "graphics/pokemon/front_pics/ledyba_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ledyba/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ledyba_palette:: @ 8DA1C20
-	.incbin "graphics/pokemon/palettes/ledyba_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ledyba/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ledyba_back_pic:: @ 8DA1C48
-	.incbin "graphics/pokemon/back_pics/ledyba_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ledyba/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ledyba_shiny_palette:: @ 8DA1F78
-	.incbin "graphics/pokemon/palettes/ledyba_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ledyba/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ledyba_icon:: @ 8DA1FA0
-	.incbin "graphics/pokemon/icons/ledyba_icon.4bpp"
+	.incbin "graphics/pokemon/ledyba/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ledyba_footprint:: @ 8DA23A0
-	.incbin "graphics/pokemon/footprints/ledyba_footprint.1bpp"
+	.incbin "graphics/pokemon/ledyba/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ledian_still_front_pic:: @ 8DA23C0
-	.incbin "graphics/pokemon/front_pics/ledian_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ledian/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ledian_palette:: @ 8DA2748
-	.incbin "graphics/pokemon/palettes/ledian_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ledian/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ledian_back_pic:: @ 8DA2770
-	.incbin "graphics/pokemon/back_pics/ledian_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ledian/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ledian_shiny_palette:: @ 8DA2AC8
-	.incbin "graphics/pokemon/palettes/ledian_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ledian/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ledian_icon:: @ 8DA2AF0
-	.incbin "graphics/pokemon/icons/ledian_icon.4bpp"
+	.incbin "graphics/pokemon/ledian/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ledian_footprint:: @ 8DA2EF0
-	.incbin "graphics/pokemon/footprints/ledian_footprint.1bpp"
+	.incbin "graphics/pokemon/ledian/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spinarak_still_front_pic:: @ 8DA2F10
-	.incbin "graphics/pokemon/front_pics/spinarak_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spinarak/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spinarak_palette:: @ 8DA3184
-	.incbin "graphics/pokemon/palettes/spinarak_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spinarak/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spinarak_back_pic:: @ 8DA31AC
-	.incbin "graphics/pokemon/back_pics/spinarak_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spinarak/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spinarak_shiny_palette:: @ 8DA3410
-	.incbin "graphics/pokemon/palettes/spinarak_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spinarak/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spinarak_icon:: @ 8DA3438
-	.incbin "graphics/pokemon/icons/spinarak_icon.4bpp"
+	.incbin "graphics/pokemon/spinarak/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spinarak_footprint:: @ 8DA3838
-	.incbin "graphics/pokemon/footprints/spinarak_footprint.1bpp"
+	.incbin "graphics/pokemon/spinarak/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ariados_still_front_pic:: @ 8DA3858
-	.incbin "graphics/pokemon/front_pics/ariados_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ariados/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ariados_palette:: @ 8DA3C18
-	.incbin "graphics/pokemon/palettes/ariados_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ariados/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ariados_back_pic:: @ 8DA3C40
-	.incbin "graphics/pokemon/back_pics/ariados_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ariados/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ariados_shiny_palette:: @ 8DA3FB8
-	.incbin "graphics/pokemon/palettes/ariados_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ariados/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ariados_icon:: @ 8DA3FE0
-	.incbin "graphics/pokemon/icons/ariados_icon.4bpp"
+	.incbin "graphics/pokemon/ariados/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ariados_footprint:: @ 8DA43E0
-	.incbin "graphics/pokemon/footprints/ariados_footprint.1bpp"
+	.incbin "graphics/pokemon/ariados/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_crobat_still_front_pic:: @ 8DA4400
-	.incbin "graphics/pokemon/front_pics/crobat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/crobat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_crobat_palette:: @ 8DA47B0
-	.incbin "graphics/pokemon/palettes/crobat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/crobat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_crobat_back_pic:: @ 8DA47D8
-	.incbin "graphics/pokemon/back_pics/crobat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/crobat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_crobat_shiny_palette:: @ 8DA4AE0
-	.incbin "graphics/pokemon/palettes/crobat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/crobat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_crobat_icon:: @ 8DA4B08
-	.incbin "graphics/pokemon/icons/crobat_icon.4bpp"
+	.incbin "graphics/pokemon/crobat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_crobat_footprint:: @ 8DA4F08
-	.incbin "graphics/pokemon/footprints/crobat_footprint.1bpp"
+	.incbin "graphics/pokemon/crobat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_chinchou_still_front_pic:: @ 8DA4F28
-	.incbin "graphics/pokemon/front_pics/chinchou_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chinchou/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chinchou_palette:: @ 8DA5200
-	.incbin "graphics/pokemon/palettes/chinchou_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chinchou/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_chinchou_back_pic:: @ 8DA5228
-	.incbin "graphics/pokemon/back_pics/chinchou_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chinchou/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chinchou_shiny_palette:: @ 8DA5520
-	.incbin "graphics/pokemon/palettes/chinchou_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chinchou/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_chinchou_icon:: @ 8DA5548
-	.incbin "graphics/pokemon/icons/chinchou_icon.4bpp"
+	.incbin "graphics/pokemon/chinchou/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_chinchou_footprint:: @ 8DA5948
-	.incbin "graphics/pokemon/footprints/chinchou_footprint.1bpp"
+	.incbin "graphics/pokemon/chinchou/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lanturn_still_front_pic:: @ 8DA5968
-	.incbin "graphics/pokemon/front_pics/lanturn_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lanturn/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lanturn_palette:: @ 8DA5CD8
-	.incbin "graphics/pokemon/palettes/lanturn_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lanturn/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lanturn_back_pic:: @ 8DA5D00
-	.incbin "graphics/pokemon/back_pics/lanturn_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lanturn/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lanturn_shiny_palette:: @ 8DA6000
-	.incbin "graphics/pokemon/palettes/lanturn_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lanturn/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lanturn_icon:: @ 8DA6028
-	.incbin "graphics/pokemon/icons/lanturn_icon.4bpp"
+	.incbin "graphics/pokemon/lanturn/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lanturn_footprint:: @ 8DA6428
-	.incbin "graphics/pokemon/footprints/lanturn_footprint.1bpp"
+	.incbin "graphics/pokemon/lanturn/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pichu_still_front_pic:: @ 8DA6448
-	.incbin "graphics/pokemon/front_pics/pichu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pichu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pichu_palette:: @ 8DA6664
-	.incbin "graphics/pokemon/palettes/pichu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pichu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pichu_back_pic:: @ 8DA668C
-	.incbin "graphics/pokemon/back_pics/pichu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pichu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pichu_shiny_palette:: @ 8DA68E8
-	.incbin "graphics/pokemon/palettes/pichu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pichu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pichu_icon:: @ 8DA6910
-	.incbin "graphics/pokemon/icons/pichu_icon.4bpp"
+	.incbin "graphics/pokemon/pichu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pichu_footprint:: @ 8DA6D10
-	.incbin "graphics/pokemon/footprints/pichu_footprint.1bpp"
+	.incbin "graphics/pokemon/pichu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cleffa_still_front_pic:: @ 8DA6D30
-	.incbin "graphics/pokemon/front_pics/cleffa_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cleffa/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cleffa_palette:: @ 8DA6F10
-	.incbin "graphics/pokemon/palettes/cleffa_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cleffa/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cleffa_back_pic:: @ 8DA6F38
-	.incbin "graphics/pokemon/back_pics/cleffa_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cleffa/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cleffa_shiny_palette:: @ 8DA7174
-	.incbin "graphics/pokemon/palettes/cleffa_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cleffa/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cleffa_icon:: @ 8DA719C
-	.incbin "graphics/pokemon/icons/cleffa_icon.4bpp"
+	.incbin "graphics/pokemon/cleffa/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cleffa_footprint:: @ 8DA759C
-	.incbin "graphics/pokemon/footprints/cleffa_footprint.1bpp"
+	.incbin "graphics/pokemon/cleffa/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_igglybuff_still_front_pic:: @ 8DA75BC
-	.incbin "graphics/pokemon/front_pics/igglybuff_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/igglybuff/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_igglybuff_palette:: @ 8DA77A4
-	.incbin "graphics/pokemon/palettes/igglybuff_palette.gbapal.lz"
+	.incbin "graphics/pokemon/igglybuff/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_igglybuff_back_pic:: @ 8DA77CC
-	.incbin "graphics/pokemon/back_pics/igglybuff_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/igglybuff/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_igglybuff_shiny_palette:: @ 8DA7A08
-	.incbin "graphics/pokemon/palettes/igglybuff_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/igglybuff/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_igglybuff_icon:: @ 8DA7A30
-	.incbin "graphics/pokemon/icons/igglybuff_icon.4bpp"
+	.incbin "graphics/pokemon/igglybuff/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_igglybuff_footprint:: @ 8DA7E30
-	.incbin "graphics/pokemon/footprints/igglybuff_footprint.1bpp"
+	.incbin "graphics/pokemon/igglybuff/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_togepi_still_front_pic:: @ 8DA7E50
-	.incbin "graphics/pokemon/front_pics/togepi_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/togepi/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_togepi_palette:: @ 8DA8024
-	.incbin "graphics/pokemon/palettes/togepi_palette.gbapal.lz"
+	.incbin "graphics/pokemon/togepi/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_togepi_back_pic:: @ 8DA804C
-	.incbin "graphics/pokemon/back_pics/togepi_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/togepi/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_togepi_shiny_palette:: @ 8DA82C0
-	.incbin "graphics/pokemon/palettes/togepi_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/togepi/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_togepi_icon:: @ 8DA82E8
-	.incbin "graphics/pokemon/icons/togepi_icon.4bpp"
+	.incbin "graphics/pokemon/togepi/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_togepi_footprint:: @ 8DA86E8
-	.incbin "graphics/pokemon/footprints/togepi_footprint.1bpp"
+	.incbin "graphics/pokemon/togepi/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_togetic_still_front_pic:: @ 8DA8708
-	.incbin "graphics/pokemon/front_pics/togetic_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/togetic/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_togetic_palette:: @ 8DA897C
-	.incbin "graphics/pokemon/palettes/togetic_palette.gbapal.lz"
+	.incbin "graphics/pokemon/togetic/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_togetic_back_pic:: @ 8DA89A4
-	.incbin "graphics/pokemon/back_pics/togetic_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/togetic/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_togetic_shiny_palette:: @ 8DA8CD0
-	.incbin "graphics/pokemon/palettes/togetic_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/togetic/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_togetic_icon:: @ 8DA8CF8
-	.incbin "graphics/pokemon/icons/togetic_icon.4bpp"
+	.incbin "graphics/pokemon/togetic/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_togetic_footprint:: @ 8DA90F8
-	.incbin "graphics/pokemon/footprints/togetic_footprint.1bpp"
+	.incbin "graphics/pokemon/togetic/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_natu_still_front_pic:: @ 8DA9118
-	.incbin "graphics/pokemon/front_pics/natu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/natu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_natu_palette:: @ 8DA92E4
-	.incbin "graphics/pokemon/palettes/natu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/natu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_natu_back_pic:: @ 8DA930C
-	.incbin "graphics/pokemon/back_pics/natu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/natu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_natu_shiny_palette:: @ 8DA9520
-	.incbin "graphics/pokemon/palettes/natu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/natu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_natu_icon:: @ 8DA9548
-	.incbin "graphics/pokemon/icons/natu_icon.4bpp"
+	.incbin "graphics/pokemon/natu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_natu_footprint:: @ 8DA9948
-	.incbin "graphics/pokemon/footprints/natu_footprint.1bpp"
+	.incbin "graphics/pokemon/natu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_xatu_still_front_pic:: @ 8DA9968
-	.incbin "graphics/pokemon/front_pics/xatu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/xatu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_xatu_palette:: @ 8DA9C44
-	.incbin "graphics/pokemon/palettes/xatu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/xatu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_xatu_back_pic:: @ 8DA9C6C
-	.incbin "graphics/pokemon/back_pics/xatu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/xatu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_xatu_shiny_palette:: @ 8DA9FE4
-	.incbin "graphics/pokemon/palettes/xatu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/xatu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_xatu_icon:: @ 8DAA00C
-	.incbin "graphics/pokemon/icons/xatu_icon.4bpp"
+	.incbin "graphics/pokemon/xatu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_xatu_footprint:: @ 8DAA40C
-	.incbin "graphics/pokemon/footprints/xatu_footprint.1bpp"
+	.incbin "graphics/pokemon/xatu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mareep_still_front_pic:: @ 8DAA42C
-	.incbin "graphics/pokemon/front_pics/mareep_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mareep/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mareep_palette:: @ 8DAA6E0
-	.incbin "graphics/pokemon/palettes/mareep_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mareep/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mareep_back_pic:: @ 8DAA708
-	.incbin "graphics/pokemon/back_pics/mareep_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mareep/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mareep_shiny_palette:: @ 8DAA9FC
-	.incbin "graphics/pokemon/palettes/mareep_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mareep/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mareep_icon:: @ 8DAAA24
-	.incbin "graphics/pokemon/icons/mareep_icon.4bpp"
+	.incbin "graphics/pokemon/mareep/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mareep_footprint:: @ 8DAAE24
-	.incbin "graphics/pokemon/footprints/mareep_footprint.1bpp"
+	.incbin "graphics/pokemon/mareep/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_flaaffy_still_front_pic:: @ 8DAAE44
-	.incbin "graphics/pokemon/front_pics/flaaffy_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flaaffy/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flaaffy_palette:: @ 8DAB144
-	.incbin "graphics/pokemon/palettes/flaaffy_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flaaffy/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_flaaffy_back_pic:: @ 8DAB16C
-	.incbin "graphics/pokemon/back_pics/flaaffy_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flaaffy/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flaaffy_shiny_palette:: @ 8DAB488
-	.incbin "graphics/pokemon/palettes/flaaffy_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flaaffy/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_flaaffy_icon:: @ 8DAB4B0
-	.incbin "graphics/pokemon/icons/flaaffy_icon.4bpp"
+	.incbin "graphics/pokemon/flaaffy/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_flaaffy_footprint:: @ 8DAB8B0
-	.incbin "graphics/pokemon/footprints/flaaffy_footprint.1bpp"
+	.incbin "graphics/pokemon/flaaffy/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ampharos_still_front_pic:: @ 8DAB8D0
-	.incbin "graphics/pokemon/front_pics/ampharos_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ampharos/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ampharos_palette:: @ 8DABC2C
-	.incbin "graphics/pokemon/palettes/ampharos_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ampharos/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ampharos_back_pic:: @ 8DABC54
-	.incbin "graphics/pokemon/back_pics/ampharos_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ampharos/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ampharos_shiny_palette:: @ 8DABFCC
-	.incbin "graphics/pokemon/palettes/ampharos_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ampharos/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ampharos_icon:: @ 8DABFF4
-	.incbin "graphics/pokemon/icons/ampharos_icon.4bpp"
+	.incbin "graphics/pokemon/ampharos/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ampharos_footprint:: @ 8DAC3F4
-	.incbin "graphics/pokemon/footprints/ampharos_footprint.1bpp"
+	.incbin "graphics/pokemon/ampharos/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bellossom_still_front_pic:: @ 8DAC414
-	.incbin "graphics/pokemon/front_pics/bellossom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bellossom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bellossom_palette:: @ 8DAC684
-	.incbin "graphics/pokemon/palettes/bellossom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bellossom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bellossom_back_pic:: @ 8DAC6AC
-	.incbin "graphics/pokemon/back_pics/bellossom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bellossom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bellossom_shiny_palette:: @ 8DAC9D0
-	.incbin "graphics/pokemon/palettes/bellossom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bellossom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bellossom_icon:: @ 8DAC9F8
-	.incbin "graphics/pokemon/icons/bellossom_icon.4bpp"
+	.incbin "graphics/pokemon/bellossom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bellossom_footprint:: @ 8DACDF8
-	.incbin "graphics/pokemon/footprints/bellossom_footprint.1bpp"
+	.incbin "graphics/pokemon/bellossom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_marill_still_front_pic:: @ 8DACE18
-	.incbin "graphics/pokemon/front_pics/marill_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marill/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marill_palette:: @ 8DAD0DC
-	.incbin "graphics/pokemon/palettes/marill_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marill/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_marill_back_pic:: @ 8DAD104
-	.incbin "graphics/pokemon/back_pics/marill_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marill/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marill_shiny_palette:: @ 8DAD3B0
-	.incbin "graphics/pokemon/palettes/marill_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marill/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_marill_icon:: @ 8DAD3D8
-	.incbin "graphics/pokemon/icons/marill_icon.4bpp"
+	.incbin "graphics/pokemon/marill/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_marill_footprint:: @ 8DAD7D8
-	.incbin "graphics/pokemon/footprints/marill_footprint.1bpp"
+	.incbin "graphics/pokemon/marill/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_azumarill_still_front_pic:: @ 8DAD7F8
-	.incbin "graphics/pokemon/front_pics/azumarill_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/azumarill/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_azumarill_palette:: @ 8DADAF8
-	.incbin "graphics/pokemon/palettes/azumarill_palette.gbapal.lz"
+	.incbin "graphics/pokemon/azumarill/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_azumarill_back_pic:: @ 8DADB20
-	.incbin "graphics/pokemon/back_pics/azumarill_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/azumarill/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_azumarill_shiny_palette:: @ 8DADDDC
-	.incbin "graphics/pokemon/palettes/azumarill_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/azumarill/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_azumarill_icon:: @ 8DADE04
-	.incbin "graphics/pokemon/icons/azumarill_icon.4bpp"
+	.incbin "graphics/pokemon/azumarill/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_azumarill_footprint:: @ 8DAE204
-	.incbin "graphics/pokemon/footprints/azumarill_footprint.1bpp"
+	.incbin "graphics/pokemon/azumarill/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sudowoodo_still_front_pic:: @ 8DAE224
-	.incbin "graphics/pokemon/front_pics/sudowoodo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sudowoodo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sudowoodo_palette:: @ 8DAE53C
-	.incbin "graphics/pokemon/palettes/sudowoodo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sudowoodo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sudowoodo_back_pic:: @ 8DAE564
-	.incbin "graphics/pokemon/back_pics/sudowoodo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sudowoodo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sudowoodo_shiny_palette:: @ 8DAE8C0
-	.incbin "graphics/pokemon/palettes/sudowoodo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sudowoodo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sudowoodo_icon:: @ 8DAE8E8
-	.incbin "graphics/pokemon/icons/sudowoodo_icon.4bpp"
+	.incbin "graphics/pokemon/sudowoodo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sudowoodo_footprint:: @ 8DAECE8
-	.incbin "graphics/pokemon/footprints/sudowoodo_footprint.1bpp"
+	.incbin "graphics/pokemon/sudowoodo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_politoed_still_front_pic:: @ 8DAED08
-	.incbin "graphics/pokemon/front_pics/politoed_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/politoed/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_politoed_palette:: @ 8DAF044
-	.incbin "graphics/pokemon/palettes/politoed_palette.gbapal.lz"
+	.incbin "graphics/pokemon/politoed/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_politoed_back_pic:: @ 8DAF06C
-	.incbin "graphics/pokemon/back_pics/politoed_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/politoed/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_politoed_shiny_palette:: @ 8DAF328
-	.incbin "graphics/pokemon/palettes/politoed_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/politoed/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_politoed_icon:: @ 8DAF350
-	.incbin "graphics/pokemon/icons/politoed_icon.4bpp"
+	.incbin "graphics/pokemon/politoed/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_politoed_footprint:: @ 8DAF750
-	.incbin "graphics/pokemon/footprints/politoed_footprint.1bpp"
+	.incbin "graphics/pokemon/politoed/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hoppip_still_front_pic:: @ 8DAF770
-	.incbin "graphics/pokemon/front_pics/hoppip_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hoppip/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hoppip_palette:: @ 8DAFA24
-	.incbin "graphics/pokemon/palettes/hoppip_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hoppip/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hoppip_back_pic:: @ 8DAFA4C
-	.incbin "graphics/pokemon/back_pics/hoppip_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hoppip/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hoppip_shiny_palette:: @ 8DAFD2C
-	.incbin "graphics/pokemon/palettes/hoppip_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hoppip/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hoppip_icon:: @ 8DAFD54
-	.incbin "graphics/pokemon/icons/hoppip_icon.4bpp"
+	.incbin "graphics/pokemon/hoppip/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hoppip_footprint:: @ 8DB0154
-	.incbin "graphics/pokemon/footprints/hoppip_footprint.1bpp"
+	.incbin "graphics/pokemon/hoppip/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_skiploom_still_front_pic:: @ 8DB0174
-	.incbin "graphics/pokemon/front_pics/skiploom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skiploom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skiploom_palette:: @ 8DB03FC
-	.incbin "graphics/pokemon/palettes/skiploom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skiploom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_skiploom_back_pic:: @ 8DB0424
-	.incbin "graphics/pokemon/back_pics/skiploom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skiploom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skiploom_shiny_palette:: @ 8DB0704
-	.incbin "graphics/pokemon/palettes/skiploom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skiploom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_skiploom_icon:: @ 8DB072C
-	.incbin "graphics/pokemon/icons/skiploom_icon.4bpp"
+	.incbin "graphics/pokemon/skiploom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_skiploom_footprint:: @ 8DB0B2C
-	.incbin "graphics/pokemon/footprints/skiploom_footprint.1bpp"
+	.incbin "graphics/pokemon/skiploom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jumpluff_still_front_pic:: @ 8DB0B4C
-	.incbin "graphics/pokemon/front_pics/jumpluff_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jumpluff/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jumpluff_palette:: @ 8DB0EB8
-	.incbin "graphics/pokemon/palettes/jumpluff_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jumpluff/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jumpluff_back_pic:: @ 8DB0EE0
-	.incbin "graphics/pokemon/back_pics/jumpluff_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jumpluff/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jumpluff_shiny_palette:: @ 8DB12D8
-	.incbin "graphics/pokemon/palettes/jumpluff_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jumpluff/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jumpluff_icon:: @ 8DB1300
-	.incbin "graphics/pokemon/icons/jumpluff_icon.4bpp"
+	.incbin "graphics/pokemon/jumpluff/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jumpluff_footprint:: @ 8DB1700
-	.incbin "graphics/pokemon/footprints/jumpluff_footprint.1bpp"
+	.incbin "graphics/pokemon/jumpluff/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_aipom_still_front_pic:: @ 8DB1720
-	.incbin "graphics/pokemon/front_pics/aipom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aipom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aipom_palette:: @ 8DB1A1C
-	.incbin "graphics/pokemon/palettes/aipom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aipom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_aipom_back_pic:: @ 8DB1A44
-	.incbin "graphics/pokemon/back_pics/aipom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aipom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aipom_shiny_palette:: @ 8DB1D38
-	.incbin "graphics/pokemon/palettes/aipom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aipom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_aipom_icon:: @ 8DB1D60
-	.incbin "graphics/pokemon/icons/aipom_icon.4bpp"
+	.incbin "graphics/pokemon/aipom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_aipom_footprint:: @ 8DB2160
-	.incbin "graphics/pokemon/footprints/aipom_footprint.1bpp"
+	.incbin "graphics/pokemon/aipom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sunkern_still_front_pic:: @ 8DB2180
-	.incbin "graphics/pokemon/front_pics/sunkern_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sunkern/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sunkern_palette:: @ 8DB23B8
-	.incbin "graphics/pokemon/palettes/sunkern_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sunkern/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sunkern_back_pic:: @ 8DB23E0
-	.incbin "graphics/pokemon/back_pics/sunkern_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sunkern/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sunkern_shiny_palette:: @ 8DB26A4
-	.incbin "graphics/pokemon/palettes/sunkern_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sunkern/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sunkern_icon:: @ 8DB26CC
-	.incbin "graphics/pokemon/icons/sunkern_icon.4bpp"
+	.incbin "graphics/pokemon/sunkern/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sunkern_footprint:: @ 8DB2ACC
-	.incbin "graphics/pokemon/footprints/sunkern_footprint.1bpp"
+	.incbin "graphics/pokemon/sunkern/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sunflora_still_front_pic:: @ 8DB2AEC
-	.incbin "graphics/pokemon/front_pics/sunflora_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sunflora/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sunflora_palette:: @ 8DB2E44
-	.incbin "graphics/pokemon/palettes/sunflora_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sunflora/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sunflora_back_pic:: @ 8DB2E6C
-	.incbin "graphics/pokemon/back_pics/sunflora_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sunflora/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sunflora_shiny_palette:: @ 8DB320C
-	.incbin "graphics/pokemon/palettes/sunflora_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sunflora/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sunflora_icon:: @ 8DB3234
-	.incbin "graphics/pokemon/icons/sunflora_icon.4bpp"
+	.incbin "graphics/pokemon/sunflora/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sunflora_footprint:: @ 8DB3634
-	.incbin "graphics/pokemon/footprints/sunflora_footprint.1bpp"
+	.incbin "graphics/pokemon/sunflora/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_yanma_still_front_pic:: @ 8DB3654
-	.incbin "graphics/pokemon/front_pics/yanma_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/yanma/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_yanma_palette:: @ 8DB39D8
-	.incbin "graphics/pokemon/palettes/yanma_palette.gbapal.lz"
+	.incbin "graphics/pokemon/yanma/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_yanma_back_pic:: @ 8DB3A00
-	.incbin "graphics/pokemon/back_pics/yanma_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/yanma/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_yanma_shiny_palette:: @ 8DB3DB4
-	.incbin "graphics/pokemon/palettes/yanma_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/yanma/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_yanma_icon:: @ 8DB3DDC
-	.incbin "graphics/pokemon/icons/yanma_icon.4bpp"
+	.incbin "graphics/pokemon/yanma/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_yanma_footprint:: @ 8DB41DC
-	.incbin "graphics/pokemon/footprints/yanma_footprint.1bpp"
+	.incbin "graphics/pokemon/yanma/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wooper_still_front_pic:: @ 8DB41FC
-	.incbin "graphics/pokemon/front_pics/wooper_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wooper/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wooper_palette:: @ 8DB443C
-	.incbin "graphics/pokemon/palettes/wooper_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wooper/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wooper_back_pic:: @ 8DB4464
-	.incbin "graphics/pokemon/back_pics/wooper_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wooper/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wooper_shiny_palette:: @ 8DB46F0
-	.incbin "graphics/pokemon/palettes/wooper_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wooper/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wooper_icon:: @ 8DB4718
-	.incbin "graphics/pokemon/icons/wooper_icon.4bpp"
+	.incbin "graphics/pokemon/wooper/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wooper_footprint:: @ 8DB4B18
-	.incbin "graphics/pokemon/footprints/wooper_footprint.1bpp"
+	.incbin "graphics/pokemon/wooper/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_quagsire_still_front_pic:: @ 8DB4B38
-	.incbin "graphics/pokemon/front_pics/quagsire_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/quagsire/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_quagsire_palette:: @ 8DB4EAC
-	.incbin "graphics/pokemon/palettes/quagsire_palette.gbapal.lz"
+	.incbin "graphics/pokemon/quagsire/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_quagsire_back_pic:: @ 8DB4ED4
-	.incbin "graphics/pokemon/back_pics/quagsire_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/quagsire/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_quagsire_shiny_palette:: @ 8DB51D0
-	.incbin "graphics/pokemon/palettes/quagsire_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/quagsire/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_quagsire_icon:: @ 8DB51F8
-	.incbin "graphics/pokemon/icons/quagsire_icon.4bpp"
+	.incbin "graphics/pokemon/quagsire/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_quagsire_footprint:: @ 8DB55F8
-	.incbin "graphics/pokemon/footprints/quagsire_footprint.1bpp"
+	.incbin "graphics/pokemon/quagsire/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_espeon_still_front_pic:: @ 8DB5618
-	.incbin "graphics/pokemon/front_pics/espeon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/espeon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_espeon_palette:: @ 8DB5958
-	.incbin "graphics/pokemon/palettes/espeon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/espeon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_espeon_back_pic:: @ 8DB597C
-	.incbin "graphics/pokemon/back_pics/espeon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/espeon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_espeon_shiny_palette:: @ 8DB5C58
-	.incbin "graphics/pokemon/palettes/espeon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/espeon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_espeon_icon:: @ 8DB5C7C
-	.incbin "graphics/pokemon/icons/espeon_icon.4bpp"
+	.incbin "graphics/pokemon/espeon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_espeon_footprint:: @ 8DB607C
-	.incbin "graphics/pokemon/footprints/espeon_footprint.1bpp"
+	.incbin "graphics/pokemon/espeon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_umbreon_still_front_pic:: @ 8DB609C
-	.incbin "graphics/pokemon/front_pics/umbreon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/umbreon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_umbreon_palette:: @ 8DB63B0
-	.incbin "graphics/pokemon/palettes/umbreon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/umbreon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_umbreon_back_pic:: @ 8DB63D8
-	.incbin "graphics/pokemon/back_pics/umbreon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/umbreon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_umbreon_shiny_palette:: @ 8DB66EC
-	.incbin "graphics/pokemon/palettes/umbreon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/umbreon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_umbreon_icon:: @ 8DB6714
-	.incbin "graphics/pokemon/icons/umbreon_icon.4bpp"
+	.incbin "graphics/pokemon/umbreon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_umbreon_footprint:: @ 8DB6B14
-	.incbin "graphics/pokemon/footprints/umbreon_footprint.1bpp"
+	.incbin "graphics/pokemon/umbreon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_murkrow_still_front_pic:: @ 8DB6B34
-	.incbin "graphics/pokemon/front_pics/murkrow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/murkrow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_murkrow_palette:: @ 8DB6E14
-	.incbin "graphics/pokemon/palettes/murkrow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/murkrow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_murkrow_back_pic:: @ 8DB6E3C
-	.incbin "graphics/pokemon/back_pics/murkrow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/murkrow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_murkrow_shiny_palette:: @ 8DB7154
-	.incbin "graphics/pokemon/palettes/murkrow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/murkrow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_murkrow_icon:: @ 8DB717C
-	.incbin "graphics/pokemon/icons/murkrow_icon.4bpp"
+	.incbin "graphics/pokemon/murkrow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_murkrow_footprint:: @ 8DB757C
-	.incbin "graphics/pokemon/footprints/murkrow_footprint.1bpp"
+	.incbin "graphics/pokemon/murkrow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slowking_still_front_pic:: @ 8DB759C
-	.incbin "graphics/pokemon/front_pics/slowking_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowking/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowking_palette:: @ 8DB7950
-	.incbin "graphics/pokemon/palettes/slowking_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowking/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slowking_back_pic:: @ 8DB7978
-	.incbin "graphics/pokemon/back_pics/slowking_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowking/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowking_shiny_palette:: @ 8DB7D04
-	.incbin "graphics/pokemon/palettes/slowking_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowking/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slowking_icon:: @ 8DB7D2C
-	.incbin "graphics/pokemon/icons/slowking_icon.4bpp"
+	.incbin "graphics/pokemon/slowking/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slowking_footprint:: @ 8DB812C
-	.incbin "graphics/pokemon/footprints/slowking_footprint.1bpp"
+	.incbin "graphics/pokemon/slowking/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_misdreavus_still_front_pic:: @ 8DB814C
-	.incbin "graphics/pokemon/front_pics/misdreavus_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/misdreavus/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_misdreavus_palette:: @ 8DB840C
-	.incbin "graphics/pokemon/palettes/misdreavus_palette.gbapal.lz"
+	.incbin "graphics/pokemon/misdreavus/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_misdreavus_back_pic:: @ 8DB8434
-	.incbin "graphics/pokemon/back_pics/misdreavus_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/misdreavus/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_misdreavus_shiny_palette:: @ 8DB8758
-	.incbin "graphics/pokemon/palettes/misdreavus_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/misdreavus/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_misdreavus_icon:: @ 8DB8780
-	.incbin "graphics/pokemon/icons/misdreavus_icon.4bpp"
+	.incbin "graphics/pokemon/misdreavus/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_misdreavus_footprint:: @ 8DB8B80
-	.incbin "graphics/pokemon/footprints/misdreavus_footprint.1bpp"
+	.incbin "graphics/pokemon/misdreavus/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_a_still_front_pic:: @ 8DB8BA0
-	.incbin "graphics/pokemon/front_pics/unown_a_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/a/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_unown_palette:: @ 8DB8D74
-	.incbin "graphics/pokemon/palettes/unown_palette.gbapal.lz"
+	.incbin "graphics/pokemon/unown/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_a_back_pic:: @ 8DB8D94
-	.incbin "graphics/pokemon/back_pics/unown_a_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/a/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_unown_shiny_palette:: @ 8DB8F94
-	.incbin "graphics/pokemon/palettes/unown_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/unown/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_a_icon:: @ 8DB8FB4
-	.incbin "graphics/pokemon/icons/unown_a_icon.4bpp"
+	.incbin "graphics/pokemon/unown/a/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_unown_footprint:: @ 8DB93B4
-	.incbin "graphics/pokemon/footprints/unown_footprint.1bpp"
+	.incbin "graphics/pokemon/unown/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wobbuffet_still_front_pic:: @ 8DB93D4
-	.incbin "graphics/pokemon/front_pics/wobbuffet_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wobbuffet/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wobbuffet_palette:: @ 8DB9724
-	.incbin "graphics/pokemon/palettes/wobbuffet_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wobbuffet/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wobbuffet_back_pic:: @ 8DB974C
-	.incbin "graphics/pokemon/back_pics/wobbuffet_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wobbuffet/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wobbuffet_shiny_palette:: @ 8DB9990
-	.incbin "graphics/pokemon/palettes/wobbuffet_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wobbuffet/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wobbuffet_icon:: @ 8DB99B8
-	.incbin "graphics/pokemon/icons/wobbuffet_icon.4bpp"
+	.incbin "graphics/pokemon/wobbuffet/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wobbuffet_footprint:: @ 8DB9DB8
-	.incbin "graphics/pokemon/footprints/wobbuffet_footprint.1bpp"
+	.incbin "graphics/pokemon/wobbuffet/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_girafarig_still_front_pic:: @ 8DB9DD8
-	.incbin "graphics/pokemon/front_pics/girafarig_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/girafarig/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_girafarig_palette:: @ 8DBA1DC
-	.incbin "graphics/pokemon/palettes/girafarig_palette.gbapal.lz"
+	.incbin "graphics/pokemon/girafarig/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_girafarig_back_pic:: @ 8DBA204
-	.incbin "graphics/pokemon/back_pics/girafarig_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/girafarig/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_girafarig_shiny_palette:: @ 8DBA5B0
-	.incbin "graphics/pokemon/palettes/girafarig_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/girafarig/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_girafarig_icon:: @ 8DBA5D8
-	.incbin "graphics/pokemon/icons/girafarig_icon.4bpp"
+	.incbin "graphics/pokemon/girafarig/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_girafarig_footprint:: @ 8DBA9D8
-	.incbin "graphics/pokemon/footprints/girafarig_footprint.1bpp"
+	.incbin "graphics/pokemon/girafarig/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pineco_still_front_pic:: @ 8DBA9F8
-	.incbin "graphics/pokemon/front_pics/pineco_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pineco/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pineco_palette:: @ 8DBAD38
-	.incbin "graphics/pokemon/palettes/pineco_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pineco/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pineco_back_pic:: @ 8DBAD5C
-	.incbin "graphics/pokemon/back_pics/pineco_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pineco/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pineco_shiny_palette:: @ 8DBB034
-	.incbin "graphics/pokemon/palettes/pineco_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pineco/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pineco_icon:: @ 8DBB058
-	.incbin "graphics/pokemon/icons/pineco_icon.4bpp"
+	.incbin "graphics/pokemon/pineco/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pineco_footprint:: @ 8DBB458
-	.incbin "graphics/pokemon/footprints/pineco_footprint.1bpp"
+	.incbin "graphics/pokemon/pineco/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_forretress_still_front_pic:: @ 8DBB478
-	.incbin "graphics/pokemon/front_pics/forretress_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/forretress/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_forretress_palette:: @ 8DBB894
-	.incbin "graphics/pokemon/palettes/forretress_palette.gbapal.lz"
+	.incbin "graphics/pokemon/forretress/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_forretress_back_pic:: @ 8DBB8BC
-	.incbin "graphics/pokemon/back_pics/forretress_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/forretress/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_forretress_shiny_palette:: @ 8DBBB7C
-	.incbin "graphics/pokemon/palettes/forretress_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/forretress/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_forretress_icon:: @ 8DBBBA4
-	.incbin "graphics/pokemon/icons/forretress_icon.4bpp"
+	.incbin "graphics/pokemon/forretress/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_forretress_footprint:: @ 8DBBFA4
-	.incbin "graphics/pokemon/footprints/forretress_footprint.1bpp"
+	.incbin "graphics/pokemon/forretress/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dunsparce_still_front_pic:: @ 8DBBFC4
-	.incbin "graphics/pokemon/front_pics/dunsparce_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dunsparce/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dunsparce_palette:: @ 8DBC2D4
-	.incbin "graphics/pokemon/palettes/dunsparce_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dunsparce/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dunsparce_back_pic:: @ 8DBC2FC
-	.incbin "graphics/pokemon/back_pics/dunsparce_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dunsparce/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dunsparce_shiny_palette:: @ 8DBC5F8
-	.incbin "graphics/pokemon/palettes/dunsparce_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dunsparce/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dunsparce_icon:: @ 8DBC620
-	.incbin "graphics/pokemon/icons/dunsparce_icon.4bpp"
+	.incbin "graphics/pokemon/dunsparce/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dunsparce_footprint:: @ 8DBCA20
-	.incbin "graphics/pokemon/footprints/dunsparce_footprint.1bpp"
+	.incbin "graphics/pokemon/dunsparce/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gligar_still_front_pic:: @ 8DBCA40
-	.incbin "graphics/pokemon/front_pics/gligar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gligar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gligar_palette:: @ 8DBCE68
-	.incbin "graphics/pokemon/palettes/gligar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gligar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gligar_back_pic:: @ 8DBCE90
-	.incbin "graphics/pokemon/back_pics/gligar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gligar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gligar_shiny_palette:: @ 8DBD268
-	.incbin "graphics/pokemon/palettes/gligar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gligar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gligar_icon:: @ 8DBD290
-	.incbin "graphics/pokemon/icons/gligar_icon.4bpp"
+	.incbin "graphics/pokemon/gligar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gligar_footprint:: @ 8DBD690
-	.incbin "graphics/pokemon/footprints/gligar_footprint.1bpp"
+	.incbin "graphics/pokemon/gligar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_steelix_still_front_pic:: @ 8DBD6B0
-	.incbin "graphics/pokemon/front_pics/steelix_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/steelix/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_steelix_palette:: @ 8DBDB78
-	.incbin "graphics/pokemon/palettes/steelix_palette.gbapal.lz"
+	.incbin "graphics/pokemon/steelix/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_steelix_back_pic:: @ 8DBDB9C
-	.incbin "graphics/pokemon/back_pics/steelix_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/steelix/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_steelix_shiny_palette:: @ 8DBDFA8
-	.incbin "graphics/pokemon/palettes/steelix_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/steelix/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_steelix_icon:: @ 8DBDFCC
-	.incbin "graphics/pokemon/icons/steelix_icon.4bpp"
+	.incbin "graphics/pokemon/steelix/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_steelix_footprint:: @ 8DBE3CC
-	.incbin "graphics/pokemon/footprints/steelix_footprint.1bpp"
+	.incbin "graphics/pokemon/steelix/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_snubbull_still_front_pic:: @ 8DBE3EC
-	.incbin "graphics/pokemon/front_pics/snubbull_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snubbull/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snubbull_palette:: @ 8DBE6C0
-	.incbin "graphics/pokemon/palettes/snubbull_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snubbull/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_snubbull_back_pic:: @ 8DBE6E8
-	.incbin "graphics/pokemon/back_pics/snubbull_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snubbull/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snubbull_shiny_palette:: @ 8DBEA10
-	.incbin "graphics/pokemon/palettes/snubbull_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snubbull/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_snubbull_icon:: @ 8DBEA38
-	.incbin "graphics/pokemon/icons/snubbull_icon.4bpp"
+	.incbin "graphics/pokemon/snubbull/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_snubbull_footprint:: @ 8DBEE38
-	.incbin "graphics/pokemon/footprints/snubbull_footprint.1bpp"
+	.incbin "graphics/pokemon/snubbull/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_granbull_still_front_pic:: @ 8DBEE58
-	.incbin "graphics/pokemon/front_pics/granbull_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/granbull/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_granbull_palette:: @ 8DBF1E4
-	.incbin "graphics/pokemon/palettes/granbull_palette.gbapal.lz"
+	.incbin "graphics/pokemon/granbull/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_granbull_back_pic:: @ 8DBF20C
-	.incbin "graphics/pokemon/back_pics/granbull_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/granbull/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_granbull_shiny_palette:: @ 8DBF530
-	.incbin "graphics/pokemon/palettes/granbull_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/granbull/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_granbull_icon:: @ 8DBF558
-	.incbin "graphics/pokemon/icons/granbull_icon.4bpp"
+	.incbin "graphics/pokemon/granbull/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_granbull_footprint:: @ 8DBF958
-	.incbin "graphics/pokemon/footprints/granbull_footprint.1bpp"
+	.incbin "graphics/pokemon/granbull/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_qwilfish_still_front_pic:: @ 8DBF978
-	.incbin "graphics/pokemon/front_pics/qwilfish_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/qwilfish/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_qwilfish_palette:: @ 8DBFC38
-	.incbin "graphics/pokemon/palettes/qwilfish_palette.gbapal.lz"
+	.incbin "graphics/pokemon/qwilfish/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_qwilfish_back_pic:: @ 8DBFC60
-	.incbin "graphics/pokemon/back_pics/qwilfish_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/qwilfish/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_qwilfish_shiny_palette:: @ 8DBFF40
-	.incbin "graphics/pokemon/palettes/qwilfish_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/qwilfish/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_qwilfish_icon:: @ 8DBFF68
-	.incbin "graphics/pokemon/icons/qwilfish_icon.4bpp"
+	.incbin "graphics/pokemon/qwilfish/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_qwilfish_footprint:: @ 8DC0368
-	.incbin "graphics/pokemon/footprints/qwilfish_footprint.1bpp"
+	.incbin "graphics/pokemon/qwilfish/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_scizor_still_front_pic:: @ 8DC0388
-	.incbin "graphics/pokemon/front_pics/scizor_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/scizor/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_scizor_palette:: @ 8DC0870
-	.incbin "graphics/pokemon/palettes/scizor_palette.gbapal.lz"
+	.incbin "graphics/pokemon/scizor/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_scizor_back_pic:: @ 8DC0898
-	.incbin "graphics/pokemon/back_pics/scizor_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/scizor/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_scizor_shiny_palette:: @ 8DC0C18
-	.incbin "graphics/pokemon/palettes/scizor_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/scizor/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_scizor_icon:: @ 8DC0C40
-	.incbin "graphics/pokemon/icons/scizor_icon.4bpp"
+	.incbin "graphics/pokemon/scizor/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_scizor_footprint:: @ 8DC1040
-	.incbin "graphics/pokemon/footprints/scizor_footprint.1bpp"
+	.incbin "graphics/pokemon/scizor/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shuckle_still_front_pic:: @ 8DC1060
-	.incbin "graphics/pokemon/front_pics/shuckle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shuckle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shuckle_palette:: @ 8DC1328
-	.incbin "graphics/pokemon/palettes/shuckle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shuckle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shuckle_back_pic:: @ 8DC1350
-	.incbin "graphics/pokemon/back_pics/shuckle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shuckle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shuckle_shiny_palette:: @ 8DC15A8
-	.incbin "graphics/pokemon/palettes/shuckle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shuckle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shuckle_icon:: @ 8DC15D0
-	.incbin "graphics/pokemon/icons/shuckle_icon.4bpp"
+	.incbin "graphics/pokemon/shuckle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shuckle_footprint:: @ 8DC19D0
-	.incbin "graphics/pokemon/footprints/shuckle_footprint.1bpp"
+	.incbin "graphics/pokemon/shuckle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_heracross_still_front_pic:: @ 8DC19F0
-	.incbin "graphics/pokemon/front_pics/heracross_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/heracross/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_heracross_palette:: @ 8DC1DE0
-	.incbin "graphics/pokemon/palettes/heracross_palette.gbapal.lz"
+	.incbin "graphics/pokemon/heracross/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_heracross_back_pic:: @ 8DC1E08
-	.incbin "graphics/pokemon/back_pics/heracross_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/heracross/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_heracross_shiny_palette:: @ 8DC2178
-	.incbin "graphics/pokemon/palettes/heracross_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/heracross/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_heracross_icon:: @ 8DC21A0
-	.incbin "graphics/pokemon/icons/heracross_icon.4bpp"
+	.incbin "graphics/pokemon/heracross/icon.4bpp"
 
 gUnknown_heracross_icon:: @ 8DC25A0
 	.incbin "baserom.gba", 0xDC25A0, 0x400
 
 	.align 2
 gFile_graphics_pokemon_footprints_heracross_footprint:: @ 8DC29A0
-	.incbin "graphics/pokemon/footprints/heracross_footprint.1bpp"
+	.incbin "graphics/pokemon/heracross/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sneasel_still_front_pic:: @ 8DC29C0
-	.incbin "graphics/pokemon/front_pics/sneasel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sneasel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sneasel_palette:: @ 8DC2D04
-	.incbin "graphics/pokemon/palettes/sneasel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sneasel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sneasel_back_pic:: @ 8DC2D2C
-	.incbin "graphics/pokemon/back_pics/sneasel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sneasel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sneasel_shiny_palette:: @ 8DC3050
-	.incbin "graphics/pokemon/palettes/sneasel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sneasel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sneasel_icon:: @ 8DC3078
-	.incbin "graphics/pokemon/icons/sneasel_icon.4bpp"
+	.incbin "graphics/pokemon/sneasel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sneasel_footprint:: @ 8DC3478
-	.incbin "graphics/pokemon/footprints/sneasel_footprint.1bpp"
+	.incbin "graphics/pokemon/sneasel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_teddiursa_still_front_pic:: @ 8DC3498
-	.incbin "graphics/pokemon/front_pics/teddiursa_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/teddiursa/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_teddiursa_palette:: @ 8DC3740
-	.incbin "graphics/pokemon/palettes/teddiursa_palette.gbapal.lz"
+	.incbin "graphics/pokemon/teddiursa/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_teddiursa_back_pic:: @ 8DC3768
-	.incbin "graphics/pokemon/back_pics/teddiursa_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/teddiursa/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_teddiursa_shiny_palette:: @ 8DC39E0
-	.incbin "graphics/pokemon/palettes/teddiursa_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/teddiursa/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_teddiursa_icon:: @ 8DC3A08
-	.incbin "graphics/pokemon/icons/teddiursa_icon.4bpp"
+	.incbin "graphics/pokemon/teddiursa/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_teddiursa_footprint:: @ 8DC3E08
-	.incbin "graphics/pokemon/footprints/teddiursa_footprint.1bpp"
+	.incbin "graphics/pokemon/teddiursa/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ursaring_still_front_pic:: @ 8DC3E28
-	.incbin "graphics/pokemon/front_pics/ursaring_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ursaring/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ursaring_palette:: @ 8DC4260
-	.incbin "graphics/pokemon/palettes/ursaring_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ursaring/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ursaring_back_pic:: @ 8DC4288
-	.incbin "graphics/pokemon/back_pics/ursaring_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ursaring/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ursaring_shiny_palette:: @ 8DC4610
-	.incbin "graphics/pokemon/palettes/ursaring_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ursaring/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ursaring_icon:: @ 8DC4638
-	.incbin "graphics/pokemon/icons/ursaring_icon.4bpp"
+	.incbin "graphics/pokemon/ursaring/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ursaring_footprint:: @ 8DC4A38
-	.incbin "graphics/pokemon/footprints/ursaring_footprint.1bpp"
+	.incbin "graphics/pokemon/ursaring/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slugma_still_front_pic:: @ 8DC4A58
-	.incbin "graphics/pokemon/front_pics/slugma_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slugma/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slugma_palette:: @ 8DC4CCC
-	.incbin "graphics/pokemon/palettes/slugma_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slugma/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slugma_back_pic:: @ 8DC4CF0
-	.incbin "graphics/pokemon/back_pics/slugma_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slugma/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slugma_shiny_palette:: @ 8DC4FD8
-	.incbin "graphics/pokemon/palettes/slugma_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slugma/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slugma_icon:: @ 8DC4FFC
-	.incbin "graphics/pokemon/icons/slugma_icon.4bpp"
+	.incbin "graphics/pokemon/slugma/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slugma_footprint:: @ 8DC53FC
-	.incbin "graphics/pokemon/footprints/slugma_footprint.1bpp"
+	.incbin "graphics/pokemon/slugma/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magcargo_still_front_pic:: @ 8DC541C
-	.incbin "graphics/pokemon/front_pics/magcargo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magcargo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magcargo_palette:: @ 8DC5764
-	.incbin "graphics/pokemon/palettes/magcargo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magcargo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magcargo_back_pic:: @ 8DC578C
-	.incbin "graphics/pokemon/back_pics/magcargo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magcargo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magcargo_shiny_palette:: @ 8DC5BA4
-	.incbin "graphics/pokemon/palettes/magcargo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magcargo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magcargo_icon:: @ 8DC5BCC
-	.incbin "graphics/pokemon/icons/magcargo_icon.4bpp"
+	.incbin "graphics/pokemon/magcargo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magcargo_footprint:: @ 8DC5FCC
-	.incbin "graphics/pokemon/footprints/magcargo_footprint.1bpp"
+	.incbin "graphics/pokemon/magcargo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swinub_still_front_pic:: @ 8DC5FEC
-	.incbin "graphics/pokemon/front_pics/swinub_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swinub/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swinub_palette:: @ 8DC61E8
-	.incbin "graphics/pokemon/palettes/swinub_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swinub/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swinub_back_pic:: @ 8DC6210
-	.incbin "graphics/pokemon/back_pics/swinub_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swinub/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swinub_shiny_palette:: @ 8DC644C
-	.incbin "graphics/pokemon/palettes/swinub_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swinub/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swinub_icon:: @ 8DC6474
-	.incbin "graphics/pokemon/icons/swinub_icon.4bpp"
+	.incbin "graphics/pokemon/swinub/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swinub_footprint:: @ 8DC6874
-	.incbin "graphics/pokemon/footprints/swinub_footprint.1bpp"
+	.incbin "graphics/pokemon/swinub/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_piloswine_still_front_pic:: @ 8DC6894
-	.incbin "graphics/pokemon/front_pics/piloswine_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/piloswine/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_piloswine_palette:: @ 8DC6BBC
-	.incbin "graphics/pokemon/palettes/piloswine_palette.gbapal.lz"
+	.incbin "graphics/pokemon/piloswine/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_piloswine_back_pic:: @ 8DC6BE4
-	.incbin "graphics/pokemon/back_pics/piloswine_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/piloswine/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_piloswine_shiny_palette:: @ 8DC6E30
-	.incbin "graphics/pokemon/palettes/piloswine_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/piloswine/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_piloswine_icon:: @ 8DC6E58
-	.incbin "graphics/pokemon/icons/piloswine_icon.4bpp"
+	.incbin "graphics/pokemon/piloswine/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_piloswine_footprint:: @ 8DC7258
-	.incbin "graphics/pokemon/footprints/piloswine_footprint.1bpp"
+	.incbin "graphics/pokemon/piloswine/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_corsola_still_front_pic:: @ 8DC7278
-	.incbin "graphics/pokemon/front_pics/corsola_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/corsola/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_corsola_palette:: @ 8DC7560
-	.incbin "graphics/pokemon/palettes/corsola_palette.gbapal.lz"
+	.incbin "graphics/pokemon/corsola/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_corsola_back_pic:: @ 8DC7588
-	.incbin "graphics/pokemon/back_pics/corsola_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/corsola/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_corsola_shiny_palette:: @ 8DC7848
-	.incbin "graphics/pokemon/palettes/corsola_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/corsola/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_corsola_icon:: @ 8DC7870
-	.incbin "graphics/pokemon/icons/corsola_icon.4bpp"
+	.incbin "graphics/pokemon/corsola/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_corsola_footprint:: @ 8DC7C70
-	.incbin "graphics/pokemon/footprints/corsola_footprint.1bpp"
+	.incbin "graphics/pokemon/corsola/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_remoraid_still_front_pic:: @ 8DC7C90
-	.incbin "graphics/pokemon/front_pics/remoraid_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/remoraid/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_remoraid_palette:: @ 8DC7EF8
-	.incbin "graphics/pokemon/palettes/remoraid_palette.gbapal.lz"
+	.incbin "graphics/pokemon/remoraid/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_remoraid_back_pic:: @ 8DC7F20
-	.incbin "graphics/pokemon/back_pics/remoraid_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/remoraid/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_remoraid_shiny_palette:: @ 8DC8234
-	.incbin "graphics/pokemon/palettes/remoraid_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/remoraid/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_remoraid_icon:: @ 8DC825C
-	.incbin "graphics/pokemon/icons/remoraid_icon.4bpp"
+	.incbin "graphics/pokemon/remoraid/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_remoraid_footprint:: @ 8DC865C
-	.incbin "graphics/pokemon/footprints/remoraid_footprint.1bpp"
+	.incbin "graphics/pokemon/remoraid/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_octillery_still_front_pic:: @ 8DC867C
-	.incbin "graphics/pokemon/front_pics/octillery_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/octillery/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_octillery_palette:: @ 8DC89B0
-	.incbin "graphics/pokemon/palettes/octillery_palette.gbapal.lz"
+	.incbin "graphics/pokemon/octillery/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_octillery_back_pic:: @ 8DC89D8
-	.incbin "graphics/pokemon/back_pics/octillery_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/octillery/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_octillery_shiny_palette:: @ 8DC8C90
-	.incbin "graphics/pokemon/palettes/octillery_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/octillery/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_octillery_icon:: @ 8DC8CB8
-	.incbin "graphics/pokemon/icons/octillery_icon.4bpp"
+	.incbin "graphics/pokemon/octillery/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_octillery_footprint:: @ 8DC90B8
-	.incbin "graphics/pokemon/footprints/octillery_footprint.1bpp"
+	.incbin "graphics/pokemon/octillery/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_delibird_still_front_pic:: @ 8DC90D8
-	.incbin "graphics/pokemon/front_pics/delibird_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/delibird/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_delibird_palette:: @ 8DC9448
-	.incbin "graphics/pokemon/palettes/delibird_palette.gbapal.lz"
+	.incbin "graphics/pokemon/delibird/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_delibird_back_pic:: @ 8DC9470
-	.incbin "graphics/pokemon/back_pics/delibird_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/delibird/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_delibird_shiny_palette:: @ 8DC9830
-	.incbin "graphics/pokemon/palettes/delibird_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/delibird/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_delibird_icon:: @ 8DC9858
-	.incbin "graphics/pokemon/icons/delibird_icon.4bpp"
+	.incbin "graphics/pokemon/delibird/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_delibird_footprint:: @ 8DC9C58
-	.incbin "graphics/pokemon/footprints/delibird_footprint.1bpp"
+	.incbin "graphics/pokemon/delibird/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mantine_still_front_pic:: @ 8DC9C78
-	.incbin "graphics/pokemon/front_pics/mantine_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mantine/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mantine_palette:: @ 8DCA114
-	.incbin "graphics/pokemon/palettes/mantine_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mantine/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mantine_back_pic:: @ 8DCA13C
-	.incbin "graphics/pokemon/back_pics/mantine_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mantine/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mantine_shiny_palette:: @ 8DCA3DC
-	.incbin "graphics/pokemon/palettes/mantine_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mantine/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mantine_icon:: @ 8DCA404
-	.incbin "graphics/pokemon/icons/mantine_icon.4bpp"
+	.incbin "graphics/pokemon/mantine/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mantine_footprint:: @ 8DCA804
-	.incbin "graphics/pokemon/footprints/mantine_footprint.1bpp"
+	.incbin "graphics/pokemon/mantine/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_skarmory_still_front_pic:: @ 8DCA824
-	.incbin "graphics/pokemon/front_pics/skarmory_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skarmory/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skarmory_palette:: @ 8DCAD04
-	.incbin "graphics/pokemon/palettes/skarmory_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skarmory/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_skarmory_back_pic:: @ 8DCAD2C
-	.incbin "graphics/pokemon/back_pics/skarmory_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skarmory/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skarmory_shiny_palette:: @ 8DCB030
-	.incbin "graphics/pokemon/palettes/skarmory_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skarmory/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_skarmory_icon:: @ 8DCB058
-	.incbin "graphics/pokemon/icons/skarmory_icon.4bpp"
+	.incbin "graphics/pokemon/skarmory/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_skarmory_footprint:: @ 8DCB458
-	.incbin "graphics/pokemon/footprints/skarmory_footprint.1bpp"
+	.incbin "graphics/pokemon/skarmory/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_houndour_still_front_pic:: @ 8DCB478
-	.incbin "graphics/pokemon/front_pics/houndour_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/houndour/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_houndour_palette:: @ 8DCB730
-	.incbin "graphics/pokemon/palettes/houndour_palette.gbapal.lz"
+	.incbin "graphics/pokemon/houndour/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_houndour_back_pic:: @ 8DCB758
-	.incbin "graphics/pokemon/back_pics/houndour_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/houndour/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_houndour_shiny_palette:: @ 8DCB9D8
-	.incbin "graphics/pokemon/palettes/houndour_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/houndour/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_houndour_icon:: @ 8DCBA00
-	.incbin "graphics/pokemon/icons/houndour_icon.4bpp"
+	.incbin "graphics/pokemon/houndour/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_houndour_footprint:: @ 8DCBE00
-	.incbin "graphics/pokemon/footprints/houndour_footprint.1bpp"
+	.incbin "graphics/pokemon/houndour/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_houndoom_still_front_pic:: @ 8DCBE20
-	.incbin "graphics/pokemon/front_pics/houndoom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/houndoom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_houndoom_palette:: @ 8DCC220
-	.incbin "graphics/pokemon/palettes/houndoom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/houndoom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_houndoom_back_pic:: @ 8DCC248
-	.incbin "graphics/pokemon/back_pics/houndoom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/houndoom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_houndoom_shiny_palette:: @ 8DCC56C
-	.incbin "graphics/pokemon/palettes/houndoom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/houndoom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_houndoom_icon:: @ 8DCC594
-	.incbin "graphics/pokemon/icons/houndoom_icon.4bpp"
+	.incbin "graphics/pokemon/houndoom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_houndoom_footprint:: @ 8DCC994
-	.incbin "graphics/pokemon/footprints/houndoom_footprint.1bpp"
+	.incbin "graphics/pokemon/houndoom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kingdra_still_front_pic:: @ 8DCC9B4
-	.incbin "graphics/pokemon/front_pics/kingdra_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kingdra/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kingdra_palette:: @ 8DCCDD4
-	.incbin "graphics/pokemon/palettes/kingdra_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kingdra/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kingdra_back_pic:: @ 8DCCDFC
-	.incbin "graphics/pokemon/back_pics/kingdra_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kingdra/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kingdra_shiny_palette:: @ 8DCD1B0
-	.incbin "graphics/pokemon/palettes/kingdra_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kingdra/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kingdra_icon:: @ 8DCD1D8
-	.incbin "graphics/pokemon/icons/kingdra_icon.4bpp"
+	.incbin "graphics/pokemon/kingdra/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kingdra_footprint:: @ 8DCD5D8
-	.incbin "graphics/pokemon/footprints/kingdra_footprint.1bpp"
+	.incbin "graphics/pokemon/kingdra/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_phanpy_still_front_pic:: @ 8DCD5F8
-	.incbin "graphics/pokemon/front_pics/phanpy_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/phanpy/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_phanpy_palette:: @ 8DCD854
-	.incbin "graphics/pokemon/palettes/phanpy_palette.gbapal.lz"
+	.incbin "graphics/pokemon/phanpy/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_phanpy_back_pic:: @ 8DCD87C
-	.incbin "graphics/pokemon/back_pics/phanpy_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/phanpy/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_phanpy_shiny_palette:: @ 8DCDB40
-	.incbin "graphics/pokemon/palettes/phanpy_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/phanpy/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_phanpy_icon:: @ 8DCDB68
-	.incbin "graphics/pokemon/icons/phanpy_icon.4bpp"
+	.incbin "graphics/pokemon/phanpy/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_phanpy_footprint:: @ 8DCDF68
-	.incbin "graphics/pokemon/footprints/phanpy_footprint.1bpp"
+	.incbin "graphics/pokemon/phanpy/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_donphan_still_front_pic:: @ 8DCDF88
-	.incbin "graphics/pokemon/front_pics/donphan_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/donphan/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_donphan_palette:: @ 8DCE3FC
-	.incbin "graphics/pokemon/palettes/donphan_palette.gbapal.lz"
+	.incbin "graphics/pokemon/donphan/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_donphan_back_pic:: @ 8DCE424
-	.incbin "graphics/pokemon/back_pics/donphan_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/donphan/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_donphan_shiny_palette:: @ 8DCE720
-	.incbin "graphics/pokemon/palettes/donphan_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/donphan/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_donphan_icon:: @ 8DCE748
-	.incbin "graphics/pokemon/icons/donphan_icon.4bpp"
+	.incbin "graphics/pokemon/donphan/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_donphan_footprint:: @ 8DCEB48
-	.incbin "graphics/pokemon/footprints/donphan_footprint.1bpp"
+	.incbin "graphics/pokemon/donphan/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_porygon2_still_front_pic:: @ 8DCEB68
-	.incbin "graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/porygon2/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_porygon2_palette:: @ 8DCEDF0
-	.incbin "graphics/pokemon/palettes/porygon2_palette.gbapal.lz"
+	.incbin "graphics/pokemon/porygon2/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_porygon2_back_pic:: @ 8DCEE18
-	.incbin "graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/porygon2/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_porygon2_shiny_palette:: @ 8DCF134
-	.incbin "graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/porygon2/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_porygon2_icon:: @ 8DCF15C
-	.incbin "graphics/pokemon/icons/porygon2_icon.4bpp"
+	.incbin "graphics/pokemon/porygon2/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_porygon2_footprint:: @ 8DCF55C
-	.incbin "graphics/pokemon/footprints/porygon2_footprint.1bpp"
+	.incbin "graphics/pokemon/porygon2/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_stantler_still_front_pic:: @ 8DCF57C
-	.incbin "graphics/pokemon/front_pics/stantler_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/stantler/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_stantler_palette:: @ 8DCF990
-	.incbin "graphics/pokemon/palettes/stantler_palette.gbapal.lz"
+	.incbin "graphics/pokemon/stantler/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_stantler_back_pic:: @ 8DCF9B8
-	.incbin "graphics/pokemon/back_pics/stantler_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/stantler/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_stantler_shiny_palette:: @ 8DCFD04
-	.incbin "graphics/pokemon/palettes/stantler_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/stantler/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_stantler_icon:: @ 8DCFD2C
-	.incbin "graphics/pokemon/icons/stantler_icon.4bpp"
+	.incbin "graphics/pokemon/stantler/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_stantler_footprint:: @ 8DD012C
-	.incbin "graphics/pokemon/footprints/stantler_footprint.1bpp"
+	.incbin "graphics/pokemon/stantler/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_smeargle_still_front_pic:: @ 8DD014C
-	.incbin "graphics/pokemon/front_pics/smeargle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/smeargle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_smeargle_palette:: @ 8DD04E0
-	.incbin "graphics/pokemon/palettes/smeargle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/smeargle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_smeargle_back_pic:: @ 8DD0508
-	.incbin "graphics/pokemon/back_pics/smeargle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/smeargle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_smeargle_shiny_palette:: @ 8DD082C
-	.incbin "graphics/pokemon/palettes/smeargle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/smeargle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_smeargle_icon:: @ 8DD0854
-	.incbin "graphics/pokemon/icons/smeargle_icon.4bpp"
+	.incbin "graphics/pokemon/smeargle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_smeargle_footprint:: @ 8DD0C54
-	.incbin "graphics/pokemon/footprints/smeargle_footprint.1bpp"
+	.incbin "graphics/pokemon/smeargle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tyrogue_still_front_pic:: @ 8DD0C74
-	.incbin "graphics/pokemon/front_pics/tyrogue_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tyrogue/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tyrogue_palette:: @ 8DD0F00
-	.incbin "graphics/pokemon/palettes/tyrogue_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tyrogue/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tyrogue_back_pic:: @ 8DD0F28
-	.incbin "graphics/pokemon/back_pics/tyrogue_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tyrogue/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tyrogue_shiny_palette:: @ 8DD1244
-	.incbin "graphics/pokemon/palettes/tyrogue_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tyrogue/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tyrogue_icon:: @ 8DD126C
-	.incbin "graphics/pokemon/icons/tyrogue_icon.4bpp"
+	.incbin "graphics/pokemon/tyrogue/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tyrogue_footprint:: @ 8DD166C
-	.incbin "graphics/pokemon/footprints/tyrogue_footprint.1bpp"
+	.incbin "graphics/pokemon/tyrogue/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hitmontop_still_front_pic:: @ 8DD168C
-	.incbin "graphics/pokemon/front_pics/hitmontop_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmontop/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmontop_palette:: @ 8DD1A18
-	.incbin "graphics/pokemon/palettes/hitmontop_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmontop/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hitmontop_back_pic:: @ 8DD1A40
-	.incbin "graphics/pokemon/back_pics/hitmontop_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmontop/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmontop_shiny_palette:: @ 8DD1E68
-	.incbin "graphics/pokemon/palettes/hitmontop_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmontop/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hitmontop_icon:: @ 8DD1E90
-	.incbin "graphics/pokemon/icons/hitmontop_icon.4bpp"
+	.incbin "graphics/pokemon/hitmontop/icon.4bpp"
 
 gUnknown_hitmontop_unknown_data:: @ 8DD2290
 	.incbin "baserom.gba", 0xDD2290, 0x200
 
 	.align 2
 gFile_graphics_pokemon_footprints_hitmontop_footprint:: @ 8DD2490
-	.incbin "graphics/pokemon/footprints/hitmontop_footprint.1bpp"
+	.incbin "graphics/pokemon/hitmontop/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_smoochum_still_front_pic:: @ 8DD24B0
-	.incbin "graphics/pokemon/front_pics/smoochum_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/smoochum/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_smoochum_palette:: @ 8DD2708
-	.incbin "graphics/pokemon/palettes/smoochum_palette.gbapal.lz"
+	.incbin "graphics/pokemon/smoochum/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_smoochum_back_pic:: @ 8DD2730
-	.incbin "graphics/pokemon/back_pics/smoochum_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/smoochum/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_smoochum_shiny_palette:: @ 8DD29A8
-	.incbin "graphics/pokemon/palettes/smoochum_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/smoochum/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_smoochum_icon:: @ 8DD29D0
-	.incbin "graphics/pokemon/icons/smoochum_icon.4bpp"
+	.incbin "graphics/pokemon/smoochum/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_smoochum_footprint:: @ 8DD2DD0
-	.incbin "graphics/pokemon/footprints/smoochum_footprint.1bpp"
+	.incbin "graphics/pokemon/smoochum/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_elekid_still_front_pic:: @ 8DD2DF0
-	.incbin "graphics/pokemon/front_pics/elekid_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/elekid/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_elekid_palette:: @ 8DD30F8
-	.incbin "graphics/pokemon/palettes/elekid_palette.gbapal.lz"
+	.incbin "graphics/pokemon/elekid/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_elekid_back_pic:: @ 8DD3120
-	.incbin "graphics/pokemon/back_pics/elekid_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/elekid/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_elekid_shiny_palette:: @ 8DD3478
-	.incbin "graphics/pokemon/palettes/elekid_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/elekid/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_elekid_icon:: @ 8DD34A0
-	.incbin "graphics/pokemon/icons/elekid_icon.4bpp"
+	.incbin "graphics/pokemon/elekid/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_elekid_footprint:: @ 8DD38A0
-	.incbin "graphics/pokemon/footprints/elekid_footprint.1bpp"
+	.incbin "graphics/pokemon/elekid/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magby_still_front_pic:: @ 8DD38C0
-	.incbin "graphics/pokemon/front_pics/magby_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magby/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magby_palette:: @ 8DD3B44
-	.incbin "graphics/pokemon/palettes/magby_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magby/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magby_back_pic:: @ 8DD3B6C
-	.incbin "graphics/pokemon/back_pics/magby_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magby/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magby_shiny_palette:: @ 8DD3E18
-	.incbin "graphics/pokemon/palettes/magby_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magby/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magby_icon:: @ 8DD3E40
-	.incbin "graphics/pokemon/icons/magby_icon.4bpp"
+	.incbin "graphics/pokemon/magby/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magby_footprint:: @ 8DD4240
-	.incbin "graphics/pokemon/footprints/magby_footprint.1bpp"
+	.incbin "graphics/pokemon/magby/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_miltank_still_front_pic:: @ 8DD4260
-	.incbin "graphics/pokemon/front_pics/miltank_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/miltank/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_miltank_palette:: @ 8DD4610
-	.incbin "graphics/pokemon/palettes/miltank_palette.gbapal.lz"
+	.incbin "graphics/pokemon/miltank/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_miltank_back_pic:: @ 8DD4638
-	.incbin "graphics/pokemon/back_pics/miltank_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/miltank/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_miltank_shiny_palette:: @ 8DD49D4
-	.incbin "graphics/pokemon/palettes/miltank_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/miltank/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_miltank_icon:: @ 8DD49FC
-	.incbin "graphics/pokemon/icons/miltank_icon.4bpp"
+	.incbin "graphics/pokemon/miltank/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_miltank_footprint:: @ 8DD4DFC
-	.incbin "graphics/pokemon/footprints/miltank_footprint.1bpp"
+	.incbin "graphics/pokemon/miltank/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_blissey_still_front_pic:: @ 8DD4E1C
-	.incbin "graphics/pokemon/front_pics/blissey_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blissey/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blissey_palette:: @ 8DD5204
-	.incbin "graphics/pokemon/palettes/blissey_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blissey/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_blissey_back_pic:: @ 8DD522C
-	.incbin "graphics/pokemon/back_pics/blissey_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blissey/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blissey_shiny_palette:: @ 8DD54F8
-	.incbin "graphics/pokemon/palettes/blissey_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blissey/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_blissey_icon:: @ 8DD5520
-	.incbin "graphics/pokemon/icons/blissey_icon.4bpp"
+	.incbin "graphics/pokemon/blissey/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_blissey_footprint:: @ 8DD5920
-	.incbin "graphics/pokemon/footprints/blissey_footprint.1bpp"
+	.incbin "graphics/pokemon/blissey/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_raikou_still_front_pic:: @ 8DD5940
-	.incbin "graphics/pokemon/front_pics/raikou_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raikou/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raikou_palette:: @ 8DD5EBC
-	.incbin "graphics/pokemon/palettes/raikou_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raikou/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_raikou_back_pic:: @ 8DD5EE4
-	.incbin "graphics/pokemon/back_pics/raikou_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raikou/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raikou_shiny_palette:: @ 8DD628C
-	.incbin "graphics/pokemon/palettes/raikou_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raikou/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_raikou_icon:: @ 8DD62B4
-	.incbin "graphics/pokemon/icons/raikou_icon.4bpp"
+	.incbin "graphics/pokemon/raikou/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_raikou_footprint:: @ 8DD66B4
-	.incbin "graphics/pokemon/footprints/raikou_footprint.1bpp"
+	.incbin "graphics/pokemon/raikou/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_entei_still_front_pic:: @ 8DD66D4
-	.incbin "graphics/pokemon/front_pics/entei_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/entei/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_entei_palette:: @ 8DD6CD0
-	.incbin "graphics/pokemon/palettes/entei_palette.gbapal.lz"
+	.incbin "graphics/pokemon/entei/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_entei_back_pic:: @ 8DD6CF8
-	.incbin "graphics/pokemon/back_pics/entei_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/entei/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_entei_shiny_palette:: @ 8DD711C
-	.incbin "graphics/pokemon/palettes/entei_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/entei/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_entei_icon:: @ 8DD7144
-	.incbin "graphics/pokemon/icons/entei_icon.4bpp"
+	.incbin "graphics/pokemon/entei/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_entei_footprint:: @ 8DD7544
-	.incbin "graphics/pokemon/footprints/entei_footprint.1bpp"
+	.incbin "graphics/pokemon/entei/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_suicune_still_front_pic:: @ 8DD7564
-	.incbin "graphics/pokemon/front_pics/suicune_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/suicune/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_suicune_palette:: @ 8DD7AE8
-	.incbin "graphics/pokemon/palettes/suicune_palette.gbapal.lz"
+	.incbin "graphics/pokemon/suicune/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_suicune_back_pic:: @ 8DD7B10
-	.incbin "graphics/pokemon/back_pics/suicune_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/suicune/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_suicune_shiny_palette:: @ 8DD7FEC
-	.incbin "graphics/pokemon/palettes/suicune_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/suicune/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_suicune_icon:: @ 8DD8014
-	.incbin "graphics/pokemon/icons/suicune_icon.4bpp"
+	.incbin "graphics/pokemon/suicune/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_suicune_footprint:: @ 8DD8414
-	.incbin "graphics/pokemon/footprints/suicune_footprint.1bpp"
+	.incbin "graphics/pokemon/suicune/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_larvitar_still_front_pic:: @ 8DD8434
-	.incbin "graphics/pokemon/front_pics/larvitar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/larvitar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_larvitar_palette:: @ 8DD8690
-	.incbin "graphics/pokemon/palettes/larvitar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/larvitar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_larvitar_back_pic:: @ 8DD86B8
-	.incbin "graphics/pokemon/back_pics/larvitar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/larvitar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_larvitar_shiny_palette:: @ 8DD8964
-	.incbin "graphics/pokemon/palettes/larvitar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/larvitar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_larvitar_icon:: @ 8DD898C
-	.incbin "graphics/pokemon/icons/larvitar_icon.4bpp"
+	.incbin "graphics/pokemon/larvitar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_larvitar_footprint:: @ 8DD8D8C
-	.incbin "graphics/pokemon/footprints/larvitar_footprint.1bpp"
+	.incbin "graphics/pokemon/larvitar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pupitar_still_front_pic:: @ 8DD8DAC
-	.incbin "graphics/pokemon/front_pics/pupitar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pupitar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pupitar_palette:: @ 8DD909C
-	.incbin "graphics/pokemon/palettes/pupitar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pupitar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pupitar_back_pic:: @ 8DD90C4
-	.incbin "graphics/pokemon/back_pics/pupitar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pupitar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pupitar_shiny_palette:: @ 8DD93FC
-	.incbin "graphics/pokemon/palettes/pupitar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pupitar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pupitar_icon:: @ 8DD9424
-	.incbin "graphics/pokemon/icons/pupitar_icon.4bpp"
+	.incbin "graphics/pokemon/pupitar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pupitar_footprint:: @ 8DD9824
-	.incbin "graphics/pokemon/footprints/pupitar_footprint.1bpp"
+	.incbin "graphics/pokemon/pupitar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tyranitar_still_front_pic:: @ 8DD9844
-	.incbin "graphics/pokemon/front_pics/tyranitar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tyranitar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tyranitar_palette:: @ 8DD9D80
-	.incbin "graphics/pokemon/palettes/tyranitar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tyranitar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tyranitar_back_pic:: @ 8DD9DA8
-	.incbin "graphics/pokemon/back_pics/tyranitar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tyranitar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tyranitar_shiny_palette:: @ 8DDA194
-	.incbin "graphics/pokemon/palettes/tyranitar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tyranitar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tyranitar_icon:: @ 8DDA1BC
-	.incbin "graphics/pokemon/icons/tyranitar_icon.4bpp"
+	.incbin "graphics/pokemon/tyranitar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tyranitar_footprint:: @ 8DDA5BC
-	.incbin "graphics/pokemon/footprints/tyranitar_footprint.1bpp"
+	.incbin "graphics/pokemon/tyranitar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lugia_still_front_pic:: @ 8DDA5DC
-	.incbin "graphics/pokemon/front_pics/lugia_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lugia/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lugia_palette:: @ 8DDAAA0
-	.incbin "graphics/pokemon/palettes/lugia_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lugia/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lugia_back_pic:: @ 8DDAAC8
-	.incbin "graphics/pokemon/back_pics/lugia_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lugia/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lugia_shiny_palette:: @ 8DDAE9C
-	.incbin "graphics/pokemon/palettes/lugia_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lugia/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lugia_icon:: @ 8DDAEC4
-	.incbin "graphics/pokemon/icons/lugia_icon.4bpp"
+	.incbin "graphics/pokemon/lugia/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lugia_footprint:: @ 8DDB2C4
-	.incbin "graphics/pokemon/footprints/lugia_footprint.1bpp"
+	.incbin "graphics/pokemon/lugia/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ho_oh_still_front_pic:: @ 8DDB2E4
-	.incbin "graphics/pokemon/front_pics/ho_oh_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ho_oh/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ho_oh_palette:: @ 8DDB938
-	.incbin "graphics/pokemon/palettes/ho_oh_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ho_oh/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ho_oh_back_pic:: @ 8DDB960
-	.incbin "graphics/pokemon/back_pics/ho_oh_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ho_oh/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ho_oh_shiny_palette:: @ 8DDBD70
-	.incbin "graphics/pokemon/palettes/ho_oh_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ho_oh/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ho_oh_icon:: @ 8DDBD98
-	.incbin "graphics/pokemon/icons/ho_oh_icon.4bpp"
+	.incbin "graphics/pokemon/ho_oh/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ho_oh_footprint:: @ 8DDC198
-	.incbin "graphics/pokemon/footprints/ho_oh_footprint.1bpp"
+	.incbin "graphics/pokemon/ho_oh/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_celebi_still_front_pic:: @ 8DDC1B8
-	.incbin "graphics/pokemon/front_pics/celebi_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/celebi/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_celebi_palette:: @ 8DDC430
-	.incbin "graphics/pokemon/palettes/celebi_palette.gbapal.lz"
+	.incbin "graphics/pokemon/celebi/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_celebi_back_pic:: @ 8DDC458
-	.incbin "graphics/pokemon/back_pics/celebi_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/celebi/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_celebi_shiny_palette:: @ 8DDC804
-	.incbin "graphics/pokemon/palettes/celebi_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/celebi/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_celebi_icon:: @ 8DDC82C
-	.incbin "graphics/pokemon/icons/celebi_icon.4bpp"
+	.incbin "graphics/pokemon/celebi/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_celebi_footprint:: @ 8DDCC2C
-	.incbin "graphics/pokemon/footprints/celebi_footprint.1bpp"
+	.incbin "graphics/pokemon/celebi/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_double_question_mark_still_front_pic:: @ 8DDCC4C
-	.incbin "graphics/pokemon/front_pics/double_question_mark_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/question_mark/double/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_double_question_mark_palette:: @ 8DDCDD0
-	.incbin "graphics/pokemon/palettes/double_question_mark_palette.gbapal.lz"
+	.incbin "graphics/pokemon/question_mark/double/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_double_question_mark_back_pic:: @ 8DDCDE4
-	.incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/question_mark/double/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_double_question_mark_shiny_palette:: @ 8DDCF68
-	.incbin "graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/question_mark/double/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_treecko_still_front_pic:: @ 8DDCF7C
-	.incbin "graphics/pokemon/front_pics/treecko_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/treecko/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_treecko_palette:: @ 8DDD284
-	.incbin "graphics/pokemon/palettes/treecko_palette.gbapal.lz"
+	.incbin "graphics/pokemon/treecko/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_treecko_back_pic:: @ 8DDD2AC
-	.incbin "graphics/pokemon/back_pics/treecko_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/treecko/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_treecko_shiny_palette:: @ 8DDD5AC
-	.incbin "graphics/pokemon/palettes/treecko_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/treecko/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_treecko_icon:: @ 8DDD5D4
-	.incbin "graphics/pokemon/icons/treecko_icon.4bpp"
+	.incbin "graphics/pokemon/treecko/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_treecko_footprint:: @ 8DDD9D4
-	.incbin "graphics/pokemon/footprints/treecko_footprint.1bpp"
+	.incbin "graphics/pokemon/treecko/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_grovyle_still_front_pic:: @ 8DDD9F4
-	.incbin "graphics/pokemon/front_pics/grovyle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grovyle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grovyle_palette:: @ 8DDDE80
-	.incbin "graphics/pokemon/palettes/grovyle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grovyle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_grovyle_back_pic:: @ 8DDDEA8
-	.incbin "graphics/pokemon/back_pics/grovyle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grovyle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grovyle_shiny_palette:: @ 8DDE1E4
-	.incbin "graphics/pokemon/palettes/grovyle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grovyle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_grovyle_icon:: @ 8DDE20C
-	.incbin "graphics/pokemon/icons/grovyle_icon.4bpp"
+	.incbin "graphics/pokemon/grovyle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_grovyle_footprint:: @ 8DDE60C
-	.incbin "graphics/pokemon/footprints/grovyle_footprint.1bpp"
+	.incbin "graphics/pokemon/grovyle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sceptile_still_front_pic:: @ 8DDE62C
-	.incbin "graphics/pokemon/front_pics/sceptile_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sceptile/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sceptile_palette:: @ 8DDEB30
-	.incbin "graphics/pokemon/palettes/sceptile_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sceptile/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sceptile_back_pic:: @ 8DDEB58
-	.incbin "graphics/pokemon/back_pics/sceptile_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sceptile/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sceptile_shiny_palette:: @ 8DDEF54
-	.incbin "graphics/pokemon/palettes/sceptile_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sceptile/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sceptile_icon:: @ 8DDEF7C
-	.incbin "graphics/pokemon/icons/sceptile_icon.4bpp"
+	.incbin "graphics/pokemon/sceptile/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sceptile_footprint:: @ 8DDF37C
-	.incbin "graphics/pokemon/footprints/sceptile_footprint.1bpp"
+	.incbin "graphics/pokemon/sceptile/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_torchic_still_front_pic:: @ 8DDF39C
-	.incbin "graphics/pokemon/front_pics/torchic_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/torchic/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_torchic_palette:: @ 8DDF638
-	.incbin "graphics/pokemon/palettes/torchic_palette.gbapal.lz"
+	.incbin "graphics/pokemon/torchic/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_torchic_back_pic:: @ 8DDF660
-	.incbin "graphics/pokemon/back_pics/torchic_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/torchic/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_torchic_shiny_palette:: @ 8DDF938
-	.incbin "graphics/pokemon/palettes/torchic_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/torchic/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_torchic_icon:: @ 8DDF960
-	.incbin "graphics/pokemon/icons/torchic_icon.4bpp"
+	.incbin "graphics/pokemon/torchic/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_torchic_footprint:: @ 8DDFD60
-	.incbin "graphics/pokemon/footprints/torchic_footprint.1bpp"
+	.incbin "graphics/pokemon/torchic/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_combusken_still_front_pic:: @ 8DDFD80
-	.incbin "graphics/pokemon/front_pics/combusken_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/combusken/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_combusken_palette:: @ 8DE016C
-	.incbin "graphics/pokemon/palettes/combusken_palette.gbapal.lz"
+	.incbin "graphics/pokemon/combusken/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_combusken_back_pic:: @ 8DE0194
-	.incbin "graphics/pokemon/back_pics/combusken_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/combusken/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_combusken_shiny_palette:: @ 8DE0564
-	.incbin "graphics/pokemon/palettes/combusken_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/combusken/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_combusken_icon:: @ 8DE058C
-	.incbin "graphics/pokemon/icons/combusken_icon.4bpp"
+	.incbin "graphics/pokemon/combusken/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_combusken_footprint:: @ 8DE098C
-	.incbin "graphics/pokemon/footprints/combusken_footprint.1bpp"
+	.incbin "graphics/pokemon/combusken/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_blaziken_still_front_pic:: @ 8DE09AC
-	.incbin "graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blaziken/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blaziken_palette:: @ 8DE0E24
-	.incbin "graphics/pokemon/palettes/blaziken_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blaziken/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_blaziken_back_pic:: @ 8DE0E4C
-	.incbin "graphics/pokemon/back_pics/blaziken_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blaziken/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blaziken_shiny_palette:: @ 8DE1228
-	.incbin "graphics/pokemon/palettes/blaziken_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blaziken/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_blaziken_icon:: @ 8DE1250
-	.incbin "graphics/pokemon/icons/blaziken_icon.4bpp"
+	.incbin "graphics/pokemon/blaziken/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_blaziken_footprint:: @ 8DE1650
-	.incbin "graphics/pokemon/footprints/blaziken_footprint.1bpp"
+	.incbin "graphics/pokemon/blaziken/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mudkip_still_front_pic:: @ 8DE1670
-	.incbin "graphics/pokemon/front_pics/mudkip_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mudkip/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mudkip_palette:: @ 8DE1928
-	.incbin "graphics/pokemon/palettes/mudkip_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mudkip/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mudkip_back_pic:: @ 8DE1950
-	.incbin "graphics/pokemon/back_pics/mudkip_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mudkip/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mudkip_shiny_palette:: @ 8DE1C30
-	.incbin "graphics/pokemon/palettes/mudkip_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mudkip/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mudkip_icon:: @ 8DE1C58
-	.incbin "graphics/pokemon/icons/mudkip_icon.4bpp"
+	.incbin "graphics/pokemon/mudkip/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mudkip_footprint:: @ 8DE2058
-	.incbin "graphics/pokemon/footprints/mudkip_footprint.1bpp"
+	.incbin "graphics/pokemon/mudkip/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_marshtomp_still_front_pic:: @ 8DE2078
-	.incbin "graphics/pokemon/front_pics/marshtomp_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marshtomp/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marshtomp_palette:: @ 8DE2400
-	.incbin "graphics/pokemon/palettes/marshtomp_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marshtomp/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_marshtomp_back_pic:: @ 8DE2428
-	.incbin "graphics/pokemon/back_pics/marshtomp_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marshtomp/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marshtomp_shiny_palette:: @ 8DE27D8
-	.incbin "graphics/pokemon/palettes/marshtomp_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marshtomp/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_marshtomp_icon:: @ 8DE2800
-	.incbin "graphics/pokemon/icons/marshtomp_icon.4bpp"
+	.incbin "graphics/pokemon/marshtomp/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_marshtomp_footprint:: @ 8DE2C00
-	.incbin "graphics/pokemon/footprints/marshtomp_footprint.1bpp"
+	.incbin "graphics/pokemon/marshtomp/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swampert_still_front_pic:: @ 8DE2C20
-	.incbin "graphics/pokemon/front_pics/swampert_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swampert/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swampert_palette:: @ 8DE319C
-	.incbin "graphics/pokemon/palettes/swampert_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swampert/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swampert_back_pic:: @ 8DE31C4
-	.incbin "graphics/pokemon/back_pics/swampert_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swampert/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swampert_shiny_palette:: @ 8DE3578
-	.incbin "graphics/pokemon/palettes/swampert_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swampert/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swampert_icon:: @ 8DE35A0
-	.incbin "graphics/pokemon/icons/swampert_icon.4bpp"
+	.incbin "graphics/pokemon/swampert/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swampert_footprint:: @ 8DE39A0
-	.incbin "graphics/pokemon/footprints/swampert_footprint.1bpp"
+	.incbin "graphics/pokemon/swampert/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_poochyena_still_front_pic:: @ 8DE39C0
-	.incbin "graphics/pokemon/front_pics/poochyena_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poochyena/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poochyena_palette:: @ 8DE3C88
-	.incbin "graphics/pokemon/palettes/poochyena_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poochyena/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_poochyena_back_pic:: @ 8DE3CB0
-	.incbin "graphics/pokemon/back_pics/poochyena_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poochyena/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poochyena_shiny_palette:: @ 8DE3FDC
-	.incbin "graphics/pokemon/palettes/poochyena_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poochyena/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_poochyena_icon:: @ 8DE4004
-	.incbin "graphics/pokemon/icons/poochyena_icon.4bpp"
+	.incbin "graphics/pokemon/poochyena/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_poochyena_footprint:: @ 8DE4404
-	.incbin "graphics/pokemon/footprints/poochyena_footprint.1bpp"
+	.incbin "graphics/pokemon/poochyena/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mightyena_still_front_pic:: @ 8DE4424
-	.incbin "graphics/pokemon/front_pics/mightyena_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mightyena/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mightyena_palette:: @ 8DE485C
-	.incbin "graphics/pokemon/palettes/mightyena_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mightyena/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mightyena_back_pic:: @ 8DE4884
-	.incbin "graphics/pokemon/back_pics/mightyena_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mightyena/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mightyena_shiny_palette:: @ 8DE4BFC
-	.incbin "graphics/pokemon/palettes/mightyena_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mightyena/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mightyena_icon:: @ 8DE4C24
-	.incbin "graphics/pokemon/icons/mightyena_icon.4bpp"
+	.incbin "graphics/pokemon/mightyena/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mightyena_footprint:: @ 8DE5024
-	.incbin "graphics/pokemon/footprints/mightyena_footprint.1bpp"
+	.incbin "graphics/pokemon/mightyena/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_zigzagoon_still_front_pic:: @ 8DE5044
-	.incbin "graphics/pokemon/front_pics/zigzagoon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zigzagoon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zigzagoon_palette:: @ 8DE5414
-	.incbin "graphics/pokemon/palettes/zigzagoon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zigzagoon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_zigzagoon_back_pic:: @ 8DE543C
-	.incbin "graphics/pokemon/back_pics/zigzagoon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zigzagoon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zigzagoon_shiny_palette:: @ 8DE577C
-	.incbin "graphics/pokemon/palettes/zigzagoon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zigzagoon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_zigzagoon_icon:: @ 8DE57A4
-	.incbin "graphics/pokemon/icons/zigzagoon_icon.4bpp"
+	.incbin "graphics/pokemon/zigzagoon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_zigzagoon_footprint:: @ 8DE5BA4
-	.incbin "graphics/pokemon/footprints/zigzagoon_footprint.1bpp"
+	.incbin "graphics/pokemon/zigzagoon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_linoone_still_front_pic:: @ 8DE5BC4
-	.incbin "graphics/pokemon/front_pics/linoone_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/linoone/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_linoone_palette:: @ 8DE5F34
-	.incbin "graphics/pokemon/palettes/linoone_palette.gbapal.lz"
+	.incbin "graphics/pokemon/linoone/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_linoone_back_pic:: @ 8DE5F5C
-	.incbin "graphics/pokemon/back_pics/linoone_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/linoone/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_linoone_shiny_palette:: @ 8DE6230
-	.incbin "graphics/pokemon/palettes/linoone_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/linoone/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_linoone_icon:: @ 8DE6258
-	.incbin "graphics/pokemon/icons/linoone_icon.4bpp"
+	.incbin "graphics/pokemon/linoone/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_linoone_footprint:: @ 8DE6658
-	.incbin "graphics/pokemon/footprints/linoone_footprint.1bpp"
+	.incbin "graphics/pokemon/linoone/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wurmple_still_front_pic:: @ 8DE6678
-	.incbin "graphics/pokemon/front_pics/wurmple_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wurmple/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wurmple_palette:: @ 8DE6900
-	.incbin "graphics/pokemon/palettes/wurmple_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wurmple/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wurmple_back_pic:: @ 8DE6928
-	.incbin "graphics/pokemon/back_pics/wurmple_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wurmple/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wurmple_shiny_palette:: @ 8DE6B74
-	.incbin "graphics/pokemon/palettes/wurmple_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wurmple/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wurmple_icon:: @ 8DE6B9C
-	.incbin "graphics/pokemon/icons/wurmple_icon.4bpp"
+	.incbin "graphics/pokemon/wurmple/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wurmple_footprint:: @ 8DE6F9C
-	.incbin "graphics/pokemon/footprints/wurmple_footprint.1bpp"
+	.incbin "graphics/pokemon/wurmple/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_silcoon_still_front_pic:: @ 8DE6FBC
-	.incbin "graphics/pokemon/front_pics/silcoon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/silcoon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_silcoon_palette:: @ 8DE723C
-	.incbin "graphics/pokemon/palettes/silcoon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/silcoon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_silcoon_back_pic:: @ 8DE7264
-	.incbin "graphics/pokemon/back_pics/silcoon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/silcoon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_silcoon_shiny_palette:: @ 8DE7480
-	.incbin "graphics/pokemon/palettes/silcoon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/silcoon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_silcoon_icon:: @ 8DE74A8
-	.incbin "graphics/pokemon/icons/silcoon_icon.4bpp"
+	.incbin "graphics/pokemon/silcoon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_silcoon_footprint:: @ 8DE78A8
-	.incbin "graphics/pokemon/footprints/silcoon_footprint.1bpp"
+	.incbin "graphics/pokemon/silcoon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_beautifly_still_front_pic:: @ 8DE78C8
-	.incbin "graphics/pokemon/front_pics/beautifly_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beautifly/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beautifly_palette:: @ 8DE7C20
-	.incbin "graphics/pokemon/palettes/beautifly_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beautifly/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_beautifly_back_pic:: @ 8DE7C48
-	.incbin "graphics/pokemon/back_pics/beautifly_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beautifly/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beautifly_shiny_palette:: @ 8DE7FF8
-	.incbin "graphics/pokemon/palettes/beautifly_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beautifly/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_beautifly_icon:: @ 8DE8020
-	.incbin "graphics/pokemon/icons/beautifly_icon.4bpp"
+	.incbin "graphics/pokemon/beautifly/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_beautifly_footprint:: @ 8DE8420
-	.incbin "graphics/pokemon/footprints/beautifly_footprint.1bpp"
+	.incbin "graphics/pokemon/beautifly/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cascoon_still_front_pic:: @ 8DE8440
-	.incbin "graphics/pokemon/front_pics/cascoon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cascoon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cascoon_palette:: @ 8DE86AC
-	.incbin "graphics/pokemon/palettes/cascoon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cascoon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cascoon_back_pic:: @ 8DE86D4
-	.incbin "graphics/pokemon/back_pics/cascoon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cascoon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cascoon_shiny_palette:: @ 8DE88E4
-	.incbin "graphics/pokemon/palettes/cascoon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cascoon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cascoon_icon:: @ 8DE890C
-	.incbin "graphics/pokemon/icons/cascoon_icon.4bpp"
+	.incbin "graphics/pokemon/cascoon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cascoon_footprint:: @ 8DE8D0C
-	.incbin "graphics/pokemon/footprints/cascoon_footprint.1bpp"
+	.incbin "graphics/pokemon/cascoon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dustox_still_front_pic:: @ 8DE8D2C
-	.incbin "graphics/pokemon/front_pics/dustox_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dustox/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dustox_palette:: @ 8DE9094
-	.incbin "graphics/pokemon/palettes/dustox_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dustox/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dustox_back_pic:: @ 8DE90BC
-	.incbin "graphics/pokemon/back_pics/dustox_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dustox/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dustox_shiny_palette:: @ 8DE9314
-	.incbin "graphics/pokemon/palettes/dustox_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dustox/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dustox_icon:: @ 8DE933C
-	.incbin "graphics/pokemon/icons/dustox_icon.4bpp"
+	.incbin "graphics/pokemon/dustox/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dustox_footprint:: @ 8DE973C
-	.incbin "graphics/pokemon/footprints/dustox_footprint.1bpp"
+	.incbin "graphics/pokemon/dustox/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lotad_still_front_pic:: @ 8DE975C
-	.incbin "graphics/pokemon/front_pics/lotad_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lotad/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lotad_palette:: @ 8DE99BC
-	.incbin "graphics/pokemon/palettes/lotad_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lotad/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lotad_back_pic:: @ 8DE99E4
-	.incbin "graphics/pokemon/back_pics/lotad_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lotad/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lotad_shiny_palette:: @ 8DE9CCC
-	.incbin "graphics/pokemon/palettes/lotad_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lotad/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lotad_icon:: @ 8DE9CF4
-	.incbin "graphics/pokemon/icons/lotad_icon.4bpp"
+	.incbin "graphics/pokemon/lotad/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lotad_footprint:: @ 8DEA0F4
-	.incbin "graphics/pokemon/footprints/lotad_footprint.1bpp"
+	.incbin "graphics/pokemon/lotad/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lombre_still_front_pic:: @ 8DEA114
-	.incbin "graphics/pokemon/front_pics/lombre_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lombre/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lombre_palette:: @ 8DEA42C
-	.incbin "graphics/pokemon/palettes/lombre_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lombre/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lombre_back_pic:: @ 8DEA454
-	.incbin "graphics/pokemon/back_pics/lombre_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lombre/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lombre_shiny_palette:: @ 8DEA750
-	.incbin "graphics/pokemon/palettes/lombre_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lombre/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lombre_icon:: @ 8DEA778
-	.incbin "graphics/pokemon/icons/lombre_icon.4bpp"
+	.incbin "graphics/pokemon/lombre/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lombre_footprint:: @ 8DEAB78
-	.incbin "graphics/pokemon/footprints/lombre_footprint.1bpp"
+	.incbin "graphics/pokemon/lombre/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ludicolo_still_front_pic:: @ 8DEAB98
-	.incbin "graphics/pokemon/front_pics/ludicolo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ludicolo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ludicolo_palette:: @ 8DEB07C
-	.incbin "graphics/pokemon/palettes/ludicolo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ludicolo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ludicolo_back_pic:: @ 8DEB0A4
-	.incbin "graphics/pokemon/back_pics/ludicolo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ludicolo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ludicolo_shiny_palette:: @ 8DEB3A0
-	.incbin "graphics/pokemon/palettes/ludicolo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ludicolo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ludicolo_icon:: @ 8DEB3C8
-	.incbin "graphics/pokemon/icons/ludicolo_icon.4bpp"
+	.incbin "graphics/pokemon/ludicolo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ludicolo_footprint:: @ 8DEB7C8
-	.incbin "graphics/pokemon/footprints/ludicolo_footprint.1bpp"
+	.incbin "graphics/pokemon/ludicolo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seedot_still_front_pic:: @ 8DEB7E8
-	.incbin "graphics/pokemon/front_pics/seedot_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seedot/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seedot_palette:: @ 8DEBA7C
-	.incbin "graphics/pokemon/palettes/seedot_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seedot/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seedot_back_pic:: @ 8DEBAA4
-	.incbin "graphics/pokemon/back_pics/seedot_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seedot/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seedot_shiny_palette:: @ 8DEBD84
-	.incbin "graphics/pokemon/palettes/seedot_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seedot/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seedot_icon:: @ 8DEBDAC
-	.incbin "graphics/pokemon/icons/seedot_icon.4bpp"
+	.incbin "graphics/pokemon/seedot/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seedot_footprint:: @ 8DEC1AC
-	.incbin "graphics/pokemon/footprints/seedot_footprint.1bpp"
+	.incbin "graphics/pokemon/seedot/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nuzleaf_still_front_pic:: @ 8DEC1CC
-	.incbin "graphics/pokemon/front_pics/nuzleaf_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nuzleaf/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nuzleaf_palette:: @ 8DEC4B8
-	.incbin "graphics/pokemon/palettes/nuzleaf_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nuzleaf/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nuzleaf_back_pic:: @ 8DEC4E0
-	.incbin "graphics/pokemon/back_pics/nuzleaf_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nuzleaf/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nuzleaf_shiny_palette:: @ 8DEC7A8
-	.incbin "graphics/pokemon/palettes/nuzleaf_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nuzleaf/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nuzleaf_icon:: @ 8DEC7D0
-	.incbin "graphics/pokemon/icons/nuzleaf_icon.4bpp"
+	.incbin "graphics/pokemon/nuzleaf/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nuzleaf_footprint:: @ 8DECBD0
-	.incbin "graphics/pokemon/footprints/nuzleaf_footprint.1bpp"
+	.incbin "graphics/pokemon/nuzleaf/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shiftry_still_front_pic:: @ 8DECBF0
-	.incbin "graphics/pokemon/front_pics/shiftry_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shiftry/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shiftry_palette:: @ 8DED0AC
-	.incbin "graphics/pokemon/palettes/shiftry_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shiftry/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shiftry_back_pic:: @ 8DED0D4
-	.incbin "graphics/pokemon/back_pics/shiftry_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shiftry/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shiftry_shiny_palette:: @ 8DED398
-	.incbin "graphics/pokemon/palettes/shiftry_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shiftry/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shiftry_icon:: @ 8DED3C0
-	.incbin "graphics/pokemon/icons/shiftry_icon.4bpp"
+	.incbin "graphics/pokemon/shiftry/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shiftry_footprint:: @ 8DED7C0
-	.incbin "graphics/pokemon/footprints/shiftry_footprint.1bpp"
+	.incbin "graphics/pokemon/shiftry/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nincada_still_front_pic:: @ 8DED7E0
-	.incbin "graphics/pokemon/front_pics/nincada_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nincada/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nincada_palette:: @ 8DEDA80
-	.incbin "graphics/pokemon/palettes/nincada_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nincada/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nincada_back_pic:: @ 8DEDAA8
-	.incbin "graphics/pokemon/back_pics/nincada_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nincada/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nincada_shiny_palette:: @ 8DEDD60
-	.incbin "graphics/pokemon/palettes/nincada_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nincada/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nincada_icon:: @ 8DEDD88
-	.incbin "graphics/pokemon/icons/nincada_icon.4bpp"
+	.incbin "graphics/pokemon/nincada/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nincada_footprint:: @ 8DEE188
-	.incbin "graphics/pokemon/footprints/nincada_footprint.1bpp"
+	.incbin "graphics/pokemon/nincada/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ninjask_still_front_pic:: @ 8DEE1A8
-	.incbin "graphics/pokemon/front_pics/ninjask_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ninjask/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ninjask_palette:: @ 8DEE518
-	.incbin "graphics/pokemon/palettes/ninjask_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ninjask/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ninjask_back_pic:: @ 8DEE540
-	.incbin "graphics/pokemon/back_pics/ninjask_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ninjask/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ninjask_shiny_palette:: @ 8DEE90C
-	.incbin "graphics/pokemon/palettes/ninjask_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ninjask/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ninjask_icon:: @ 8DEE934
-	.incbin "graphics/pokemon/icons/ninjask_icon.4bpp"
+	.incbin "graphics/pokemon/ninjask/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ninjask_footprint:: @ 8DEED34
-	.incbin "graphics/pokemon/footprints/ninjask_footprint.1bpp"
+	.incbin "graphics/pokemon/ninjask/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shedinja_still_front_pic:: @ 8DEED54
-	.incbin "graphics/pokemon/front_pics/shedinja_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shedinja/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shedinja_palette:: @ 8DEF074
-	.incbin "graphics/pokemon/palettes/shedinja_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shedinja/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shedinja_back_pic:: @ 8DEF09C
-	.incbin "graphics/pokemon/back_pics/shedinja_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shedinja/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shedinja_shiny_palette:: @ 8DEF43C
-	.incbin "graphics/pokemon/palettes/shedinja_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shedinja/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shedinja_icon:: @ 8DEF464
-	.incbin "graphics/pokemon/icons/shedinja_icon.4bpp"
+	.incbin "graphics/pokemon/shedinja/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shedinja_footprint:: @ 8DEF864
-	.incbin "graphics/pokemon/footprints/shedinja_footprint.1bpp"
+	.incbin "graphics/pokemon/shedinja/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_taillow_still_front_pic:: @ 8DEF884
-	.incbin "graphics/pokemon/front_pics/taillow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/taillow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_taillow_palette:: @ 8DEFADC
-	.incbin "graphics/pokemon/palettes/taillow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/taillow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_taillow_back_pic:: @ 8DEFB04
-	.incbin "graphics/pokemon/back_pics/taillow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/taillow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_taillow_shiny_palette:: @ 8DEFD24
-	.incbin "graphics/pokemon/palettes/taillow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/taillow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_taillow_icon:: @ 8DEFD4C
-	.incbin "graphics/pokemon/icons/taillow_icon.4bpp"
+	.incbin "graphics/pokemon/taillow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_taillow_footprint:: @ 8DF014C
-	.incbin "graphics/pokemon/footprints/taillow_footprint.1bpp"
+	.incbin "graphics/pokemon/taillow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swellow_still_front_pic:: @ 8DF016C
-	.incbin "graphics/pokemon/front_pics/swellow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swellow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swellow_palette:: @ 8DF0530
-	.incbin "graphics/pokemon/palettes/swellow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swellow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swellow_back_pic:: @ 8DF0558
-	.incbin "graphics/pokemon/back_pics/swellow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swellow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swellow_shiny_palette:: @ 8DF0890
-	.incbin "graphics/pokemon/palettes/swellow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swellow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swellow_icon:: @ 8DF08B8
-	.incbin "graphics/pokemon/icons/swellow_icon.4bpp"
+	.incbin "graphics/pokemon/swellow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swellow_footprint:: @ 8DF0CB8
-	.incbin "graphics/pokemon/footprints/swellow_footprint.1bpp"
+	.incbin "graphics/pokemon/swellow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shroomish_still_front_pic:: @ 8DF0CD8
-	.incbin "graphics/pokemon/front_pics/shroomish_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shroomish/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shroomish_palette:: @ 8DF0F40
-	.incbin "graphics/pokemon/palettes/shroomish_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shroomish/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shroomish_back_pic:: @ 8DF0F68
-	.incbin "graphics/pokemon/back_pics/shroomish_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shroomish/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shroomish_shiny_palette:: @ 8DF1248
-	.incbin "graphics/pokemon/palettes/shroomish_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shroomish/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shroomish_icon:: @ 8DF1270
-	.incbin "graphics/pokemon/icons/shroomish_icon.4bpp"
+	.incbin "graphics/pokemon/shroomish/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shroomish_footprint:: @ 8DF1670
-	.incbin "graphics/pokemon/footprints/shroomish_footprint.1bpp"
+	.incbin "graphics/pokemon/shroomish/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_breloom_still_front_pic:: @ 8DF1690
-	.incbin "graphics/pokemon/front_pics/breloom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/breloom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_breloom_palette:: @ 8DF1A78
-	.incbin "graphics/pokemon/palettes/breloom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/breloom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_breloom_back_pic:: @ 8DF1AA0
-	.incbin "graphics/pokemon/back_pics/breloom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/breloom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_breloom_shiny_palette:: @ 8DF1E80
-	.incbin "graphics/pokemon/palettes/breloom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/breloom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_breloom_icon:: @ 8DF1EA8
-	.incbin "graphics/pokemon/icons/breloom_icon.4bpp"
+	.incbin "graphics/pokemon/breloom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_breloom_footprint:: @ 8DF22A8
-	.incbin "graphics/pokemon/footprints/breloom_footprint.1bpp"
+	.incbin "graphics/pokemon/breloom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spinda_still_front_pic:: @ 8DF22C8
-	.incbin "graphics/pokemon/front_pics/spinda_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spinda/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spinda_palette:: @ 8DF25C8
-	.incbin "graphics/pokemon/palettes/spinda_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spinda/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spinda_back_pic:: @ 8DF25F0
-	.incbin "graphics/pokemon/back_pics/spinda_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spinda/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spinda_shiny_palette:: @ 8DF292C
-	.incbin "graphics/pokemon/palettes/spinda_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spinda/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spinda_icon:: @ 8DF2954
-	.incbin "graphics/pokemon/icons/spinda_icon.4bpp"
+	.incbin "graphics/pokemon/spinda/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spinda_footprint:: @ 8DF2D54
-	.incbin "graphics/pokemon/footprints/spinda_footprint.1bpp"
+	.incbin "graphics/pokemon/spinda/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wingull_still_front_pic:: @ 8DF2D74
-	.incbin "graphics/pokemon/front_pics/wingull_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wingull/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wingull_palette:: @ 8DF2FB0
-	.incbin "graphics/pokemon/palettes/wingull_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wingull/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wingull_back_pic:: @ 8DF2FD8
-	.incbin "graphics/pokemon/back_pics/wingull_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wingull/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wingull_shiny_palette:: @ 8DF3328
-	.incbin "graphics/pokemon/palettes/wingull_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wingull/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wingull_icon:: @ 8DF3350
-	.incbin "graphics/pokemon/icons/wingull_icon.4bpp"
+	.incbin "graphics/pokemon/wingull/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wingull_footprint:: @ 8DF3750
-	.incbin "graphics/pokemon/footprints/wingull_footprint.1bpp"
+	.incbin "graphics/pokemon/wingull/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pelipper_still_front_pic:: @ 8DF3770
-	.incbin "graphics/pokemon/front_pics/pelipper_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pelipper/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pelipper_palette:: @ 8DF3B08
-	.incbin "graphics/pokemon/palettes/pelipper_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pelipper/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pelipper_back_pic:: @ 8DF3B30
-	.incbin "graphics/pokemon/back_pics/pelipper_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pelipper/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pelipper_shiny_palette:: @ 8DF3EB0
-	.incbin "graphics/pokemon/palettes/pelipper_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pelipper/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pelipper_icon:: @ 8DF3ED8
-	.incbin "graphics/pokemon/icons/pelipper_icon.4bpp"
+	.incbin "graphics/pokemon/pelipper/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pelipper_footprint:: @ 8DF42D8
-	.incbin "graphics/pokemon/footprints/pelipper_footprint.1bpp"
+	.incbin "graphics/pokemon/pelipper/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_surskit_still_front_pic:: @ 8DF42F8
-	.incbin "graphics/pokemon/front_pics/surskit_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/surskit/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_surskit_palette:: @ 8DF4504
-	.incbin "graphics/pokemon/palettes/surskit_palette.gbapal.lz"
+	.incbin "graphics/pokemon/surskit/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_surskit_back_pic:: @ 8DF452C
-	.incbin "graphics/pokemon/back_pics/surskit_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/surskit/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_surskit_shiny_palette:: @ 8DF4764
-	.incbin "graphics/pokemon/palettes/surskit_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/surskit/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_surskit_icon:: @ 8DF478C
-	.incbin "graphics/pokemon/icons/surskit_icon.4bpp"
+	.incbin "graphics/pokemon/surskit/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_surskit_footprint:: @ 8DF4B8C
-	.incbin "graphics/pokemon/footprints/surskit_footprint.1bpp"
+	.incbin "graphics/pokemon/surskit/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_masquerain_still_front_pic:: @ 8DF4BAC
-	.incbin "graphics/pokemon/front_pics/masquerain_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/masquerain/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_masquerain_palette:: @ 8DF4F48
-	.incbin "graphics/pokemon/palettes/masquerain_palette.gbapal.lz"
+	.incbin "graphics/pokemon/masquerain/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_masquerain_back_pic:: @ 8DF4F70
-	.incbin "graphics/pokemon/back_pics/masquerain_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/masquerain/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_masquerain_shiny_palette:: @ 8DF52C8
-	.incbin "graphics/pokemon/palettes/masquerain_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/masquerain/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_masquerain_icon:: @ 8DF52F0
-	.incbin "graphics/pokemon/icons/masquerain_icon.4bpp"
+	.incbin "graphics/pokemon/masquerain/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_masquerain_footprint:: @ 8DF56F0
-	.incbin "graphics/pokemon/footprints/masquerain_footprint.1bpp"
+	.incbin "graphics/pokemon/masquerain/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wailmer_still_front_pic:: @ 8DF5710
-	.incbin "graphics/pokemon/front_pics/wailmer_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wailmer/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wailmer_palette:: @ 8DF59F0
-	.incbin "graphics/pokemon/palettes/wailmer_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wailmer/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wailmer_back_pic:: @ 8DF5A18
-	.incbin "graphics/pokemon/back_pics/wailmer_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wailmer/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wailmer_shiny_palette:: @ 8DF5BFC
-	.incbin "graphics/pokemon/palettes/wailmer_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wailmer/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wailmer_icon:: @ 8DF5C24
-	.incbin "graphics/pokemon/icons/wailmer_icon.4bpp"
+	.incbin "graphics/pokemon/wailmer/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wailmer_footprint:: @ 8DF6024
-	.incbin "graphics/pokemon/footprints/wailmer_footprint.1bpp"
+	.incbin "graphics/pokemon/wailmer/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wailord_still_front_pic:: @ 8DF6044
-	.incbin "graphics/pokemon/front_pics/wailord_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wailord/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wailord_palette:: @ 8DF6408
-	.incbin "graphics/pokemon/palettes/wailord_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wailord/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wailord_back_pic:: @ 8DF6430
-	.incbin "graphics/pokemon/back_pics/wailord_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wailord/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wailord_shiny_palette:: @ 8DF6648
-	.incbin "graphics/pokemon/palettes/wailord_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wailord/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wailord_icon:: @ 8DF6670
-	.incbin "graphics/pokemon/icons/wailord_icon.4bpp"
+	.incbin "graphics/pokemon/wailord/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wailord_footprint:: @ 8DF6A70
-	.incbin "graphics/pokemon/footprints/wailord_footprint.1bpp"
+	.incbin "graphics/pokemon/wailord/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_skitty_still_front_pic:: @ 8DF6A90
-	.incbin "graphics/pokemon/front_pics/skitty_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skitty/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skitty_palette:: @ 8DF6D90
-	.incbin "graphics/pokemon/palettes/skitty_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skitty/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_skitty_back_pic:: @ 8DF6DB8
-	.incbin "graphics/pokemon/back_pics/skitty_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skitty/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skitty_shiny_palette:: @ 8DF7100
-	.incbin "graphics/pokemon/palettes/skitty_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skitty/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_skitty_icon:: @ 8DF7128
-	.incbin "graphics/pokemon/icons/skitty_icon.4bpp"
+	.incbin "graphics/pokemon/skitty/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_skitty_footprint:: @ 8DF7528
-	.incbin "graphics/pokemon/footprints/skitty_footprint.1bpp"
+	.incbin "graphics/pokemon/skitty/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_delcatty_still_front_pic:: @ 8DF7548
-	.incbin "graphics/pokemon/front_pics/delcatty_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/delcatty/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_delcatty_palette:: @ 8DF78D4
-	.incbin "graphics/pokemon/palettes/delcatty_palette.gbapal.lz"
+	.incbin "graphics/pokemon/delcatty/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_delcatty_back_pic:: @ 8DF78FC
-	.incbin "graphics/pokemon/back_pics/delcatty_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/delcatty/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_delcatty_shiny_palette:: @ 8DF7C98
-	.incbin "graphics/pokemon/palettes/delcatty_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/delcatty/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_delcatty_icon:: @ 8DF7CC0
-	.incbin "graphics/pokemon/icons/delcatty_icon.4bpp"
+	.incbin "graphics/pokemon/delcatty/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_delcatty_footprint:: @ 8DF80C0
-	.incbin "graphics/pokemon/footprints/delcatty_footprint.1bpp"
+	.incbin "graphics/pokemon/delcatty/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kecleon_still_front_pic:: @ 8DF80E0
-	.incbin "graphics/pokemon/front_pics/kecleon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kecleon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kecleon_palette:: @ 8DF8460
-	.incbin "graphics/pokemon/palettes/kecleon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kecleon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kecleon_back_pic:: @ 8DF8488
-	.incbin "graphics/pokemon/back_pics/kecleon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kecleon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kecleon_shiny_palette:: @ 8DF8860
-	.incbin "graphics/pokemon/palettes/kecleon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kecleon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kecleon_icon:: @ 8DF8888
-	.incbin "graphics/pokemon/icons/kecleon_icon.4bpp"
+	.incbin "graphics/pokemon/kecleon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kecleon_footprint:: @ 8DF8C88
-	.incbin "graphics/pokemon/footprints/kecleon_footprint.1bpp"
+	.incbin "graphics/pokemon/kecleon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_baltoy_still_front_pic:: @ 8DF8CA8
-	.incbin "graphics/pokemon/front_pics/baltoy_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/baltoy/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_baltoy_palette:: @ 8DF8ECC
-	.incbin "graphics/pokemon/palettes/baltoy_palette.gbapal.lz"
+	.incbin "graphics/pokemon/baltoy/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_baltoy_back_pic:: @ 8DF8EEC
-	.incbin "graphics/pokemon/back_pics/baltoy_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/baltoy/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_baltoy_shiny_palette:: @ 8DF9194
-	.incbin "graphics/pokemon/palettes/baltoy_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/baltoy/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_baltoy_icon:: @ 8DF91B4
-	.incbin "graphics/pokemon/icons/baltoy_icon.4bpp"
+	.incbin "graphics/pokemon/baltoy/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_baltoy_footprint:: @ 8DF95B4
-	.incbin "graphics/pokemon/footprints/baltoy_footprint.1bpp"
+	.incbin "graphics/pokemon/baltoy/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_claydol_still_front_pic:: @ 8DF95D4
-	.incbin "graphics/pokemon/front_pics/claydol_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/claydol/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_claydol_palette:: @ 8DF998C
-	.incbin "graphics/pokemon/palettes/claydol_palette.gbapal.lz"
+	.incbin "graphics/pokemon/claydol/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_claydol_back_pic:: @ 8DF99B4
-	.incbin "graphics/pokemon/back_pics/claydol_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/claydol/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_claydol_shiny_palette:: @ 8DF9D88
-	.incbin "graphics/pokemon/palettes/claydol_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/claydol/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_claydol_icon:: @ 8DF9DB0
-	.incbin "graphics/pokemon/icons/claydol_icon.4bpp"
+	.incbin "graphics/pokemon/claydol/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_claydol_footprint:: @ 8DFA1B0
-	.incbin "graphics/pokemon/footprints/claydol_footprint.1bpp"
+	.incbin "graphics/pokemon/claydol/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nosepass_still_front_pic:: @ 8DFA1D0
-	.incbin "graphics/pokemon/front_pics/nosepass_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nosepass/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nosepass_palette:: @ 8DFA49C
-	.incbin "graphics/pokemon/palettes/nosepass_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nosepass/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nosepass_back_pic:: @ 8DFA4C4
-	.incbin "graphics/pokemon/back_pics/nosepass_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nosepass/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nosepass_shiny_palette:: @ 8DFA764
-	.incbin "graphics/pokemon/palettes/nosepass_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nosepass/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nosepass_icon:: @ 8DFA78C
-	.incbin "graphics/pokemon/icons/nosepass_icon.4bpp"
+	.incbin "graphics/pokemon/nosepass/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nosepass_footprint:: @ 8DFAB8C
-	.incbin "graphics/pokemon/footprints/nosepass_footprint.1bpp"
+	.incbin "graphics/pokemon/nosepass/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_torkoal_still_front_pic:: @ 8DFABAC
-	.incbin "graphics/pokemon/front_pics/torkoal_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/torkoal/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_torkoal_palette:: @ 8DFB058
-	.incbin "graphics/pokemon/palettes/torkoal_palette.gbapal.lz"
+	.incbin "graphics/pokemon/torkoal/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_torkoal_back_pic:: @ 8DFB080
-	.incbin "graphics/pokemon/back_pics/torkoal_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/torkoal/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_torkoal_shiny_palette:: @ 8DFB348
-	.incbin "graphics/pokemon/palettes/torkoal_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/torkoal/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_torkoal_icon:: @ 8DFB370
-	.incbin "graphics/pokemon/icons/torkoal_icon.4bpp"
+	.incbin "graphics/pokemon/torkoal/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_torkoal_footprint:: @ 8DFB770
-	.incbin "graphics/pokemon/footprints/torkoal_footprint.1bpp"
+	.incbin "graphics/pokemon/torkoal/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sableye_still_front_pic:: @ 8DFB790
-	.incbin "graphics/pokemon/front_pics/sableye_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sableye/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sableye_palette:: @ 8DFBA64
-	.incbin "graphics/pokemon/palettes/sableye_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sableye/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sableye_back_pic:: @ 8DFBA8C
-	.incbin "graphics/pokemon/back_pics/sableye_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sableye/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sableye_shiny_palette:: @ 8DFBDB4
-	.incbin "graphics/pokemon/palettes/sableye_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sableye/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sableye_icon:: @ 8DFBDDC
-	.incbin "graphics/pokemon/icons/sableye_icon.4bpp"
+	.incbin "graphics/pokemon/sableye/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sableye_footprint:: @ 8DFC1DC
-	.incbin "graphics/pokemon/footprints/sableye_footprint.1bpp"
+	.incbin "graphics/pokemon/sableye/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_barboach_still_front_pic:: @ 8DFC1FC
-	.incbin "graphics/pokemon/front_pics/barboach_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/barboach/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_barboach_palette:: @ 8DFC48C
-	.incbin "graphics/pokemon/palettes/barboach_palette.gbapal.lz"
+	.incbin "graphics/pokemon/barboach/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_barboach_back_pic:: @ 8DFC4B4
-	.incbin "graphics/pokemon/back_pics/barboach_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/barboach/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_barboach_shiny_palette:: @ 8DFC744
-	.incbin "graphics/pokemon/palettes/barboach_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/barboach/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_barboach_icon:: @ 8DFC76C
-	.incbin "graphics/pokemon/icons/barboach_icon.4bpp"
+	.incbin "graphics/pokemon/barboach/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_barboach_footprint:: @ 8DFCB6C
-	.incbin "graphics/pokemon/footprints/barboach_footprint.1bpp"
+	.incbin "graphics/pokemon/barboach/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_whiscash_still_front_pic:: @ 8DFCB8C
-	.incbin "graphics/pokemon/front_pics/whiscash_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/whiscash/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_whiscash_palette:: @ 8DFCF04
-	.incbin "graphics/pokemon/palettes/whiscash_palette.gbapal.lz"
+	.incbin "graphics/pokemon/whiscash/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_whiscash_back_pic:: @ 8DFCF2C
-	.incbin "graphics/pokemon/back_pics/whiscash_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/whiscash/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_whiscash_shiny_palette:: @ 8DFD278
-	.incbin "graphics/pokemon/palettes/whiscash_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/whiscash/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_whiscash_icon:: @ 8DFD2A0
-	.incbin "graphics/pokemon/icons/whiscash_icon.4bpp"
+	.incbin "graphics/pokemon/whiscash/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_whiscash_footprint:: @ 8DFD6A0
-	.incbin "graphics/pokemon/footprints/whiscash_footprint.1bpp"
+	.incbin "graphics/pokemon/whiscash/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_luvdisc_still_front_pic:: @ 8DFD6C0
-	.incbin "graphics/pokemon/front_pics/luvdisc_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/luvdisc/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_luvdisc_palette:: @ 8DFD880
-	.incbin "graphics/pokemon/palettes/luvdisc_palette.gbapal.lz"
+	.incbin "graphics/pokemon/luvdisc/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_luvdisc_back_pic:: @ 8DFD8A4
-	.incbin "graphics/pokemon/back_pics/luvdisc_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/luvdisc/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_luvdisc_shiny_palette:: @ 8DFDA78
-	.incbin "graphics/pokemon/palettes/luvdisc_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/luvdisc/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_luvdisc_icon:: @ 8DFDA9C
-	.incbin "graphics/pokemon/icons/luvdisc_icon.4bpp"
+	.incbin "graphics/pokemon/luvdisc/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_luvdisc_footprint:: @ 8DFDE9C
-	.incbin "graphics/pokemon/footprints/luvdisc_footprint.1bpp"
+	.incbin "graphics/pokemon/luvdisc/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_corphish_still_front_pic:: @ 8DFDEBC
-	.incbin "graphics/pokemon/front_pics/corphish_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/corphish/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_corphish_palette:: @ 8DFE218
-	.incbin "graphics/pokemon/palettes/corphish_palette.gbapal.lz"
+	.incbin "graphics/pokemon/corphish/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_corphish_back_pic:: @ 8DFE240
-	.incbin "graphics/pokemon/back_pics/corphish_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/corphish/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_corphish_shiny_palette:: @ 8DFE55C
-	.incbin "graphics/pokemon/palettes/corphish_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/corphish/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_corphish_icon:: @ 8DFE584
-	.incbin "graphics/pokemon/icons/corphish_icon.4bpp"
+	.incbin "graphics/pokemon/corphish/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_corphish_footprint:: @ 8DFE984
-	.incbin "graphics/pokemon/footprints/corphish_footprint.1bpp"
+	.incbin "graphics/pokemon/corphish/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_crawdaunt_still_front_pic:: @ 8DFE9A4
-	.incbin "graphics/pokemon/front_pics/crawdaunt_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/crawdaunt/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_crawdaunt_palette:: @ 8DFEE34
-	.incbin "graphics/pokemon/palettes/crawdaunt_palette.gbapal.lz"
+	.incbin "graphics/pokemon/crawdaunt/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_crawdaunt_back_pic:: @ 8DFEE5C
-	.incbin "graphics/pokemon/back_pics/crawdaunt_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/crawdaunt/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_crawdaunt_shiny_palette:: @ 8DFF240
-	.incbin "graphics/pokemon/palettes/crawdaunt_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/crawdaunt/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_crawdaunt_icon:: @ 8DFF268
-	.incbin "graphics/pokemon/icons/crawdaunt_icon.4bpp"
+	.incbin "graphics/pokemon/crawdaunt/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_crawdaunt_footprint:: @ 8DFF668
-	.incbin "graphics/pokemon/footprints/crawdaunt_footprint.1bpp"
+	.incbin "graphics/pokemon/crawdaunt/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_feebas_still_front_pic:: @ 8DFF688
-	.incbin "graphics/pokemon/front_pics/feebas_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/feebas/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_feebas_palette:: @ 8DFF914
-	.incbin "graphics/pokemon/palettes/feebas_palette.gbapal.lz"
+	.incbin "graphics/pokemon/feebas/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_feebas_back_pic:: @ 8DFF93C
-	.incbin "graphics/pokemon/back_pics/feebas_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/feebas/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_feebas_shiny_palette:: @ 8DFFC74
-	.incbin "graphics/pokemon/palettes/feebas_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/feebas/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_feebas_icon:: @ 8DFFC9C
-	.incbin "graphics/pokemon/icons/feebas_icon.4bpp"
+	.incbin "graphics/pokemon/feebas/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_feebas_footprint:: @ 8E0009C
-	.incbin "graphics/pokemon/footprints/feebas_footprint.1bpp"
+	.incbin "graphics/pokemon/feebas/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_milotic_still_front_pic:: @ 8E000BC
-	.incbin "graphics/pokemon/front_pics/milotic_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/milotic/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_milotic_palette:: @ 8E0054C
-	.incbin "graphics/pokemon/palettes/milotic_palette.gbapal.lz"
+	.incbin "graphics/pokemon/milotic/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_milotic_back_pic:: @ 8E00574
-	.incbin "graphics/pokemon/back_pics/milotic_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/milotic/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_milotic_shiny_palette:: @ 8E00868
-	.incbin "graphics/pokemon/palettes/milotic_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/milotic/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_milotic_icon:: @ 8E00890
-	.incbin "graphics/pokemon/icons/milotic_icon.4bpp"
+	.incbin "graphics/pokemon/milotic/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_milotic_footprint:: @ 8E00C90
-	.incbin "graphics/pokemon/footprints/milotic_footprint.1bpp"
+	.incbin "graphics/pokemon/milotic/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_carvanha_still_front_pic:: @ 8E00CB0
-	.incbin "graphics/pokemon/front_pics/carvanha_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/carvanha/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_carvanha_palette:: @ 8E00FDC
-	.incbin "graphics/pokemon/palettes/carvanha_palette.gbapal.lz"
+	.incbin "graphics/pokemon/carvanha/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_carvanha_back_pic:: @ 8E01004
-	.incbin "graphics/pokemon/back_pics/carvanha_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/carvanha/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_carvanha_shiny_palette:: @ 8E01314
-	.incbin "graphics/pokemon/palettes/carvanha_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/carvanha/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_carvanha_icon:: @ 8E0133C
-	.incbin "graphics/pokemon/icons/carvanha_icon.4bpp"
+	.incbin "graphics/pokemon/carvanha/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_carvanha_footprint:: @ 8E0173C
-	.incbin "graphics/pokemon/footprints/carvanha_footprint.1bpp"
+	.incbin "graphics/pokemon/carvanha/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sharpedo_still_front_pic:: @ 8E0175C
-	.incbin "graphics/pokemon/front_pics/sharpedo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sharpedo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sharpedo_palette:: @ 8E01AEC
-	.incbin "graphics/pokemon/palettes/sharpedo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sharpedo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sharpedo_back_pic:: @ 8E01B14
-	.incbin "graphics/pokemon/back_pics/sharpedo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sharpedo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sharpedo_shiny_palette:: @ 8E01E6C
-	.incbin "graphics/pokemon/palettes/sharpedo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sharpedo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sharpedo_icon:: @ 8E01E94
-	.incbin "graphics/pokemon/icons/sharpedo_icon.4bpp"
+	.incbin "graphics/pokemon/sharpedo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sharpedo_footprint:: @ 8E02294
-	.incbin "graphics/pokemon/footprints/sharpedo_footprint.1bpp"
+	.incbin "graphics/pokemon/sharpedo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_trapinch_still_front_pic:: @ 8E022B4
-	.incbin "graphics/pokemon/front_pics/trapinch_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/trapinch/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_trapinch_palette:: @ 8E024D0
-	.incbin "graphics/pokemon/palettes/trapinch_palette.gbapal.lz"
+	.incbin "graphics/pokemon/trapinch/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_trapinch_back_pic:: @ 8E024F8
-	.incbin "graphics/pokemon/back_pics/trapinch_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/trapinch/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_trapinch_shiny_palette:: @ 8E02718
-	.incbin "graphics/pokemon/palettes/trapinch_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/trapinch/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_trapinch_icon:: @ 8E02740
-	.incbin "graphics/pokemon/icons/trapinch_icon.4bpp"
+	.incbin "graphics/pokemon/trapinch/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_trapinch_footprint:: @ 8E02B40
-	.incbin "graphics/pokemon/footprints/trapinch_footprint.1bpp"
+	.incbin "graphics/pokemon/trapinch/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vibrava_still_front_pic:: @ 8E02B60
-	.incbin "graphics/pokemon/front_pics/vibrava_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vibrava/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vibrava_palette:: @ 8E02ED0
-	.incbin "graphics/pokemon/palettes/vibrava_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vibrava/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vibrava_back_pic:: @ 8E02EF8
-	.incbin "graphics/pokemon/back_pics/vibrava_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vibrava/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vibrava_shiny_palette:: @ 8E03170
-	.incbin "graphics/pokemon/palettes/vibrava_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vibrava/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vibrava_icon:: @ 8E03198
-	.incbin "graphics/pokemon/icons/vibrava_icon.4bpp"
+	.incbin "graphics/pokemon/vibrava/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vibrava_footprint:: @ 8E03598
-	.incbin "graphics/pokemon/footprints/vibrava_footprint.1bpp"
+	.incbin "graphics/pokemon/vibrava/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_flygon_still_front_pic:: @ 8E035B8
-	.incbin "graphics/pokemon/front_pics/flygon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flygon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flygon_palette:: @ 8E03AA8
-	.incbin "graphics/pokemon/palettes/flygon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flygon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_flygon_back_pic:: @ 8E03AD0
-	.incbin "graphics/pokemon/back_pics/flygon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flygon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flygon_shiny_palette:: @ 8E03F0C
-	.incbin "graphics/pokemon/palettes/flygon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flygon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_flygon_icon:: @ 8E03F34
-	.incbin "graphics/pokemon/icons/flygon_icon.4bpp"
+	.incbin "graphics/pokemon/flygon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_flygon_footprint:: @ 8E04334
-	.incbin "graphics/pokemon/footprints/flygon_footprint.1bpp"
+	.incbin "graphics/pokemon/flygon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_makuhita_still_front_pic:: @ 8E04354
-	.incbin "graphics/pokemon/front_pics/makuhita_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/makuhita/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_makuhita_palette:: @ 8E0466C
-	.incbin "graphics/pokemon/palettes/makuhita_palette.gbapal.lz"
+	.incbin "graphics/pokemon/makuhita/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_makuhita_back_pic:: @ 8E04694
-	.incbin "graphics/pokemon/back_pics/makuhita_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/makuhita/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_makuhita_shiny_palette:: @ 8E04984
-	.incbin "graphics/pokemon/palettes/makuhita_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/makuhita/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_makuhita_icon:: @ 8E049A8
-	.incbin "graphics/pokemon/icons/makuhita_icon.4bpp"
+	.incbin "graphics/pokemon/makuhita/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_makuhita_footprint:: @ 8E04DA8
-	.incbin "graphics/pokemon/footprints/makuhita_footprint.1bpp"
+	.incbin "graphics/pokemon/makuhita/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hariyama_still_front_pic:: @ 8E04DC8
-	.incbin "graphics/pokemon/front_pics/hariyama_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hariyama/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hariyama_palette:: @ 8E05278
-	.incbin "graphics/pokemon/palettes/hariyama_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hariyama/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hariyama_back_pic:: @ 8E052A0
-	.incbin "graphics/pokemon/back_pics/hariyama_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hariyama/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hariyama_shiny_palette:: @ 8E05680
-	.incbin "graphics/pokemon/palettes/hariyama_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hariyama/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hariyama_icon:: @ 8E056A8
-	.incbin "graphics/pokemon/icons/hariyama_icon.4bpp"
+	.incbin "graphics/pokemon/hariyama/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hariyama_footprint:: @ 8E05AA8
-	.incbin "graphics/pokemon/footprints/hariyama_footprint.1bpp"
+	.incbin "graphics/pokemon/hariyama/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_electrike_still_front_pic:: @ 8E05AC8
-	.incbin "graphics/pokemon/front_pics/electrike_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electrike/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electrike_palette:: @ 8E05D58
-	.incbin "graphics/pokemon/palettes/electrike_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electrike/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_electrike_back_pic:: @ 8E05D80
-	.incbin "graphics/pokemon/back_pics/electrike_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electrike/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electrike_shiny_palette:: @ 8E0600C
-	.incbin "graphics/pokemon/palettes/electrike_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electrike/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_electrike_icon:: @ 8E06034
-	.incbin "graphics/pokemon/icons/electrike_icon.4bpp"
+	.incbin "graphics/pokemon/electrike/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_electrike_footprint:: @ 8E06434
-	.incbin "graphics/pokemon/footprints/electrike_footprint.1bpp"
+	.incbin "graphics/pokemon/electrike/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_manectric_still_front_pic:: @ 8E06454
-	.incbin "graphics/pokemon/front_pics/manectric_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/manectric/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_manectric_palette:: @ 8E06784
-	.incbin "graphics/pokemon/palettes/manectric_palette.gbapal.lz"
+	.incbin "graphics/pokemon/manectric/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_manectric_back_pic:: @ 8E067AC
-	.incbin "graphics/pokemon/back_pics/manectric_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/manectric/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_manectric_shiny_palette:: @ 8E069D8
-	.incbin "graphics/pokemon/palettes/manectric_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/manectric/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_manectric_icon:: @ 8E06A00
-	.incbin "graphics/pokemon/icons/manectric_icon.4bpp"
+	.incbin "graphics/pokemon/manectric/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_manectric_footprint:: @ 8E06E00
-	.incbin "graphics/pokemon/footprints/manectric_footprint.1bpp"
+	.incbin "graphics/pokemon/manectric/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_numel_still_front_pic:: @ 8E06E20
-	.incbin "graphics/pokemon/front_pics/numel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/numel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_numel_palette:: @ 8E070F0
-	.incbin "graphics/pokemon/palettes/numel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/numel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_numel_back_pic:: @ 8E07118
-	.incbin "graphics/pokemon/back_pics/numel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/numel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_numel_shiny_palette:: @ 8E073D4
-	.incbin "graphics/pokemon/palettes/numel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/numel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_numel_icon:: @ 8E073FC
-	.incbin "graphics/pokemon/icons/numel_icon.4bpp"
+	.incbin "graphics/pokemon/numel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_numel_footprint:: @ 8E077FC
-	.incbin "graphics/pokemon/footprints/numel_footprint.1bpp"
+	.incbin "graphics/pokemon/numel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_camerupt_still_front_pic:: @ 8E0781C
-	.incbin "graphics/pokemon/front_pics/camerupt_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/camerupt/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_camerupt_palette:: @ 8E07C34
-	.incbin "graphics/pokemon/palettes/camerupt_palette.gbapal.lz"
+	.incbin "graphics/pokemon/camerupt/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_camerupt_back_pic:: @ 8E07C5C
-	.incbin "graphics/pokemon/back_pics/camerupt_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/camerupt/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_camerupt_shiny_palette:: @ 8E07F20
-	.incbin "graphics/pokemon/palettes/camerupt_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/camerupt/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_camerupt_icon:: @ 8E07F48
-	.incbin "graphics/pokemon/icons/camerupt_icon.4bpp"
+	.incbin "graphics/pokemon/camerupt/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_camerupt_footprint:: @ 8E08348
-	.incbin "graphics/pokemon/footprints/camerupt_footprint.1bpp"
+	.incbin "graphics/pokemon/camerupt/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spheal_still_front_pic:: @ 8E08368
-	.incbin "graphics/pokemon/front_pics/spheal_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spheal/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spheal_palette:: @ 8E085DC
-	.incbin "graphics/pokemon/palettes/spheal_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spheal/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spheal_back_pic:: @ 8E08604
-	.incbin "graphics/pokemon/back_pics/spheal_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spheal/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spheal_shiny_palette:: @ 8E08800
-	.incbin "graphics/pokemon/palettes/spheal_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spheal/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spheal_icon:: @ 8E08828
-	.incbin "graphics/pokemon/icons/spheal_icon.4bpp"
+	.incbin "graphics/pokemon/spheal/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spheal_footprint:: @ 8E08C28
-	.incbin "graphics/pokemon/footprints/spheal_footprint.1bpp"
+	.incbin "graphics/pokemon/spheal/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sealeo_still_front_pic:: @ 8E08C48
-	.incbin "graphics/pokemon/front_pics/sealeo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sealeo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sealeo_palette:: @ 8E08FC8
-	.incbin "graphics/pokemon/palettes/sealeo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sealeo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sealeo_back_pic:: @ 8E08FF0
-	.incbin "graphics/pokemon/back_pics/sealeo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sealeo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sealeo_shiny_palette:: @ 8E0926C
-	.incbin "graphics/pokemon/palettes/sealeo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sealeo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sealeo_icon:: @ 8E09294
-	.incbin "graphics/pokemon/icons/sealeo_icon.4bpp"
+	.incbin "graphics/pokemon/sealeo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sealeo_footprint:: @ 8E09694
-	.incbin "graphics/pokemon/footprints/sealeo_footprint.1bpp"
+	.incbin "graphics/pokemon/sealeo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_walrein_still_front_pic:: @ 8E096B4
-	.incbin "graphics/pokemon/front_pics/walrein_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/walrein/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_walrein_palette:: @ 8E09B54
-	.incbin "graphics/pokemon/palettes/walrein_palette.gbapal.lz"
+	.incbin "graphics/pokemon/walrein/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_walrein_back_pic:: @ 8E09B7C
-	.incbin "graphics/pokemon/back_pics/walrein_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/walrein/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_walrein_shiny_palette:: @ 8E09F04
-	.incbin "graphics/pokemon/palettes/walrein_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/walrein/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_walrein_icon:: @ 8E09F2C
-	.incbin "graphics/pokemon/icons/walrein_icon.4bpp"
+	.incbin "graphics/pokemon/walrein/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_walrein_footprint:: @ 8E0A32C
-	.incbin "graphics/pokemon/footprints/walrein_footprint.1bpp"
+	.incbin "graphics/pokemon/walrein/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cacnea_still_front_pic:: @ 8E0A34C
-	.incbin "graphics/pokemon/front_pics/cacnea_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cacnea/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cacnea_palette:: @ 8E0A65C
-	.incbin "graphics/pokemon/palettes/cacnea_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cacnea/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cacnea_back_pic:: @ 8E0A684
-	.incbin "graphics/pokemon/back_pics/cacnea_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cacnea/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cacnea_shiny_palette:: @ 8E0A9E4
-	.incbin "graphics/pokemon/palettes/cacnea_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cacnea/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cacnea_icon:: @ 8E0AA0C
-	.incbin "graphics/pokemon/icons/cacnea_icon.4bpp"
+	.incbin "graphics/pokemon/cacnea/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cacnea_footprint:: @ 8E0AE0C
-	.incbin "graphics/pokemon/footprints/cacnea_footprint.1bpp"
+	.incbin "graphics/pokemon/cacnea/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cacturne_still_front_pic:: @ 8E0AE2C
-	.incbin "graphics/pokemon/front_pics/cacturne_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cacturne/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cacturne_palette:: @ 8E0B264
-	.incbin "graphics/pokemon/palettes/cacturne_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cacturne/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cacturne_back_pic:: @ 8E0B28C
-	.incbin "graphics/pokemon/back_pics/cacturne_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cacturne/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cacturne_shiny_palette:: @ 8E0B58C
-	.incbin "graphics/pokemon/palettes/cacturne_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cacturne/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cacturne_icon:: @ 8E0B5B4
-	.incbin "graphics/pokemon/icons/cacturne_icon.4bpp"
+	.incbin "graphics/pokemon/cacturne/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cacturne_footprint:: @ 8E0B9B4
-	.incbin "graphics/pokemon/footprints/cacturne_footprint.1bpp"
+	.incbin "graphics/pokemon/cacturne/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_snorunt_still_front_pic:: @ 8E0B9D4
-	.incbin "graphics/pokemon/front_pics/snorunt_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snorunt/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snorunt_palette:: @ 8E0BC98
-	.incbin "graphics/pokemon/palettes/snorunt_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snorunt/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_snorunt_back_pic:: @ 8E0BCC0
-	.incbin "graphics/pokemon/back_pics/snorunt_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snorunt/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snorunt_shiny_palette:: @ 8E0BFA4
-	.incbin "graphics/pokemon/palettes/snorunt_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snorunt/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_snorunt_icon:: @ 8E0BFCC
-	.incbin "graphics/pokemon/icons/snorunt_icon.4bpp"
+	.incbin "graphics/pokemon/snorunt/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_snorunt_footprint:: @ 8E0C3CC
-	.incbin "graphics/pokemon/footprints/snorunt_footprint.1bpp"
+	.incbin "graphics/pokemon/snorunt/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_glalie_still_front_pic:: @ 8E0C3EC
-	.incbin "graphics/pokemon/front_pics/glalie_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/glalie/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_glalie_palette:: @ 8E0C7B4
-	.incbin "graphics/pokemon/palettes/glalie_palette.gbapal.lz"
+	.incbin "graphics/pokemon/glalie/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_glalie_back_pic:: @ 8E0C7DC
-	.incbin "graphics/pokemon/back_pics/glalie_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/glalie/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_glalie_shiny_palette:: @ 8E0CB8C
-	.incbin "graphics/pokemon/palettes/glalie_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/glalie/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_glalie_icon:: @ 8E0CBB4
-	.incbin "graphics/pokemon/icons/glalie_icon.4bpp"
+	.incbin "graphics/pokemon/glalie/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_glalie_footprint:: @ 8E0CFB4
-	.incbin "graphics/pokemon/footprints/glalie_footprint.1bpp"
+	.incbin "graphics/pokemon/glalie/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lunatone_still_front_pic:: @ 8E0CFD4
-	.incbin "graphics/pokemon/front_pics/lunatone_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lunatone/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lunatone_palette:: @ 8E0D2FC
-	.incbin "graphics/pokemon/palettes/lunatone_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lunatone/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lunatone_back_pic:: @ 8E0D324
-	.incbin "graphics/pokemon/back_pics/lunatone_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lunatone/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lunatone_shiny_palette:: @ 8E0D67C
-	.incbin "graphics/pokemon/palettes/lunatone_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lunatone/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lunatone_icon:: @ 8E0D6A4
-	.incbin "graphics/pokemon/icons/lunatone_icon.4bpp"
+	.incbin "graphics/pokemon/lunatone/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lunatone_footprint:: @ 8E0DAA4
-	.incbin "graphics/pokemon/footprints/lunatone_footprint.1bpp"
+	.incbin "graphics/pokemon/lunatone/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_solrock_still_front_pic:: @ 8E0DAC4
-	.incbin "graphics/pokemon/front_pics/solrock_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/solrock/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_solrock_palette:: @ 8E0DF10
-	.incbin "graphics/pokemon/palettes/solrock_palette.gbapal.lz"
+	.incbin "graphics/pokemon/solrock/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_solrock_back_pic:: @ 8E0DF38
-	.incbin "graphics/pokemon/back_pics/solrock_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/solrock/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_solrock_shiny_palette:: @ 8E0E324
-	.incbin "graphics/pokemon/palettes/solrock_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/solrock/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_solrock_icon:: @ 8E0E34C
-	.incbin "graphics/pokemon/icons/solrock_icon.4bpp"
+	.incbin "graphics/pokemon/solrock/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_solrock_footprint:: @ 8E0E74C
-	.incbin "graphics/pokemon/footprints/solrock_footprint.1bpp"
+	.incbin "graphics/pokemon/solrock/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_azurill_still_front_pic:: @ 8E0E76C
-	.incbin "graphics/pokemon/front_pics/azurill_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/azurill/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_azurill_palette:: @ 8E0EA34
-	.incbin "graphics/pokemon/palettes/azurill_palette.gbapal.lz"
+	.incbin "graphics/pokemon/azurill/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_azurill_back_pic:: @ 8E0EA5C
-	.incbin "graphics/pokemon/back_pics/azurill_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/azurill/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_azurill_shiny_palette:: @ 8E0ED74
-	.incbin "graphics/pokemon/palettes/azurill_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/azurill/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_azurill_icon:: @ 8E0ED9C
-	.incbin "graphics/pokemon/icons/azurill_icon.4bpp"
+	.incbin "graphics/pokemon/azurill/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_azurill_footprint:: @ 8E0F19C
-	.incbin "graphics/pokemon/footprints/azurill_footprint.1bpp"
+	.incbin "graphics/pokemon/azurill/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spoink_still_front_pic:: @ 8E0F1BC
-	.incbin "graphics/pokemon/front_pics/spoink_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spoink/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spoink_palette:: @ 8E0F428
-	.incbin "graphics/pokemon/palettes/spoink_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spoink/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spoink_back_pic:: @ 8E0F450
-	.incbin "graphics/pokemon/back_pics/spoink_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spoink/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spoink_shiny_palette:: @ 8E0F690
-	.incbin "graphics/pokemon/palettes/spoink_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spoink/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spoink_icon:: @ 8E0F6B8
-	.incbin "graphics/pokemon/icons/spoink_icon.4bpp"
+	.incbin "graphics/pokemon/spoink/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spoink_footprint:: @ 8E0FAB8
-	.incbin "graphics/pokemon/footprints/spoink_footprint.1bpp"
+	.incbin "graphics/pokemon/spoink/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_grumpig_still_front_pic:: @ 8E0FAD8
-	.incbin "graphics/pokemon/front_pics/grumpig_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grumpig/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grumpig_palette:: @ 8E0FE94
-	.incbin "graphics/pokemon/palettes/grumpig_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grumpig/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_grumpig_back_pic:: @ 8E0FEBC
-	.incbin "graphics/pokemon/back_pics/grumpig_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grumpig/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grumpig_shiny_palette:: @ 8E1021C
-	.incbin "graphics/pokemon/palettes/grumpig_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grumpig/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_grumpig_icon:: @ 8E10244
-	.incbin "graphics/pokemon/icons/grumpig_icon.4bpp"
+	.incbin "graphics/pokemon/grumpig/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_grumpig_footprint:: @ 8E10644
-	.incbin "graphics/pokemon/footprints/grumpig_footprint.1bpp"
+	.incbin "graphics/pokemon/grumpig/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_plusle_still_front_pic:: @ 8E10664
-	.incbin "graphics/pokemon/front_pics/plusle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/plusle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_plusle_palette:: @ 8E108F0
-	.incbin "graphics/pokemon/palettes/plusle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/plusle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_plusle_back_pic:: @ 8E10918
-	.incbin "graphics/pokemon/back_pics/plusle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/plusle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_plusle_shiny_palette:: @ 8E10BD0
-	.incbin "graphics/pokemon/palettes/plusle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/plusle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_plusle_icon:: @ 8E10BF8
-	.incbin "graphics/pokemon/icons/plusle_icon.4bpp"
+	.incbin "graphics/pokemon/plusle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_plusle_footprint:: @ 8E10FF8
-	.incbin "graphics/pokemon/footprints/plusle_footprint.1bpp"
+	.incbin "graphics/pokemon/plusle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_minun_still_front_pic:: @ 8E11018
-	.incbin "graphics/pokemon/front_pics/minun_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/minun/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_minun_palette:: @ 8E11280
-	.incbin "graphics/pokemon/palettes/minun_palette.gbapal.lz"
+	.incbin "graphics/pokemon/minun/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_minun_back_pic:: @ 8E112A8
-	.incbin "graphics/pokemon/back_pics/minun_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/minun/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_minun_shiny_palette:: @ 8E11570
-	.incbin "graphics/pokemon/palettes/minun_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/minun/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_minun_icon:: @ 8E11598
-	.incbin "graphics/pokemon/icons/minun_icon.4bpp"
+	.incbin "graphics/pokemon/minun/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_minun_footprint:: @ 8E11998
-	.incbin "graphics/pokemon/footprints/minun_footprint.1bpp"
+	.incbin "graphics/pokemon/minun/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mawile_still_front_pic:: @ 8E119B8
-	.incbin "graphics/pokemon/front_pics/mawile_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mawile/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mawile_palette:: @ 8E11D74
-	.incbin "graphics/pokemon/palettes/mawile_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mawile/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mawile_back_pic:: @ 8E11D9C
-	.incbin "graphics/pokemon/back_pics/mawile_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mawile/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mawile_shiny_palette:: @ 8E1219C
-	.incbin "graphics/pokemon/palettes/mawile_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mawile/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mawile_icon:: @ 8E121C4
-	.incbin "graphics/pokemon/icons/mawile_icon.4bpp"
+	.incbin "graphics/pokemon/mawile/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mawile_footprint:: @ 8E125C4
-	.incbin "graphics/pokemon/footprints/mawile_footprint.1bpp"
+	.incbin "graphics/pokemon/mawile/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_meditite_still_front_pic:: @ 8E125E4
-	.incbin "graphics/pokemon/front_pics/meditite_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meditite/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meditite_palette:: @ 8E1289C
-	.incbin "graphics/pokemon/palettes/meditite_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meditite/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_meditite_back_pic:: @ 8E128C4
-	.incbin "graphics/pokemon/back_pics/meditite_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meditite/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meditite_shiny_palette:: @ 8E12B8C
-	.incbin "graphics/pokemon/palettes/meditite_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meditite/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_meditite_icon:: @ 8E12BB0
-	.incbin "graphics/pokemon/icons/meditite_icon.4bpp"
+	.incbin "graphics/pokemon/meditite/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_meditite_footprint:: @ 8E12FB0
-	.incbin "graphics/pokemon/footprints/meditite_footprint.1bpp"
+	.incbin "graphics/pokemon/meditite/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_medicham_still_front_pic:: @ 8E12FD0
-	.incbin "graphics/pokemon/front_pics/medicham_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/medicham/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_medicham_palette:: @ 8E13300
-	.incbin "graphics/pokemon/palettes/medicham_palette.gbapal.lz"
+	.incbin "graphics/pokemon/medicham/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_medicham_back_pic:: @ 8E13328
-	.incbin "graphics/pokemon/back_pics/medicham_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/medicham/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_medicham_shiny_palette:: @ 8E13660
-	.incbin "graphics/pokemon/palettes/medicham_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/medicham/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_medicham_icon:: @ 8E13688
-	.incbin "graphics/pokemon/icons/medicham_icon.4bpp"
+	.incbin "graphics/pokemon/medicham/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_medicham_footprint:: @ 8E13A88
-	.incbin "graphics/pokemon/footprints/medicham_footprint.1bpp"
+	.incbin "graphics/pokemon/medicham/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swablu_still_front_pic:: @ 8E13AA8
-	.incbin "graphics/pokemon/front_pics/swablu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swablu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swablu_palette:: @ 8E13D80
-	.incbin "graphics/pokemon/palettes/swablu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swablu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swablu_back_pic:: @ 8E13DA8
-	.incbin "graphics/pokemon/back_pics/swablu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swablu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swablu_shiny_palette:: @ 8E14160
-	.incbin "graphics/pokemon/palettes/swablu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swablu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swablu_icon:: @ 8E14188
-	.incbin "graphics/pokemon/icons/swablu_icon.4bpp"
+	.incbin "graphics/pokemon/swablu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swablu_footprint:: @ 8E14588
-	.incbin "graphics/pokemon/footprints/swablu_footprint.1bpp"
+	.incbin "graphics/pokemon/swablu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_altaria_still_front_pic:: @ 8E145A8
-	.incbin "graphics/pokemon/front_pics/altaria_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/altaria/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_altaria_palette:: @ 8E14984
-	.incbin "graphics/pokemon/palettes/altaria_palette.gbapal.lz"
+	.incbin "graphics/pokemon/altaria/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_altaria_back_pic:: @ 8E149AC
-	.incbin "graphics/pokemon/back_pics/altaria_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/altaria/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_altaria_shiny_palette:: @ 8E14D24
-	.incbin "graphics/pokemon/palettes/altaria_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/altaria/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_altaria_icon:: @ 8E14D4C
-	.incbin "graphics/pokemon/icons/altaria_icon.4bpp"
+	.incbin "graphics/pokemon/altaria/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_altaria_footprint:: @ 8E1514C
-	.incbin "graphics/pokemon/footprints/altaria_footprint.1bpp"
+	.incbin "graphics/pokemon/altaria/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wynaut_still_front_pic:: @ 8E1516C
-	.incbin "graphics/pokemon/front_pics/wynaut_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wynaut/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wynaut_palette:: @ 8E15404
-	.incbin "graphics/pokemon/palettes/wynaut_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wynaut/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wynaut_back_pic:: @ 8E1542C
-	.incbin "graphics/pokemon/back_pics/wynaut_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wynaut/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wynaut_shiny_palette:: @ 8E156BC
-	.incbin "graphics/pokemon/palettes/wynaut_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wynaut/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wynaut_icon:: @ 8E156E4
-	.incbin "graphics/pokemon/icons/wynaut_icon.4bpp"
+	.incbin "graphics/pokemon/wynaut/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wynaut_footprint:: @ 8E15AE4
-	.incbin "graphics/pokemon/footprints/wynaut_footprint.1bpp"
+	.incbin "graphics/pokemon/wynaut/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_duskull_still_front_pic:: @ 8E15B04
-	.incbin "graphics/pokemon/front_pics/duskull_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/duskull/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_duskull_palette:: @ 8E15DF4
-	.incbin "graphics/pokemon/palettes/duskull_palette.gbapal.lz"
+	.incbin "graphics/pokemon/duskull/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_duskull_back_pic:: @ 8E15E1C
-	.incbin "graphics/pokemon/back_pics/duskull_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/duskull/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_duskull_shiny_palette:: @ 8E160CC
-	.incbin "graphics/pokemon/palettes/duskull_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/duskull/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_duskull_icon:: @ 8E160F4
-	.incbin "graphics/pokemon/icons/duskull_icon.4bpp"
+	.incbin "graphics/pokemon/duskull/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_duskull_footprint:: @ 8E164F4
-	.incbin "graphics/pokemon/footprints/duskull_footprint.1bpp"
+	.incbin "graphics/pokemon/duskull/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dusclops_still_front_pic:: @ 8E16514
-	.incbin "graphics/pokemon/front_pics/dusclops_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dusclops/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dusclops_palette:: @ 8E168B4
-	.incbin "graphics/pokemon/palettes/dusclops_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dusclops/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dusclops_back_pic:: @ 8E168DC
-	.incbin "graphics/pokemon/back_pics/dusclops_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dusclops/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dusclops_shiny_palette:: @ 8E16BC8
-	.incbin "graphics/pokemon/palettes/dusclops_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dusclops/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dusclops_icon:: @ 8E16BF0
-	.incbin "graphics/pokemon/icons/dusclops_icon.4bpp"
+	.incbin "graphics/pokemon/dusclops/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dusclops_footprint:: @ 8E16FF0
-	.incbin "graphics/pokemon/footprints/dusclops_footprint.1bpp"
+	.incbin "graphics/pokemon/dusclops/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_roselia_still_front_pic:: @ 8E17010
-	.incbin "graphics/pokemon/front_pics/roselia_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/roselia/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_roselia_palette:: @ 8E1737C
-	.incbin "graphics/pokemon/palettes/roselia_palette.gbapal.lz"
+	.incbin "graphics/pokemon/roselia/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_roselia_back_pic:: @ 8E173A4
-	.incbin "graphics/pokemon/back_pics/roselia_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/roselia/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_roselia_shiny_palette:: @ 8E1776C
-	.incbin "graphics/pokemon/palettes/roselia_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/roselia/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_roselia_icon:: @ 8E17794
-	.incbin "graphics/pokemon/icons/roselia_icon.4bpp"
+	.incbin "graphics/pokemon/roselia/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_roselia_footprint:: @ 8E17B94
-	.incbin "graphics/pokemon/footprints/roselia_footprint.1bpp"
+	.incbin "graphics/pokemon/roselia/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slakoth_still_front_pic:: @ 8E17BB4
-	.incbin "graphics/pokemon/front_pics/slakoth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slakoth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slakoth_palette:: @ 8E17E9C
-	.incbin "graphics/pokemon/palettes/slakoth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slakoth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slakoth_back_pic:: @ 8E17EC4
-	.incbin "graphics/pokemon/back_pics/slakoth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slakoth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slakoth_shiny_palette:: @ 8E181AC
-	.incbin "graphics/pokemon/palettes/slakoth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slakoth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slakoth_icon:: @ 8E181D4
-	.incbin "graphics/pokemon/icons/slakoth_icon.4bpp"
+	.incbin "graphics/pokemon/slakoth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slakoth_footprint:: @ 8E185D4
-	.incbin "graphics/pokemon/footprints/slakoth_footprint.1bpp"
+	.incbin "graphics/pokemon/slakoth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vigoroth_still_front_pic:: @ 8E185F4
-	.incbin "graphics/pokemon/front_pics/vigoroth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vigoroth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vigoroth_palette:: @ 8E189F0
-	.incbin "graphics/pokemon/palettes/vigoroth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vigoroth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vigoroth_back_pic:: @ 8E18A18
-	.incbin "graphics/pokemon/back_pics/vigoroth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vigoroth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vigoroth_shiny_palette:: @ 8E18CE0
-	.incbin "graphics/pokemon/palettes/vigoroth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vigoroth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vigoroth_icon:: @ 8E18D08
-	.incbin "graphics/pokemon/icons/vigoroth_icon.4bpp"
+	.incbin "graphics/pokemon/vigoroth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vigoroth_footprint:: @ 8E19108
-	.incbin "graphics/pokemon/footprints/vigoroth_footprint.1bpp"
+	.incbin "graphics/pokemon/vigoroth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slaking_still_front_pic:: @ 8E19128
-	.incbin "graphics/pokemon/front_pics/slaking_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slaking/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slaking_palette:: @ 8E195FC
-	.incbin "graphics/pokemon/palettes/slaking_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slaking/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slaking_back_pic:: @ 8E19624
-	.incbin "graphics/pokemon/back_pics/slaking_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slaking/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slaking_shiny_palette:: @ 8E199E8
-	.incbin "graphics/pokemon/palettes/slaking_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slaking/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slaking_icon:: @ 8E19A10
-	.incbin "graphics/pokemon/icons/slaking_icon.4bpp"
+	.incbin "graphics/pokemon/slaking/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slaking_footprint:: @ 8E19E10
-	.incbin "graphics/pokemon/footprints/slaking_footprint.1bpp"
+	.incbin "graphics/pokemon/slaking/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gulpin_still_front_pic:: @ 8E19E30
-	.incbin "graphics/pokemon/front_pics/gulpin_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gulpin/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gulpin_palette:: @ 8E1A048
-	.incbin "graphics/pokemon/palettes/gulpin_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gulpin/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gulpin_back_pic:: @ 8E1A070
-	.incbin "graphics/pokemon/back_pics/gulpin_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gulpin/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gulpin_shiny_palette:: @ 8E1A2F4
-	.incbin "graphics/pokemon/palettes/gulpin_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gulpin/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gulpin_icon:: @ 8E1A31C
-	.incbin "graphics/pokemon/icons/gulpin_icon.4bpp"
+	.incbin "graphics/pokemon/gulpin/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gulpin_footprint:: @ 8E1A71C
-	.incbin "graphics/pokemon/footprints/gulpin_footprint.1bpp"
+	.incbin "graphics/pokemon/gulpin/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swalot_still_front_pic:: @ 8E1A73C
-	.incbin "graphics/pokemon/front_pics/swalot_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swalot/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swalot_palette:: @ 8E1AA80
-	.incbin "graphics/pokemon/palettes/swalot_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swalot/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swalot_back_pic:: @ 8E1AAA8
-	.incbin "graphics/pokemon/back_pics/swalot_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swalot/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swalot_shiny_palette:: @ 8E1ADF0
-	.incbin "graphics/pokemon/palettes/swalot_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swalot/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swalot_icon:: @ 8E1AE18
-	.incbin "graphics/pokemon/icons/swalot_icon.4bpp"
+	.incbin "graphics/pokemon/swalot/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swalot_footprint:: @ 8E1B218
-	.incbin "graphics/pokemon/footprints/swalot_footprint.1bpp"
+	.incbin "graphics/pokemon/swalot/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tropius_still_front_pic:: @ 8E1B238
-	.incbin "graphics/pokemon/front_pics/tropius_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tropius/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tropius_palette:: @ 8E1B7B0
-	.incbin "graphics/pokemon/palettes/tropius_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tropius/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tropius_back_pic:: @ 8E1B7D8
-	.incbin "graphics/pokemon/back_pics/tropius_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tropius/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tropius_shiny_palette:: @ 8E1BAFC
-	.incbin "graphics/pokemon/palettes/tropius_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tropius/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tropius_icon:: @ 8E1BB24
-	.incbin "graphics/pokemon/icons/tropius_icon.4bpp"
+	.incbin "graphics/pokemon/tropius/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tropius_footprint:: @ 8E1BF24
-	.incbin "graphics/pokemon/footprints/tropius_footprint.1bpp"
+	.incbin "graphics/pokemon/tropius/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_whismur_still_front_pic:: @ 8E1BF44
-	.incbin "graphics/pokemon/front_pics/whismur_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/whismur/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_whismur_palette:: @ 8E1C1D8
-	.incbin "graphics/pokemon/palettes/whismur_palette.gbapal.lz"
+	.incbin "graphics/pokemon/whismur/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_whismur_back_pic:: @ 8E1C200
-	.incbin "graphics/pokemon/back_pics/whismur_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/whismur/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_whismur_shiny_palette:: @ 8E1C470
-	.incbin "graphics/pokemon/palettes/whismur_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/whismur/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_whismur_icon:: @ 8E1C498
-	.incbin "graphics/pokemon/icons/whismur_icon.4bpp"
+	.incbin "graphics/pokemon/whismur/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_whismur_footprint:: @ 8E1C898
-	.incbin "graphics/pokemon/footprints/whismur_footprint.1bpp"
+	.incbin "graphics/pokemon/whismur/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_loudred_still_front_pic:: @ 8E1C8B8
-	.incbin "graphics/pokemon/front_pics/loudred_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/loudred/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_loudred_palette:: @ 8E1CD30
-	.incbin "graphics/pokemon/palettes/loudred_palette.gbapal.lz"
+	.incbin "graphics/pokemon/loudred/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_loudred_back_pic:: @ 8E1CD58
-	.incbin "graphics/pokemon/back_pics/loudred_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/loudred/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_loudred_shiny_palette:: @ 8E1D0C8
-	.incbin "graphics/pokemon/palettes/loudred_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/loudred/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_loudred_icon:: @ 8E1D0F0
-	.incbin "graphics/pokemon/icons/loudred_icon.4bpp"
+	.incbin "graphics/pokemon/loudred/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_loudred_footprint:: @ 8E1D4F0
-	.incbin "graphics/pokemon/footprints/loudred_footprint.1bpp"
+	.incbin "graphics/pokemon/loudred/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_exploud_still_front_pic:: @ 8E1D510
-	.incbin "graphics/pokemon/front_pics/exploud_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exploud/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exploud_palette:: @ 8E1DA78
-	.incbin "graphics/pokemon/palettes/exploud_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exploud/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_exploud_back_pic:: @ 8E1DAA0
-	.incbin "graphics/pokemon/back_pics/exploud_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exploud/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exploud_shiny_palette:: @ 8E1DEAC
-	.incbin "graphics/pokemon/palettes/exploud_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exploud/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_exploud_icon:: @ 8E1DED4
-	.incbin "graphics/pokemon/icons/exploud_icon.4bpp"
+	.incbin "graphics/pokemon/exploud/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_exploud_footprint:: @ 8E1E2D4
-	.incbin "graphics/pokemon/footprints/exploud_footprint.1bpp"
+	.incbin "graphics/pokemon/exploud/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_clamperl_still_front_pic:: @ 8E1E2F4
-	.incbin "graphics/pokemon/front_pics/clamperl_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clamperl/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clamperl_palette:: @ 8E1E5CC
-	.incbin "graphics/pokemon/palettes/clamperl_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clamperl/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_clamperl_back_pic:: @ 8E1E5F4
-	.incbin "graphics/pokemon/back_pics/clamperl_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clamperl/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clamperl_shiny_palette:: @ 8E1E888
-	.incbin "graphics/pokemon/palettes/clamperl_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clamperl/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_clamperl_icon:: @ 8E1E8B0
-	.incbin "graphics/pokemon/icons/clamperl_icon.4bpp"
+	.incbin "graphics/pokemon/clamperl/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_clamperl_footprint:: @ 8E1ECB0
-	.incbin "graphics/pokemon/footprints/clamperl_footprint.1bpp"
+	.incbin "graphics/pokemon/clamperl/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_huntail_still_front_pic:: @ 8E1ECD0
-	.incbin "graphics/pokemon/front_pics/huntail_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/huntail/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_huntail_palette:: @ 8E1F09C
-	.incbin "graphics/pokemon/palettes/huntail_palette.gbapal.lz"
+	.incbin "graphics/pokemon/huntail/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_huntail_back_pic:: @ 8E1F0C4
-	.incbin "graphics/pokemon/back_pics/huntail_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/huntail/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_huntail_shiny_palette:: @ 8E1F418
-	.incbin "graphics/pokemon/palettes/huntail_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/huntail/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_huntail_icon:: @ 8E1F440
-	.incbin "graphics/pokemon/icons/huntail_icon.4bpp"
+	.incbin "graphics/pokemon/huntail/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_huntail_footprint:: @ 8E1F840
-	.incbin "graphics/pokemon/footprints/huntail_footprint.1bpp"
+	.incbin "graphics/pokemon/huntail/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gorebyss_still_front_pic:: @ 8E1F860
-	.incbin "graphics/pokemon/front_pics/gorebyss_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gorebyss/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gorebyss_palette:: @ 8E1FB70
-	.incbin "graphics/pokemon/palettes/gorebyss_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gorebyss/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gorebyss_back_pic:: @ 8E1FB98
-	.incbin "graphics/pokemon/back_pics/gorebyss_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gorebyss/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gorebyss_shiny_palette:: @ 8E1FE80
-	.incbin "graphics/pokemon/palettes/gorebyss_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gorebyss/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gorebyss_icon:: @ 8E1FEA8
-	.incbin "graphics/pokemon/icons/gorebyss_icon.4bpp"
+	.incbin "graphics/pokemon/gorebyss/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gorebyss_footprint:: @ 8E202A8
-	.incbin "graphics/pokemon/footprints/gorebyss_footprint.1bpp"
+	.incbin "graphics/pokemon/gorebyss/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_absol_still_front_pic:: @ 8E202C8
-	.incbin "graphics/pokemon/front_pics/absol_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/absol/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_absol_palette:: @ 8E206F8
-	.incbin "graphics/pokemon/palettes/absol_palette.gbapal.lz"
+	.incbin "graphics/pokemon/absol/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_absol_back_pic:: @ 8E20720
-	.incbin "graphics/pokemon/back_pics/absol_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/absol/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_absol_shiny_palette:: @ 8E20A80
-	.incbin "graphics/pokemon/palettes/absol_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/absol/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_absol_icon:: @ 8E20AA8
-	.incbin "graphics/pokemon/icons/absol_icon.4bpp"
+	.incbin "graphics/pokemon/absol/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_absol_footprint:: @ 8E20EA8
-	.incbin "graphics/pokemon/footprints/absol_footprint.1bpp"
+	.incbin "graphics/pokemon/absol/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shuppet_still_front_pic:: @ 8E20EC8
-	.incbin "graphics/pokemon/front_pics/shuppet_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shuppet/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shuppet_palette:: @ 8E21100
-	.incbin "graphics/pokemon/palettes/shuppet_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shuppet/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shuppet_back_pic:: @ 8E21128
-	.incbin "graphics/pokemon/back_pics/shuppet_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shuppet/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shuppet_shiny_palette:: @ 8E213C0
-	.incbin "graphics/pokemon/palettes/shuppet_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shuppet/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shuppet_icon:: @ 8E213E8
-	.incbin "graphics/pokemon/icons/shuppet_icon.4bpp"
+	.incbin "graphics/pokemon/shuppet/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shuppet_footprint:: @ 8E217E8
-	.incbin "graphics/pokemon/footprints/shuppet_footprint.1bpp"
+	.incbin "graphics/pokemon/shuppet/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_banette_still_front_pic:: @ 8E21808
-	.incbin "graphics/pokemon/front_pics/banette_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/banette/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_banette_palette:: @ 8E21ABC
-	.incbin "graphics/pokemon/palettes/banette_palette.gbapal.lz"
+	.incbin "graphics/pokemon/banette/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_banette_back_pic:: @ 8E21AE4
-	.incbin "graphics/pokemon/back_pics/banette_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/banette/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_banette_shiny_palette:: @ 8E21D60
-	.incbin "graphics/pokemon/palettes/banette_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/banette/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_banette_icon:: @ 8E21D88
-	.incbin "graphics/pokemon/icons/banette_icon.4bpp"
+	.incbin "graphics/pokemon/banette/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_banette_footprint:: @ 8E22188
-	.incbin "graphics/pokemon/footprints/banette_footprint.1bpp"
+	.incbin "graphics/pokemon/banette/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seviper_still_front_pic:: @ 8E221A8
-	.incbin "graphics/pokemon/front_pics/seviper_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seviper/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seviper_palette:: @ 8E225C8
-	.incbin "graphics/pokemon/palettes/seviper_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seviper/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seviper_back_pic:: @ 8E225F0
-	.incbin "graphics/pokemon/back_pics/seviper_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seviper/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seviper_shiny_palette:: @ 8E22A7C
-	.incbin "graphics/pokemon/palettes/seviper_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seviper/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seviper_icon:: @ 8E22AA4
-	.incbin "graphics/pokemon/icons/seviper_icon.4bpp"
+	.incbin "graphics/pokemon/seviper/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seviper_footprint:: @ 8E22EA4
-	.incbin "graphics/pokemon/footprints/seviper_footprint.1bpp"
+	.incbin "graphics/pokemon/seviper/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_zangoose_still_front_pic:: @ 8E22EC4
-	.incbin "graphics/pokemon/front_pics/zangoose_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zangoose/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zangoose_palette:: @ 8E23290
-	.incbin "graphics/pokemon/palettes/zangoose_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zangoose/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_zangoose_back_pic:: @ 8E232B8
-	.incbin "graphics/pokemon/back_pics/zangoose_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zangoose/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zangoose_shiny_palette:: @ 8E2362C
-	.incbin "graphics/pokemon/palettes/zangoose_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zangoose/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_zangoose_icon:: @ 8E23654
-	.incbin "graphics/pokemon/icons/zangoose_icon.4bpp"
+	.incbin "graphics/pokemon/zangoose/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_zangoose_footprint:: @ 8E23A54
-	.incbin "graphics/pokemon/footprints/zangoose_footprint.1bpp"
+	.incbin "graphics/pokemon/zangoose/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_relicanth_still_front_pic:: @ 8E23A74
-	.incbin "graphics/pokemon/front_pics/relicanth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/relicanth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_relicanth_palette:: @ 8E23E08
-	.incbin "graphics/pokemon/palettes/relicanth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/relicanth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_relicanth_back_pic:: @ 8E23E30
-	.incbin "graphics/pokemon/back_pics/relicanth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/relicanth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_relicanth_shiny_palette:: @ 8E24188
-	.incbin "graphics/pokemon/palettes/relicanth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/relicanth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_relicanth_icon:: @ 8E241B0
-	.incbin "graphics/pokemon/icons/relicanth_icon.4bpp"
+	.incbin "graphics/pokemon/relicanth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_relicanth_footprint:: @ 8E245B0
-	.incbin "graphics/pokemon/footprints/relicanth_footprint.1bpp"
+	.incbin "graphics/pokemon/relicanth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_aron_still_front_pic:: @ 8E245D0
-	.incbin "graphics/pokemon/front_pics/aron_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aron/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aron_palette:: @ 8E247B8
-	.incbin "graphics/pokemon/palettes/aron_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aron/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_aron_back_pic:: @ 8E247E0
-	.incbin "graphics/pokemon/back_pics/aron_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aron/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aron_shiny_palette:: @ 8E24A08
-	.incbin "graphics/pokemon/palettes/aron_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aron/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_aron_icon:: @ 8E24A30
-	.incbin "graphics/pokemon/icons/aron_icon.4bpp"
+	.incbin "graphics/pokemon/aron/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_aron_footprint:: @ 8E24E30
-	.incbin "graphics/pokemon/footprints/aron_footprint.1bpp"
+	.incbin "graphics/pokemon/aron/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lairon_still_front_pic:: @ 8E24E50
-	.incbin "graphics/pokemon/front_pics/lairon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lairon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lairon_palette:: @ 8E2521C
-	.incbin "graphics/pokemon/palettes/lairon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lairon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lairon_back_pic:: @ 8E25244
-	.incbin "graphics/pokemon/back_pics/lairon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lairon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lairon_shiny_palette:: @ 8E25530
-	.incbin "graphics/pokemon/palettes/lairon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lairon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lairon_icon:: @ 8E25558
-	.incbin "graphics/pokemon/icons/lairon_icon.4bpp"
+	.incbin "graphics/pokemon/lairon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lairon_footprint:: @ 8E25958
-	.incbin "graphics/pokemon/footprints/lairon_footprint.1bpp"
+	.incbin "graphics/pokemon/lairon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_aggron_still_front_pic:: @ 8E25978
-	.incbin "graphics/pokemon/front_pics/aggron_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aggron/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aggron_palette:: @ 8E25EF4
-	.incbin "graphics/pokemon/palettes/aggron_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aggron/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_aggron_back_pic:: @ 8E25F1C
-	.incbin "graphics/pokemon/back_pics/aggron_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aggron/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aggron_shiny_palette:: @ 8E26344
-	.incbin "graphics/pokemon/palettes/aggron_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aggron/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_aggron_icon:: @ 8E2636C
-	.incbin "graphics/pokemon/icons/aggron_icon.4bpp"
+	.incbin "graphics/pokemon/aggron/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_aggron_footprint:: @ 8E2676C
-	.incbin "graphics/pokemon/footprints/aggron_footprint.1bpp"
+	.incbin "graphics/pokemon/aggron/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_castform_still_front_pic:: @ 8E2678C
-	.incbin "graphics/pokemon/front_pics/castform_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/castform/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_castform_palette:: @ 8E27214
-	.incbin "graphics/pokemon/palettes/castform_palette.gbapal.lz"
+	.incbin "graphics/pokemon/castform/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_castform_back_pic:: @ 8E27294
-	.incbin "graphics/pokemon/back_pics/castform_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/castform/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_castform_shiny_palette:: @ 8E27C50
-	.incbin "graphics/pokemon/palettes/castform_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/castform/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_castform_icon:: @ 8E27CCC
-	.incbin "graphics/pokemon/icons/castform_icon.4bpp"
+	.incbin "graphics/pokemon/castform/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_castform_footprint:: @ 8E280CC
-	.incbin "graphics/pokemon/footprints/castform_footprint.1bpp"
+	.incbin "graphics/pokemon/castform/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_volbeat_still_front_pic:: @ 8E280EC
-	.incbin "graphics/pokemon/front_pics/volbeat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/volbeat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_volbeat_palette:: @ 8E2847C
-	.incbin "graphics/pokemon/palettes/volbeat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/volbeat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_volbeat_back_pic:: @ 8E284A4
-	.incbin "graphics/pokemon/back_pics/volbeat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/volbeat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_volbeat_shiny_palette:: @ 8E28804
-	.incbin "graphics/pokemon/palettes/volbeat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/volbeat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_volbeat_icon:: @ 8E2882C
-	.incbin "graphics/pokemon/icons/volbeat_icon.4bpp"
+	.incbin "graphics/pokemon/volbeat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_volbeat_footprint:: @ 8E28C2C
-	.incbin "graphics/pokemon/footprints/volbeat_footprint.1bpp"
+	.incbin "graphics/pokemon/volbeat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_illumise_still_front_pic:: @ 8E28C4C
-	.incbin "graphics/pokemon/front_pics/illumise_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/illumise/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_illumise_palette:: @ 8E28FC0
-	.incbin "graphics/pokemon/palettes/illumise_palette.gbapal.lz"
+	.incbin "graphics/pokemon/illumise/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_illumise_back_pic:: @ 8E28FE8
-	.incbin "graphics/pokemon/back_pics/illumise_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/illumise/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_illumise_shiny_palette:: @ 8E29304
-	.incbin "graphics/pokemon/palettes/illumise_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/illumise/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_illumise_icon:: @ 8E2932C
-	.incbin "graphics/pokemon/icons/illumise_icon.4bpp"
+	.incbin "graphics/pokemon/illumise/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_illumise_footprint:: @ 8E2972C
-	.incbin "graphics/pokemon/footprints/illumise_footprint.1bpp"
+	.incbin "graphics/pokemon/illumise/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lileep_still_front_pic:: @ 8E2974C
-	.incbin "graphics/pokemon/front_pics/lileep_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lileep/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lileep_palette:: @ 8E29A90
-	.incbin "graphics/pokemon/palettes/lileep_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lileep/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lileep_back_pic:: @ 8E29AB8
-	.incbin "graphics/pokemon/back_pics/lileep_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lileep/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lileep_shiny_palette:: @ 8E29DFC
-	.incbin "graphics/pokemon/palettes/lileep_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lileep/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lileep_icon:: @ 8E29E24
-	.incbin "graphics/pokemon/icons/lileep_icon.4bpp"
+	.incbin "graphics/pokemon/lileep/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lileep_footprint:: @ 8E2A224
-	.incbin "graphics/pokemon/footprints/lileep_footprint.1bpp"
+	.incbin "graphics/pokemon/lileep/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cradily_still_front_pic:: @ 8E2A244
-	.incbin "graphics/pokemon/front_pics/cradily_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cradily/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cradily_palette:: @ 8E2A660
-	.incbin "graphics/pokemon/palettes/cradily_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cradily/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cradily_back_pic:: @ 8E2A688
-	.incbin "graphics/pokemon/back_pics/cradily_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cradily/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cradily_shiny_palette:: @ 8E2AA84
-	.incbin "graphics/pokemon/palettes/cradily_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cradily/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cradily_icon:: @ 8E2AAAC
-	.incbin "graphics/pokemon/icons/cradily_icon.4bpp"
+	.incbin "graphics/pokemon/cradily/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cradily_footprint:: @ 8E2AEAC
-	.incbin "graphics/pokemon/footprints/cradily_footprint.1bpp"
+	.incbin "graphics/pokemon/cradily/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_anorith_still_front_pic:: @ 8E2AECC
-	.incbin "graphics/pokemon/front_pics/anorith_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/anorith/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_anorith_palette:: @ 8E2B1F0
-	.incbin "graphics/pokemon/palettes/anorith_palette.gbapal.lz"
+	.incbin "graphics/pokemon/anorith/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_anorith_back_pic:: @ 8E2B218
-	.incbin "graphics/pokemon/back_pics/anorith_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/anorith/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_anorith_shiny_palette:: @ 8E2B460
-	.incbin "graphics/pokemon/palettes/anorith_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/anorith/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_anorith_icon:: @ 8E2B488
-	.incbin "graphics/pokemon/icons/anorith_icon.4bpp"
+	.incbin "graphics/pokemon/anorith/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_anorith_footprint:: @ 8E2B888
-	.incbin "graphics/pokemon/footprints/anorith_footprint.1bpp"
+	.incbin "graphics/pokemon/anorith/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_armaldo_still_front_pic:: @ 8E2B8A8
-	.incbin "graphics/pokemon/front_pics/armaldo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/armaldo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_armaldo_palette:: @ 8E2BE28
-	.incbin "graphics/pokemon/palettes/armaldo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/armaldo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_armaldo_back_pic:: @ 8E2BE50
-	.incbin "graphics/pokemon/back_pics/armaldo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/armaldo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_armaldo_shiny_palette:: @ 8E2C288
-	.incbin "graphics/pokemon/palettes/armaldo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/armaldo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_armaldo_icon:: @ 8E2C2B0
-	.incbin "graphics/pokemon/icons/armaldo_icon.4bpp"
+	.incbin "graphics/pokemon/armaldo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_armaldo_footprint:: @ 8E2C6B0
-	.incbin "graphics/pokemon/footprints/armaldo_footprint.1bpp"
+	.incbin "graphics/pokemon/armaldo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ralts_still_front_pic:: @ 8E2C6D0
-	.incbin "graphics/pokemon/front_pics/ralts_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ralts/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ralts_palette:: @ 8E2C900
-	.incbin "graphics/pokemon/palettes/ralts_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ralts/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ralts_back_pic:: @ 8E2C928
-	.incbin "graphics/pokemon/back_pics/ralts_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ralts/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ralts_shiny_palette:: @ 8E2CB64
-	.incbin "graphics/pokemon/palettes/ralts_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ralts/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ralts_icon:: @ 8E2CB8C
-	.incbin "graphics/pokemon/icons/ralts_icon.4bpp"
+	.incbin "graphics/pokemon/ralts/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ralts_footprint:: @ 8E2CF8C
-	.incbin "graphics/pokemon/footprints/ralts_footprint.1bpp"
+	.incbin "graphics/pokemon/ralts/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kirlia_still_front_pic:: @ 8E2CFAC
-	.incbin "graphics/pokemon/front_pics/kirlia_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kirlia/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kirlia_palette:: @ 8E2D2A8
-	.incbin "graphics/pokemon/palettes/kirlia_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kirlia/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kirlia_back_pic:: @ 8E2D2D0
-	.incbin "graphics/pokemon/back_pics/kirlia_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kirlia/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kirlia_shiny_palette:: @ 8E2D644
-	.incbin "graphics/pokemon/palettes/kirlia_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kirlia/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kirlia_icon:: @ 8E2D66C
-	.incbin "graphics/pokemon/icons/kirlia_icon.4bpp"
+	.incbin "graphics/pokemon/kirlia/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kirlia_footprint:: @ 8E2DA6C
-	.incbin "graphics/pokemon/footprints/kirlia_footprint.1bpp"
+	.incbin "graphics/pokemon/kirlia/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gardevoir_still_front_pic:: @ 8E2DA8C
-	.incbin "graphics/pokemon/front_pics/gardevoir_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gardevoir/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gardevoir_palette:: @ 8E2DE08
-	.incbin "graphics/pokemon/palettes/gardevoir_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gardevoir/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gardevoir_back_pic:: @ 8E2DE30
-	.incbin "graphics/pokemon/back_pics/gardevoir_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gardevoir/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gardevoir_shiny_palette:: @ 8E2E164
-	.incbin "graphics/pokemon/palettes/gardevoir_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gardevoir/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gardevoir_icon:: @ 8E2E18C
-	.incbin "graphics/pokemon/icons/gardevoir_icon.4bpp"
+	.incbin "graphics/pokemon/gardevoir/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gardevoir_footprint:: @ 8E2E58C
-	.incbin "graphics/pokemon/footprints/gardevoir_footprint.1bpp"
+	.incbin "graphics/pokemon/gardevoir/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bagon_still_front_pic:: @ 8E2E5AC
-	.incbin "graphics/pokemon/front_pics/bagon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bagon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bagon_palette:: @ 8E2E824
-	.incbin "graphics/pokemon/palettes/bagon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bagon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bagon_back_pic:: @ 8E2E84C
-	.incbin "graphics/pokemon/back_pics/bagon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bagon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bagon_shiny_palette:: @ 8E2EB34
-	.incbin "graphics/pokemon/palettes/bagon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bagon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bagon_icon:: @ 8E2EB5C
-	.incbin "graphics/pokemon/icons/bagon_icon.4bpp"
+	.incbin "graphics/pokemon/bagon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bagon_footprint:: @ 8E2EF5C
-	.incbin "graphics/pokemon/footprints/bagon_footprint.1bpp"
+	.incbin "graphics/pokemon/bagon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shelgon_still_front_pic:: @ 8E2EF7C
-	.incbin "graphics/pokemon/front_pics/shelgon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shelgon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shelgon_palette:: @ 8E2F280
-	.incbin "graphics/pokemon/palettes/shelgon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shelgon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shelgon_back_pic:: @ 8E2F2A8
-	.incbin "graphics/pokemon/back_pics/shelgon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shelgon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shelgon_shiny_palette:: @ 8E2F590
-	.incbin "graphics/pokemon/palettes/shelgon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shelgon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shelgon_icon:: @ 8E2F5B8
-	.incbin "graphics/pokemon/icons/shelgon_icon.4bpp"
+	.incbin "graphics/pokemon/shelgon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shelgon_footprint:: @ 8E2F9B8
-	.incbin "graphics/pokemon/footprints/shelgon_footprint.1bpp"
+	.incbin "graphics/pokemon/shelgon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_salamence_still_front_pic:: @ 8E2F9D8
-	.incbin "graphics/pokemon/front_pics/salamence_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/salamence/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_salamence_palette:: @ 8E2FE3C
-	.incbin "graphics/pokemon/palettes/salamence_palette.gbapal.lz"
+	.incbin "graphics/pokemon/salamence/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_salamence_back_pic:: @ 8E2FE64
-	.incbin "graphics/pokemon/back_pics/salamence_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/salamence/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_salamence_shiny_palette:: @ 8E30148
-	.incbin "graphics/pokemon/palettes/salamence_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/salamence/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_salamence_icon:: @ 8E30170
-	.incbin "graphics/pokemon/icons/salamence_icon.4bpp"
+	.incbin "graphics/pokemon/salamence/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_salamence_footprint:: @ 8E30570
-	.incbin "graphics/pokemon/footprints/salamence_footprint.1bpp"
+	.incbin "graphics/pokemon/salamence/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_beldum_still_front_pic:: @ 8E30590
-	.incbin "graphics/pokemon/front_pics/beldum_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beldum/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beldum_palette:: @ 8E30800
-	.incbin "graphics/pokemon/palettes/beldum_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beldum/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_beldum_back_pic:: @ 8E30828
-	.incbin "graphics/pokemon/back_pics/beldum_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beldum/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beldum_shiny_palette:: @ 8E30B18
-	.incbin "graphics/pokemon/palettes/beldum_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beldum/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_beldum_icon:: @ 8E30B40
-	.incbin "graphics/pokemon/icons/beldum_icon.4bpp"
+	.incbin "graphics/pokemon/beldum/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_beldum_footprint:: @ 8E30F40
-	.incbin "graphics/pokemon/footprints/beldum_footprint.1bpp"
+	.incbin "graphics/pokemon/beldum/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_metang_still_front_pic:: @ 8E30F60
-	.incbin "graphics/pokemon/front_pics/metang_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metang/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metang_palette:: @ 8E313BC
-	.incbin "graphics/pokemon/palettes/metang_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metang/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_metang_back_pic:: @ 8E313E4
-	.incbin "graphics/pokemon/back_pics/metang_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metang/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metang_shiny_palette:: @ 8E31708
-	.incbin "graphics/pokemon/palettes/metang_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metang/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_metang_icon:: @ 8E31730
-	.incbin "graphics/pokemon/icons/metang_icon.4bpp"
+	.incbin "graphics/pokemon/metang/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_metang_footprint:: @ 8E31B30
-	.incbin "graphics/pokemon/footprints/metang_footprint.1bpp"
+	.incbin "graphics/pokemon/metang/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_metagross_still_front_pic:: @ 8E31B50
-	.incbin "graphics/pokemon/front_pics/metagross_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metagross/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metagross_palette:: @ 8E31FB4
-	.incbin "graphics/pokemon/palettes/metagross_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metagross/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_metagross_back_pic:: @ 8E31FDC
-	.incbin "graphics/pokemon/back_pics/metagross_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metagross/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metagross_shiny_palette:: @ 8E322A8
-	.incbin "graphics/pokemon/palettes/metagross_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metagross/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_metagross_icon:: @ 8E322D0
-	.incbin "graphics/pokemon/icons/metagross_icon.4bpp"
+	.incbin "graphics/pokemon/metagross/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_metagross_footprint:: @ 8E326D0
-	.incbin "graphics/pokemon/footprints/metagross_footprint.1bpp"
+	.incbin "graphics/pokemon/metagross/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_regirock_still_front_pic:: @ 8E326F0
-	.incbin "graphics/pokemon/front_pics/regirock_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/regirock/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_regirock_palette:: @ 8E32BAC
-	.incbin "graphics/pokemon/palettes/regirock_palette.gbapal.lz"
+	.incbin "graphics/pokemon/regirock/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_regirock_back_pic:: @ 8E32BD4
-	.incbin "graphics/pokemon/back_pics/regirock_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/regirock/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_regirock_shiny_palette:: @ 8E33020
-	.incbin "graphics/pokemon/palettes/regirock_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/regirock/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_regirock_icon:: @ 8E33048
-	.incbin "graphics/pokemon/icons/regirock_icon.4bpp"
+	.incbin "graphics/pokemon/regirock/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_regirock_footprint:: @ 8E33448
-	.incbin "graphics/pokemon/footprints/regirock_footprint.1bpp"
+	.incbin "graphics/pokemon/regirock/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_regice_still_front_pic:: @ 8E33468
-	.incbin "graphics/pokemon/front_pics/regice_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/regice/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_regice_palette:: @ 8E338B0
-	.incbin "graphics/pokemon/palettes/regice_palette.gbapal.lz"
+	.incbin "graphics/pokemon/regice/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_regice_back_pic:: @ 8E338D8
-	.incbin "graphics/pokemon/back_pics/regice_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/regice/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_regice_shiny_palette:: @ 8E33BC8
-	.incbin "graphics/pokemon/palettes/regice_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/regice/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_regice_icon:: @ 8E33BF0
-	.incbin "graphics/pokemon/icons/regice_icon.4bpp"
+	.incbin "graphics/pokemon/regice/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_regice_footprint:: @ 8E33FF0
-	.incbin "graphics/pokemon/footprints/regice_footprint.1bpp"
+	.incbin "graphics/pokemon/regice/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_registeel_still_front_pic:: @ 8E34010
-	.incbin "graphics/pokemon/front_pics/registeel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/registeel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_registeel_palette:: @ 8E34498
-	.incbin "graphics/pokemon/palettes/registeel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/registeel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_registeel_back_pic:: @ 8E344C0
-	.incbin "graphics/pokemon/back_pics/registeel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/registeel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_registeel_shiny_palette:: @ 8E347F8
-	.incbin "graphics/pokemon/palettes/registeel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/registeel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_registeel_icon:: @ 8E34820
-	.incbin "graphics/pokemon/icons/registeel_icon.4bpp"
+	.incbin "graphics/pokemon/registeel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_registeel_footprint:: @ 8E34C20
-	.incbin "graphics/pokemon/footprints/registeel_footprint.1bpp"
+	.incbin "graphics/pokemon/registeel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kyogre_still_front_pic:: @ 8E34C40
-	.incbin "graphics/pokemon/front_pics/kyogre_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kyogre/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kyogre_palette:: @ 8E350B0
-	.incbin "graphics/pokemon/palettes/kyogre_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kyogre/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kyogre_back_pic:: @ 8E350D8
-	.incbin "graphics/pokemon/back_pics/kyogre_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kyogre/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kyogre_shiny_palette:: @ 8E35350
-	.incbin "graphics/pokemon/palettes/kyogre_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kyogre/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kyogre_icon:: @ 8E35378
-	.incbin "graphics/pokemon/icons/kyogre_icon.4bpp"
+	.incbin "graphics/pokemon/kyogre/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kyogre_footprint:: @ 8E35778
-	.incbin "graphics/pokemon/footprints/kyogre_footprint.1bpp"
+	.incbin "graphics/pokemon/kyogre/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_groudon_still_front_pic:: @ 8E35798
-	.incbin "graphics/pokemon/front_pics/groudon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/groudon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_groudon_palette:: @ 8E35D2C
-	.incbin "graphics/pokemon/palettes/groudon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/groudon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_groudon_back_pic:: @ 8E35D54
-	.incbin "graphics/pokemon/back_pics/groudon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/groudon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_groudon_shiny_palette:: @ 8E361BC
-	.incbin "graphics/pokemon/palettes/groudon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/groudon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_groudon_icon:: @ 8E361E4
-	.incbin "graphics/pokemon/icons/groudon_icon.4bpp"
+	.incbin "graphics/pokemon/groudon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_groudon_footprint:: @ 8E365E4
-	.incbin "graphics/pokemon/footprints/groudon_footprint.1bpp"
+	.incbin "graphics/pokemon/groudon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rayquaza_still_front_pic:: @ 8E36604
-	.incbin "graphics/pokemon/front_pics/rayquaza_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rayquaza/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rayquaza_palette:: @ 8E36B14
-	.incbin "graphics/pokemon/palettes/rayquaza_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rayquaza/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rayquaza_back_pic:: @ 8E36B3C
-	.incbin "graphics/pokemon/back_pics/rayquaza_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rayquaza/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rayquaza_shiny_palette:: @ 8E36E74
-	.incbin "graphics/pokemon/palettes/rayquaza_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rayquaza/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rayquaza_icon:: @ 8E36E9C
-	.incbin "graphics/pokemon/icons/rayquaza_icon.4bpp"
+	.incbin "graphics/pokemon/rayquaza/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rayquaza_footprint:: @ 8E3729C
-	.incbin "graphics/pokemon/footprints/rayquaza_footprint.1bpp"
+	.incbin "graphics/pokemon/rayquaza/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_latias_still_front_pic:: @ 8E372BC
-	.incbin "graphics/pokemon/front_pics/latias_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/latias/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_latias_palette:: @ 8E376E0
-	.incbin "graphics/pokemon/palettes/latias_palette.gbapal.lz"
+	.incbin "graphics/pokemon/latias/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_latias_back_pic:: @ 8E37708
-	.incbin "graphics/pokemon/back_pics/latias_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/latias/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_latias_shiny_palette:: @ 8E37A04
-	.incbin "graphics/pokemon/palettes/latias_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/latias/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_latias_icon:: @ 8E37A2C
-	.incbin "graphics/pokemon/icons/latias_icon.4bpp"
+	.incbin "graphics/pokemon/latias/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_latias_footprint:: @ 8E37E2C
-	.incbin "graphics/pokemon/footprints/latias_footprint.1bpp"
+	.incbin "graphics/pokemon/latias/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_latios_still_front_pic:: @ 8E37E4C
-	.incbin "graphics/pokemon/front_pics/latios_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/latios/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_latios_palette:: @ 8E382A0
-	.incbin "graphics/pokemon/palettes/latios_palette.gbapal.lz"
+	.incbin "graphics/pokemon/latios/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_latios_back_pic:: @ 8E382C8
-	.incbin "graphics/pokemon/back_pics/latios_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/latios/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_latios_shiny_palette:: @ 8E38628
-	.incbin "graphics/pokemon/palettes/latios_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/latios/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_latios_icon:: @ 8E38650
-	.incbin "graphics/pokemon/icons/latios_icon.4bpp"
+	.incbin "graphics/pokemon/latios/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_latios_footprint:: @ 8E38A50
-	.incbin "graphics/pokemon/footprints/latios_footprint.1bpp"
+	.incbin "graphics/pokemon/latios/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jirachi_still_front_pic:: @ 8E38A70
-	.incbin "graphics/pokemon/front_pics/jirachi_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jirachi/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jirachi_palette:: @ 8E38D7C
-	.incbin "graphics/pokemon/palettes/jirachi_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jirachi/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jirachi_back_pic:: @ 8E38DA4
-	.incbin "graphics/pokemon/back_pics/jirachi_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jirachi/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jirachi_shiny_palette:: @ 8E39144
-	.incbin "graphics/pokemon/palettes/jirachi_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jirachi/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jirachi_icon:: @ 8E3916C
-	.incbin "graphics/pokemon/icons/jirachi_icon.4bpp"
+	.incbin "graphics/pokemon/jirachi/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jirachi_footprint:: @ 8E3956C
-	.incbin "graphics/pokemon/footprints/jirachi_footprint.1bpp"
+	.incbin "graphics/pokemon/jirachi/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_deoxys_still_front_pic:: @ 8E3958C
-	.incbin "graphics/pokemon/front_pics/deoxys_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/deoxys/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_deoxys_palette:: @ 8E39D48
-	.incbin "graphics/pokemon/palettes/deoxys_palette.gbapal.lz"
+	.incbin "graphics/pokemon/deoxys/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_deoxys_back_pic:: @ 8E39D70
-	.incbin "graphics/pokemon/back_pics/deoxys_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/deoxys/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_deoxys_shiny_palette:: @ 8E3A360
-	.incbin "graphics/pokemon/palettes/deoxys_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/deoxys/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_deoxys_icon:: @ 8E3A388
-	.incbin "graphics/pokemon/icons/deoxys_icon.4bpp"
+	.incbin "graphics/pokemon/deoxys/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_icons_deoxys_speed_icon:: @ 8E3A788
-	.incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp"
+	.incbin "graphics/pokemon/deoxys/speed_icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_deoxys_footprint:: @ 8E3AB88
-	.incbin "graphics/pokemon/footprints/deoxys_footprint.1bpp"
+	.incbin "graphics/pokemon/deoxys/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_chimecho_still_front_pic:: @ 8E3ABA8
-	.incbin "graphics/pokemon/front_pics/chimecho_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chimecho/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chimecho_palette:: @ 8E3ADF4
-	.incbin "graphics/pokemon/palettes/chimecho_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chimecho/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_chimecho_back_pic:: @ 8E3AE1C
-	.incbin "graphics/pokemon/back_pics/chimecho_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chimecho/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chimecho_shiny_palette:: @ 8E3B090
-	.incbin "graphics/pokemon/palettes/chimecho_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chimecho/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_chimecho_icon:: @ 8E3B0B8
-	.incbin "graphics/pokemon/icons/chimecho_icon.4bpp"
+	.incbin "graphics/pokemon/chimecho/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_chimecho_footprint:: @ 8E3B4B8
-	.incbin "graphics/pokemon/footprints/chimecho_footprint.1bpp"
+	.incbin "graphics/pokemon/chimecho/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_egg_still_front_pic:: @ 8E3B4D8
-	.incbin "graphics/pokemon/front_pics/egg_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/egg/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_egg_palette:: @ 8E3B68C
-	.incbin "graphics/pokemon/palettes/egg_palette.gbapal.lz"
+	.incbin "graphics/pokemon/egg/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_b_still_front_pic:: @ 8E3B6AC
-	.incbin "graphics/pokemon/front_pics/unown_b_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/b/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_b_back_pic:: @ 8E3B884
-	.incbin "graphics/pokemon/back_pics/unown_b_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/b/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_B_icon:: @ 8E3BA88
-	.incbin "graphics/pokemon/icons/unown_B_icon.4bpp"
+	.incbin "graphics/pokemon/unown/b/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_c_still_front_pic:: @ 8E3BE88
-	.incbin "graphics/pokemon/front_pics/unown_c_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/c/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_c_back_pic:: @ 8E3C09C
-	.incbin "graphics/pokemon/back_pics/unown_c_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/c/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_C_icon:: @ 8E3C348
-	.incbin "graphics/pokemon/icons/unown_C_icon.4bpp"
+	.incbin "graphics/pokemon/unown/c/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_d_still_front_pic:: @ 8E3C748
-	.incbin "graphics/pokemon/front_pics/unown_d_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/d/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_d_back_pic:: @ 8E3C940
-	.incbin "graphics/pokemon/back_pics/unown_d_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/d/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_D_icon:: @ 8E3CB98
-	.incbin "graphics/pokemon/icons/unown_D_icon.4bpp"
+	.incbin "graphics/pokemon/unown/d/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_e_still_front_pic:: @ 8E3CF98
-	.incbin "graphics/pokemon/front_pics/unown_e_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/e/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_e_back_pic:: @ 8E3D150
-	.incbin "graphics/pokemon/back_pics/unown_e_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/e/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_E_icon:: @ 8E3D350
-	.incbin "graphics/pokemon/icons/unown_E_icon.4bpp"
+	.incbin "graphics/pokemon/unown/e/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_f_still_front_pic:: @ 8E3D750
-	.incbin "graphics/pokemon/front_pics/unown_f_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/f/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_f_back_pic:: @ 8E3D944
-	.incbin "graphics/pokemon/back_pics/unown_f_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/f/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_F_icon:: @ 8E3DB60
-	.incbin "graphics/pokemon/icons/unown_F_icon.4bpp"
+	.incbin "graphics/pokemon/unown/f/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_g_still_front_pic:: @ 8E3DF60
-	.incbin "graphics/pokemon/front_pics/unown_g_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/g/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_g_back_pic:: @ 8E3E13C
-	.incbin "graphics/pokemon/back_pics/unown_g_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/g/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_G_icon:: @ 8E3E388
-	.incbin "graphics/pokemon/icons/unown_G_icon.4bpp"
+	.incbin "graphics/pokemon/unown/g/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_h_still_front_pic:: @ 8E3E788
-	.incbin "graphics/pokemon/front_pics/unown_h_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/h/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_h_back_pic:: @ 8E3E9CC
-	.incbin "graphics/pokemon/back_pics/unown_h_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/h/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_H_icon:: @ 8E3EC90
-	.incbin "graphics/pokemon/icons/unown_H_icon.4bpp"
+	.incbin "graphics/pokemon/unown/h/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_i_still_front_pic:: @ 8E3F090
-	.incbin "graphics/pokemon/front_pics/unown_i_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/i/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_i_back_pic:: @ 8E3F228
-	.incbin "graphics/pokemon/back_pics/unown_i_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/i/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_I_icon:: @ 8E3F3D0
-	.incbin "graphics/pokemon/icons/unown_I_icon.4bpp"
+	.incbin "graphics/pokemon/unown/i/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_j_still_front_pic:: @ 8E3F7D0
-	.incbin "graphics/pokemon/front_pics/unown_j_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/j/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_j_back_pic:: @ 8E3F994
-	.incbin "graphics/pokemon/back_pics/unown_j_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/j/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_J_icon:: @ 8E3FB7C
-	.incbin "graphics/pokemon/icons/unown_J_icon.4bpp"
+	.incbin "graphics/pokemon/unown/j/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_k_still_front_pic:: @ 8E3FF7C
-	.incbin "graphics/pokemon/front_pics/unown_k_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/k/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_k_back_pic:: @ 8E4014C
-	.incbin "graphics/pokemon/back_pics/unown_k_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/k/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_K_icon:: @ 8E40344
-	.incbin "graphics/pokemon/icons/unown_K_icon.4bpp"
+	.incbin "graphics/pokemon/unown/k/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_l_still_front_pic:: @ 8E40744
-	.incbin "graphics/pokemon/front_pics/unown_l_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/l/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_l_back_pic:: @ 8E408F4
-	.incbin "graphics/pokemon/back_pics/unown_l_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/l/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_L_icon:: @ 8E40AC8
-	.incbin "graphics/pokemon/icons/unown_L_icon.4bpp"
+	.incbin "graphics/pokemon/unown/l/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_m_still_front_pic:: @ 8E40EC8
-	.incbin "graphics/pokemon/front_pics/unown_m_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/m/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_m_back_pic:: @ 8E410EC
-	.incbin "graphics/pokemon/back_pics/unown_m_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/m/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_M_icon:: @ 8E41394
-	.incbin "graphics/pokemon/icons/unown_M_icon.4bpp"
+	.incbin "graphics/pokemon/unown/m/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_n_still_front_pic:: @ 8E41794
-	.incbin "graphics/pokemon/front_pics/unown_n_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/n/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_n_back_pic:: @ 8E4198C
-	.incbin "graphics/pokemon/back_pics/unown_n_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/n/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_N_icon:: @ 8E41BF8
-	.incbin "graphics/pokemon/icons/unown_N_icon.4bpp"
+	.incbin "graphics/pokemon/unown/n/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_o_still_front_pic:: @ 8E41FF8
-	.incbin "graphics/pokemon/front_pics/unown_o_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/o/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_o_back_pic:: @ 8E42230
-	.incbin "graphics/pokemon/back_pics/unown_o_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/o/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_O_icon:: @ 8E424F0
-	.incbin "graphics/pokemon/icons/unown_O_icon.4bpp"
+	.incbin "graphics/pokemon/unown/o/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_p_still_front_pic:: @ 8E428F0
-	.incbin "graphics/pokemon/front_pics/unown_p_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/p/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_p_back_pic:: @ 8E42A90
-	.incbin "graphics/pokemon/back_pics/unown_p_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/p/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_P_icon:: @ 8E42C54
-	.incbin "graphics/pokemon/icons/unown_P_icon.4bpp"
+	.incbin "graphics/pokemon/unown/p/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_q_still_front_pic:: @ 8E43054
-	.incbin "graphics/pokemon/front_pics/unown_q_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/q/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_q_back_pic:: @ 8E43208
-	.incbin "graphics/pokemon/back_pics/unown_q_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/q/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_Q_icon:: @ 8E433D4
-	.incbin "graphics/pokemon/icons/unown_Q_icon.4bpp"
+	.incbin "graphics/pokemon/unown/q/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_r_still_front_pic:: @ 8E437D4
-	.incbin "graphics/pokemon/front_pics/unown_r_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/r/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_r_back_pic:: @ 8E43978
-	.incbin "graphics/pokemon/back_pics/unown_r_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/r/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_R_icon:: @ 8E43B40
-	.incbin "graphics/pokemon/icons/unown_R_icon.4bpp"
+	.incbin "graphics/pokemon/unown/r/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_s_still_front_pic:: @ 8E43F40
-	.incbin "graphics/pokemon/front_pics/unown_s_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/s/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_s_back_pic:: @ 8E44128
-	.incbin "graphics/pokemon/back_pics/unown_s_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/s/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_S_icon:: @ 8E4437C
-	.incbin "graphics/pokemon/icons/unown_S_icon.4bpp"
+	.incbin "graphics/pokemon/unown/s/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_t_still_front_pic:: @ 8E4477C
-	.incbin "graphics/pokemon/front_pics/unown_t_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/t/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_t_back_pic:: @ 8E4492C
-	.incbin "graphics/pokemon/back_pics/unown_t_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/t/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_T_icon:: @ 8E44AE0
-	.incbin "graphics/pokemon/icons/unown_T_icon.4bpp"
+	.incbin "graphics/pokemon/unown/t/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_u_still_front_pic:: @ 8E44EE0
-	.incbin "graphics/pokemon/front_pics/unown_u_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/u/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_u_back_pic:: @ 8E450F8
-	.incbin "graphics/pokemon/back_pics/unown_u_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/u/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_U_icon:: @ 8E4534C
-	.incbin "graphics/pokemon/icons/unown_U_icon.4bpp"
+	.incbin "graphics/pokemon/unown/u/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_v_still_front_pic:: @ 8E4574C
-	.incbin "graphics/pokemon/front_pics/unown_v_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/v/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_v_back_pic:: @ 8E45930
-	.incbin "graphics/pokemon/back_pics/unown_v_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/v/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_V_icon:: @ 8E45B60
-	.incbin "graphics/pokemon/icons/unown_V_icon.4bpp"
+	.incbin "graphics/pokemon/unown/v/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_w_still_front_pic:: @ 8E45F60
-	.incbin "graphics/pokemon/front_pics/unown_w_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/w/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_w_back_pic:: @ 8E46134
-	.incbin "graphics/pokemon/back_pics/unown_w_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/w/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_W_icon:: @ 8E46338
-	.incbin "graphics/pokemon/icons/unown_W_icon.4bpp"
+	.incbin "graphics/pokemon/unown/w/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_x_still_front_pic:: @ 8E46738
-	.incbin "graphics/pokemon/front_pics/unown_x_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/x/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_x_back_pic:: @ 8E468FC
-	.incbin "graphics/pokemon/back_pics/unown_x_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/x/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_X_icon:: @ 8E46AEC
-	.incbin "graphics/pokemon/icons/unown_X_icon.4bpp"
+	.incbin "graphics/pokemon/unown/x/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_y_still_front_pic:: @ 8E46EEC
-	.incbin "graphics/pokemon/front_pics/unown_y_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/y/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_y_back_pic:: @ 8E470C4
-	.incbin "graphics/pokemon/back_pics/unown_y_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/y/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_Y_icon:: @ 8E472B8
-	.incbin "graphics/pokemon/icons/unown_Y_icon.4bpp"
+	.incbin "graphics/pokemon/unown/y/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_z_still_front_pic:: @ 8E476B8
-	.incbin "graphics/pokemon/front_pics/unown_z_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/z/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_z_back_pic:: @ 8E47868
-	.incbin "graphics/pokemon/back_pics/unown_z_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/z/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_Z_icon:: @ 8E47A44
-	.incbin "graphics/pokemon/icons/unown_Z_icon.4bpp"
+	.incbin "graphics/pokemon/unown/z/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_exclamation_mark_still_front_pic:: @ 8E47E44
-	.incbin "graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/exclamation_mark/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_exclamation_mark_back_pic:: @ 8E47FD4
-	.incbin "graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/exclamation_mark/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_exclamation_mark_icon:: @ 8E4819C
-	.incbin "graphics/pokemon/icons/unown_exclamation_mark_icon.4bpp"
+	.incbin "graphics/pokemon/unown/exclamation_mark/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_question_mark_still_front_pic:: @ 8E4859C
-	.incbin "graphics/pokemon/front_pics/unown_question_mark_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/question_mark/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_question_mark_back_pic:: @ 8E48758
-	.incbin "graphics/pokemon/back_pics/unown_question_mark_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/question_mark/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_question_mark_icon:: @ 8E48958
-	.incbin "graphics/pokemon/icons/unown_question_mark_icon.4bpp"
+	.incbin "graphics/pokemon/unown/question_mark/icon.4bpp"
 
 	.align 2
 gFile_graphics_trainers_front_pics_aqua_leader_archie_front_pic:: @ 8E48D58
@@ -13436,11 +13436,11 @@ gFile_graphics_trainers_palettes_old_man_back_pic:: @ 8E76F34
 
 	.align 2
 gFile_graphics_pokemon_icons_question_mark_icon:: @ 8E76F5C
-	.incbin "graphics/pokemon/icons/question_mark_icon.4bpp"
+	.incbin "graphics/pokemon/question_mark/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_question_mark_footprint:: @ 8E7735C
-	.incbin "graphics/pokemon/footprints/question_mark_footprint.1bpp"
+	.incbin "graphics/pokemon/question_mark/footprint.1bpp"
 
 	.align 2
 gFile_graphics_battle_transitions_vs_frame_sheet:: @ 8E7737C
@@ -13953,37 +13953,37 @@ gFile_graphics_interface_bag_swap_palette:: @ 8E845C8
 
 	.align 2
 gUnknown_8E845D8:: @ 8E845D8
-	.incbin "baserom.gba", 0xE845D8, 0x44C
+	.incbin "graphics/tm_case/unk_8E845D8.4bpp.lz"
 
 gUnknown_8E84A24:: @ 8E84A24
-	.incbin "baserom.gba", 0xE84A24, 0x14C
+	.incbin "graphics/tm_case/unk_8E84A24.bin.lz"
 
 gUnknown_8E84B70:: @ 8E84B70
-	.incbin "baserom.gba", 0xE84B70, 0x140
+	.incbin "graphics/tm_case/unk_8E84B70.bin.lz"
 
 gUnknown_8E84CB0:: @ 8E84CB0
-	.incbin "baserom.gba", 0xE84CB0, 0x70
+	.incbin "graphics/tm_case/unk_8E84CB0.gbapal.lz"
 
 gUnknown_8E84D20:: @ 8E84D20
-	.incbin "baserom.gba", 0xE84D20, 0x70
+	.incbin "graphics/tm_case/unk_8E84D20.gbapal.lz"
 	
-gUnknown_8E84D90:: @ 8E84D90
-	.incbin "baserom.gba", 0xE84D90, 0x190
+gTMCase_TMSpriteGfx:: @ 8E84D90
+	.incbin "graphics/tm_case/unk_8E84D90.4bpp.lz"
 
 gUnknown_8E84F20:: @ 8E84F20
-	.incbin "baserom.gba", 0xE84F20, 0x148
+	.incbin "graphics/tm_case/unk_8E84F20.gbapal.lz"
 
 gUnknown_8E85068:: @ 8E85068
-	.incbin "baserom.gba", 0xE85068, 0x28
+	.incbin "graphics/tm_case/unk_8E85068.gbapal.lz"
 
-gUnknown_8E85090:: @ 8E85090
-	.incbin "baserom.gba", 0xE85090, 0x378
+gItemPcTiles:: @ 8E85090
+	.incbin "graphics/item_pc/unk_8E85090.4bpp.lz"
 
-gUnknown_8E85408:: @ 8E85408
-	.incbin "baserom.gba", 0xE85408, 0x50
+gItemPcBgPals:: @ 8E85408
+	.incbin "graphics/item_pc/unk_8E85408.gbapal.lz"
 
-gUnknown_8E85458:: @ 8E85458
-	.incbin "baserom.gba", 0xE85458, 0x1B4
+gItemPcTilemap:: @ 8E85458
+	.incbin "graphics/item_pc/unk_8E85458.bin.lz"
 
 gUnknown_8E8560C:: @ 8E8560C
 	.incbin "baserom.gba", 0xE8560C, 0x3C4
@@ -14019,16 +14019,16 @@ gUnknown_8E861A8:: @ 8E861A8
 	.incbin "baserom.gba", 0xE861A8, 0x98
 
 gUnknown_8E86240:: @ 8E86240
-	.incbin "baserom.gba", 0xE86240, 0x9A8
+	.incbin "graphics/teachy_tv/tiles.4bpp.lz"
 
 gUnknown_8E86BE8:: @ 8E86BE8
-	.incbin "baserom.gba", 0xE86BE8, 0x184
+	.incbin "graphics/teachy_tv/bg1_tilemap.bin.lz"
 
 gUnknown_8E86D6C:: @ 8E86D6C
-	.incbin "baserom.gba", 0xE86D6C, 0x22C
+	.incbin "graphics/teachy_tv/bg2_tilemap.bin.lz"
 
 gUnknown_8E86F98:: @ 8E86F98
-	.incbin "baserom.gba", 0xE86F98, 0x78
+	.incbin "graphics/teachy_tv/palettes.gbapal.lz"
 
 gUnknown_8E87010:: @ 8E87010
 	.incbin "baserom.gba", 0xE87010, 0x18
@@ -16072,7 +16072,10 @@ gUnknown_8E985D8:: @ 8E985D8
 	.incbin "baserom.gba", 0xE985D8, 0xB40 @UNKNOWN, FALSEPOSITIVE?
 
 gUnknown_8E99118:: @ 8E99118
-	.incbin "baserom.gba", 0xE99118, 0xE0 @UNKNOWN
+	.incbin "graphics/tm_case/unk_8E99118.4bpp"
+
+gUnknown_8E99198::
+	.incbin "baserom.gba", 0xE99198, 0x60 @UNKNOWN
 
 gUnknown_8E991F8:: @ 8E991F8
 	.incbin "baserom.gba", 0xE991F8, 0x674
@@ -16209,89 +16212,127 @@ gUnknown_8EA1958:: @ 8EA1958
 gUnknown_8EA1A50:: @ 8EA1A50
 	.incbin "baserom.gba", 0xEA1A50, 0x118
 
-gUnknown_8EA1B68:: @ 8EA1B68
-	.incbin "baserom.gba", 0xEA1B68, 0xE0 @UNKNOWN
-
-gUnknown_8EA1C48:: @ 8EA1C48
-	.incbin "baserom.gba", 0xEA1C48, 0x90
-
-gUnknown_8EA1CD8:: @ 8EA1CD8
-	.incbin "baserom.gba", 0xEA1CD8, 0x90 @UNKNOWN
-
-gUnknown_8EA1D68:: @ 8EA1D68
-	.incbin "baserom.gba", 0xEA1D68, 0x28D4
-
-gUnknown_8EA463C:: @ 8EA463C
+	.align 2
+gTilesetPalettes_8EA1B68:: @ 8EA1B68
+	.incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal"
+
+gTilesetTiles_8EA1D68:: @ 8EA1D68
+	.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
+
+gBerryFixGameboy_Pal:: @ 8EA463C
 	.incbin "graphics/berry_fix/gba_small.gbapal"
 
-gUnknown_8EA467C:: @ 8EA467C
+gBerryFixGameboy_Gfx:: @ 8EA467C
 	.incbin "graphics/berry_fix/gba_small.4bpp.lz"
 
-gUnknown_8EA52B8:: @ 8EA52B8
+gBerryFixGameboy_Tilemap:: @ 8EA52B8
 	.incbin "graphics/berry_fix/gba_small.bin.lz"
 
-gUnknown_8EA5604:: @ 8EA5604
+gBerryFixGameboyLogo_Pal:: @ 8EA5604
 	.incbin "graphics/berry_fix/logo.gbapal"
 
-gUnknown_8EA5664:: @ 8EA5664
+gBerryFixGameboyLogo_Gfx:: @ 8EA5664
 	.incbin "graphics/berry_fix/logo.4bpp.lz"
 
-gUnknown_8EA60C8:: @ 8EA60C8
+gBerryFixGameboyLogo_Tilemap:: @ 8EA60C8
 	.incbin "graphics/berry_fix/logo.bin.lz"
 
-gUnknown_8EA63C8:: @ 8EA63C8
+gBerryFixGbaTransfer_Pal:: @ 8EA63C8
 	.incbin "graphics/berry_fix/gba_transfer.gbapal"
 
-gUnknown_8EA6408:: @ 8EA6408
+gBerryFixGbaTransfer_Gfx:: @ 8EA6408
 	.incbin "graphics/berry_fix/gba_transfer.4bpp.lz"
 
-gUnknown_8EA7028:: @ 8EA7028
+gBerryFixGbaTransfer_Tilemap:: @ 8EA7028
 	.incbin "graphics/berry_fix/gba_transfer.bin.lz"
 
-gUnknown_8EA72E0:: @ 8EA72E0
+gBerryFixGbaTransferHighlight_Pal:: @ 8EA72E0
 	.incbin "graphics/berry_fix/gba_transfer_highlight.gbapal"
 
-gUnknown_8EA7320:: @ 8EA7320
+gBerryFixGbaTransferHighlight_Gfx:: @ 8EA7320
 	.incbin "graphics/berry_fix/gba_transfer_highlight.4bpp.lz"
 
-gUnknown_8EA8118:: @ 8EA8118
+gBerryFixGbaTransferHighlight_Tilemap:: @ 8EA8118
 	.incbin "graphics/berry_fix/gba_transfer_highlight.bin.lz"
 
-gUnknown_8EA83C8:: @ 8EA83C8
+gBerryFixGbaTransferError_Pal:: @ 8EA83C8
 	.incbin "graphics/berry_fix/gba_transfer_error.gbapal"
 
-gUnknown_8EA8408:: @ 8EA8408
+gBerryFixGbaTransferError_Gfx:: @ 8EA8408
 	.incbin "graphics/berry_fix/gba_transfer_error.4bpp.lz"
 
-gUnknown_8EA8CC8:: @ 8EA8CC8
+gBerryFixGbaTransferError_Tilemap:: @ 8EA8CC8
 	.incbin "graphics/berry_fix/gba_transfer_error.bin.lz"
 
-gUnknown_8EA8F00:: @ 8EA8F00
+gBerryFixWindow_Pal:: @ 8EA8F00
 	.incbin "graphics/berry_fix/window.gbapal"
 
-gUnknown_8EA8F40:: @ 8EA8F40
+gBerryFixWindow_Gfx:: @ 8EA8F40
 	.incbin "graphics/berry_fix/window.4bpp.lz"
 
-gUnknown_8EA9588:: @ 8EA9588
+gBerryFixWindow_Tilemap:: @ 8EA9588
 	.incbin "graphics/berry_fix/window.bin.lz"
 
-gUnknown_8EA97F4:: @ 8EA97F4
-	.incbin "baserom.gba", 0xEA97F4, 0x120 @UNKNOWN
-
-gUnknown_8EA9914:: @ 8EA9914
-	.incbin "baserom.gba", 0xEA9914, 0x90
-
-gUnknown_8EA99A4:: @ 8EA99A4
-	.incbin "baserom.gba", 0xEA99A4, 0x50 @UNKNOWN
-
-gUnknown_8EA99F4:: @ 8EA99F4
-	.incbin "baserom.gba", 0xEA99F4, 0x394
-
-gUnknown_8EA9D88:: @ 8EA9D88
-	.incbin "baserom.gba", 0xEA9D88, 0x200 @UNKNOWN
-
-gUnknown_8EA9F88:: @ 8EA9F88
-	.incbin "baserom.gba", 0xEA9F88, 0xA68
+	.align 2
+gTilesetPalettes_8EA97F4:: @ 8EA97F4
+	.incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8EA99F4:: @ 8EA99F4
+	.incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8EA9D88:: @ 8EA9D88
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal"
+
+
+gTilesetTiles_8EA9F88:: @ 8EA9F88
+	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
 
 gUnknown_8EAA9F0:: @ 8EAA9F0
 	.incbin "baserom.gba", 0xEAA9F0, 0x20 @UNKNOWN
@@ -16356,10 +16397,10 @@ gUnknown_8EAE900:: @ 8EAE900
 gUnknown_8EAEA00:: @ 8EAEA00
 	.incbin "baserom.gba", 0xEAEA00, 0x20 @UNKNOWN
 
-gUnknown_8EAEA20:: @ 8EAEA20
+gTradeGba2_Pal:: @ 8EAEA20
 	.incbin "baserom.gba", 0xEAEA20, 0x60 @UNKNOWN
 
-gUnknown_8EAEA80:: @ 8EAEA80
+gTradeGba_Gfx:: @ 8EAEA80
 	.incbin "baserom.gba", 0xEAEA80, 0x1420 @UNKNOWN
 
 gUnknown_8EAFEA0:: @ 8EAFEA0
diff --git a/data/graphics/fonts/font6_braille.png b/data/graphics/fonts/font6_braille.png
new file mode 100644
index 000000000..cb4451bc2
--- /dev/null
+++ b/data/graphics/fonts/font6_braille.png
diff --git a/data/itemfinder.s b/data/itemfinder.s
new file mode 100644
index 000000000..3a955deeb
--- /dev/null
+++ b/data/itemfinder.s
@@ -0,0 +1,7 @@
+	.section .rodata
+	.align 2
+gUnknown_84647E4:: @ 84647E4
+	.incbin "baserom.gba", 0x4647E4, 0x18
+
+gUnknown_84647FC:: @ 84647FC
+	.incbin "baserom.gba", 0x4647FC, 0x8
diff --git a/data/layouts/.gitignore b/data/layouts/.gitignore
new file mode 100644
index 000000000..eaa83a6f1
--- /dev/null
+++ b/data/layouts/.gitignore
@@ -0,0 +1,2 @@
+layouts.inc
+layouts_table.inc
diff --git a/data/layouts/BirthIsland_Exterior/border.bin b/data/layouts/BirthIsland_Exterior/border.bin
new file mode 100644
index 000000000..75f2c916c
--- /dev/null
+++ b/data/layouts/BirthIsland_Exterior/border.bin
@@ -0,0 +1 @@
+vvvv
\ No newline at end of file
diff --git a/data/layouts/BirthIsland_Exterior/map.bin b/data/layouts/BirthIsland_Exterior/map.bin
new file mode 100644
index 000000000..98502708b
--- /dev/null
+++ b/data/layouts/BirthIsland_Exterior/map.bin
@@ -0,0 +1 @@
+vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvfvvvvvvvvvvvvvvvvvvvvvvvvvvvvvnvvvvvvvvvvvvvvvvvvvvvvvvvvv[\]}vvvvvvvvvvvvvvvvvvvvvvvsz`ab|s}vvvvvvvvvvvvvvvvvvvsszscdeu|s}vvvvvvvvvvvvvvvvvssz21310	003141|ss}vvvvvvvvvvvDEvvssz210	00Y300	041|ss}vDEvvvvvvvLMvszs000)3Z3+3	000u|ss}LMvvvvvvvvvsz21310	0)3,323-3+3	003141|ssvvvvvvvvvvszs0	00	01323232333000	0u|s}vvvvvvvvsz21000)3,3232323-3+30	0041|svvvvvvvszss	00	0)3,32323232323-3+300	041|}vvvvvsz2131000132323232323232333	0000u�|}vvvszs0000)3,323232323232323-3+300041mu|}vvsz�s0	093:3:3:3:3:3:3:3:3:3;3	0	0u�|}vpssk3100&'00000000000&'0041muuqvtss{||||||||||�0||||||||||}uurvts{|||||||||||�0|||||||||||}urvt{||||||||||||�0||||||||||||}rvxkkkkkkkkkkkk�1�1�1kkkkkkkkkkkkyvvvvvvvvvvvoss�1�1�1sssmvvvvvvvvvvvvvvvvvvvvvvv�1�1�1vvvvvvvvvvvvvvvvvvvvvvvvvvv�1�1�1vvvvvvvvvvvvvvvvvvvvvvvvvvv�2�2�2vvvvvvvvvvvvvvvvvvvvvvvvv"3�����#3vvvvvvvvvvvvvvvvvvvvvvv�������vvvvvvvvvvvvvvvvvvvvvvv �����!vvvvvvvvvvvvvvvvvvvvvvv$�����%vvvvvvvvvvvvvvvvvvvvvvv&�����'vvvvvvvvvvv
\ No newline at end of file
diff --git a/data/layouts/CeladonCity/border.bin b/data/layouts/CeladonCity/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/CeladonCity/border.bin
diff --git a/data/layouts/CeladonCity/map.bin b/data/layouts/CeladonCity/map.bin
new file mode 100644
index 000000000..45bad7034
--- /dev/null
+++ b/data/layouts/CeladonCity/map.bin
diff --git a/data/layouts/CeladonCity_Condominiums_1F/border.bin b/data/layouts/CeladonCity_Condominiums_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_1F/border.bin
diff --git a/data/layouts/CeladonCity_Condominiums_1F/map.bin b/data/layouts/CeladonCity_Condominiums_1F/map.bin
new file mode 100644
index 000000000..d396e1116
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_1F/map.bin
@@ -0,0 +1 @@
+������������������2�������������2�2�2�2�2�����2�2�2�2���2�2�2�2�2�����2�2�2�2���2�2�2�2�23�2���2�2�2�2�2�2����������2�2�2�2�2�2�����������2�2�2�2���2��2��2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2��2�����2�2���2�2�2�2�2�2�2�����2�2���2�2�2�2�2�2�2�����2�2����2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����������2�2�2�2�2�����������2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_Condominiums_2F/border.bin b/data/layouts/CeladonCity_Condominiums_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_2F/border.bin
diff --git a/data/layouts/CeladonCity_Condominiums_2F/map.bin b/data/layouts/CeladonCity_Condominiums_2F/map.bin
new file mode 100644
index 000000000..8dcec2456
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_2F/map.bin
diff --git a/data/layouts/CeladonCity_Condominiums_3F/border.bin b/data/layouts/CeladonCity_Condominiums_3F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_3F/border.bin
diff --git a/data/layouts/CeladonCity_Condominiums_3F/map.bin b/data/layouts/CeladonCity_Condominiums_3F/map.bin
new file mode 100644
index 000000000..5e44c90c6
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_3F/map.bin
@@ -0,0 +1 @@
+���������������������������������2�2�2�������2�2�����2�2�2�������2�2���2�2�2�2�23�2���2�2�2�2�2�2����������2�2�2�2�2�2�����������2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2����2�������2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�����2�2�2����2�2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����������2�2�2�2�2�����������2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_Condominiums_Roof/border.bin b/data/layouts/CeladonCity_Condominiums_Roof/border.bin
new file mode 100644
index 000000000..cbaea0adc
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_Roof/border.bin
@@ -0,0 +1 @@
+((((
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_Condominiums_Roof/map.bin b/data/layouts/CeladonCity_Condominiums_Roof/map.bin
new file mode 100644
index 000000000..8f044c89a
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_Roof/map.bin
@@ -0,0 +1 @@
+((((((((((((((     ./    .!33353
73353
"!3336373363"!3333337333@3A3"!3333337333HI"!337333@3A3"!%&&'337333HI"!%&&'337333@3A3"!%&&'337333HI"!%&&'337333@3A3"!0123337333HI"!893:;33733333"!333333733333"!333333733333"!<>=>=>?33333"!B3C33333333333"!JK3333333333")            *PQQQQURSTQQQQV#DE#,-$#DE#+#LM#,-$#LM#+####,-$####+
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin b/data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin
diff --git a/data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin b/data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin
new file mode 100644
index 000000000..a6aaf9a0c
--- /dev/null
+++ b/data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin
@@ -0,0 +1 @@
+���������������������2�2�2�2�2�2�2�2���2�2�2�2�2�2�2��2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_DepartmentStore_1F/border.bin b/data/layouts/CeladonCity_DepartmentStore_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_1F/border.bin
diff --git a/data/layouts/CeladonCity_DepartmentStore_1F/map.bin b/data/layouts/CeladonCity_DepartmentStore_1F/map.bin
new file mode 100644
index 000000000..3c09fa172
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_1F/map.bin
@@ -0,0 +1 @@
+�����������`a��������hij3�2�2�2�2�2���pqr3�2�2�2�2�2e�������2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�23�2�2��2�2�2�2�2��2�233�2�2��2�2�2�2�2��2�23&3�2�2��������2�2"3�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2������
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_DepartmentStore_2F/border.bin b/data/layouts/CeladonCity_DepartmentStore_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_2F/border.bin
diff --git a/data/layouts/CeladonCity_DepartmentStore_2F/map.bin b/data/layouts/CeladonCity_DepartmentStore_2F/map.bin
new file mode 100644
index 000000000..41c334718
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_2F/map.bin
diff --git a/data/layouts/CeladonCity_DepartmentStore_3F/border.bin b/data/layouts/CeladonCity_DepartmentStore_3F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_3F/border.bin
diff --git a/data/layouts/CeladonCity_DepartmentStore_3F/map.bin b/data/layouts/CeladonCity_DepartmentStore_3F/map.bin
new file mode 100644
index 000000000..1640da24e
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_3F/map.bin
@@ -0,0 +1 @@
+��������������`a�����������hij�2�2�2�2�2klm��pqr�2�2�2�2�2stu�����2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�233�233�2�2�2�23�2�2����2������2�2�2�2�2�2�2�2��2�2�2��233�233�2�2��2�2�2�����2������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_DepartmentStore_4F/border.bin b/data/layouts/CeladonCity_DepartmentStore_4F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_4F/border.bin
diff --git a/data/layouts/CeladonCity_DepartmentStore_4F/map.bin b/data/layouts/CeladonCity_DepartmentStore_4F/map.bin
new file mode 100644
index 000000000..f3f558069
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_4F/map.bin
diff --git a/data/layouts/CeladonCity_DepartmentStore_5F/border.bin b/data/layouts/CeladonCity_DepartmentStore_5F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_5F/border.bin
diff --git a/data/layouts/CeladonCity_DepartmentStore_5F/map.bin b/data/layouts/CeladonCity_DepartmentStore_5F/map.bin
new file mode 100644
index 000000000..5374a18ee
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_5F/map.bin
@@ -0,0 +1 @@
+��������������`a�����������hij3�2�2�2�2�2k3lm7��pqr3�2�2�2�2�2s3tu�����2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2
�2�2$�2�2�2�2�2�2�2�2�2�2�23��2�2�2�233�233�2����2�2�2�2�2�2�2�2�2�2�2�2�2''�2''�2�233�233�2�2�2�2�2�2�2�2 !�2 !�233�233�2�2()�2()�2�2�2�201�201�2''�2''3��2�2�2�2�2�2�2�2�2�2�2#
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin b/data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin
diff --git a/data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin b/data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin
new file mode 100644
index 000000000..42e08c38d
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin
@@ -0,0 +1 @@
+����������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_DepartmentStore_Roof/border.bin b/data/layouts/CeladonCity_DepartmentStore_Roof/border.bin
new file mode 100644
index 000000000..87ae772ca
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_Roof/border.bin
@@ -0,0 +1 @@
+WWWW
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_DepartmentStore_Roof/map.bin b/data/layouts/CeladonCity_DepartmentStore_Roof/map.bin
new file mode 100644
index 000000000..f92a0a330
--- /dev/null
+++ b/data/layouts/CeladonCity_DepartmentStore_Roof/map.bin
@@ -0,0 +1 @@
+WWWWWWWWWWWWW.///OW89999999999996777?]@AAAAAAAAA%%%=<>6?QH�2�2�2�2�2�2�2�2c---EDF6?YH�2�2*3+3+3,3�2�2�2�2�2�2�2�2M36?YH�2�243KL53�2�2�2�2�2�2�2�2U36?YH�2�243ST53�2�2�2�2�2�2�2�2N36?YH�2�223[3\333�2�2�2�2�2�2�2�2V3=GYPB3:3:3:3:3:3:3:3:3:3:3:3:3:3:3IJRXAAAAAAAAAAAAAAAAAZC�����������������;C�����������������;C�����������������;C�����������������;
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_GameCorner/border.bin b/data/layouts/CeladonCity_GameCorner/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_GameCorner/border.bin
diff --git a/data/layouts/CeladonCity_GameCorner/map.bin b/data/layouts/CeladonCity_GameCorner/map.bin
new file mode 100644
index 000000000..00280b8a4
--- /dev/null
+++ b/data/layouts/CeladonCity_GameCorner/map.bin
@@ -0,0 +1 @@
+���������������������������������������2�2�2�2�2�23��2�2�2�2�2�2���2����������2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin b/data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin
diff --git a/data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin b/data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin
new file mode 100644
index 000000000..475ca451c
--- /dev/null
+++ b/data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin
@@ -0,0 +1 @@
+��������������������2�2�2�2�2�23�����������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2���2�2�2�2�2�2�23�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_Gym/border.bin b/data/layouts/CeladonCity_Gym/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_Gym/border.bin
diff --git a/data/layouts/CeladonCity_Gym/map.bin b/data/layouts/CeladonCity_Gym/map.bin
new file mode 100644
index 000000000..19338125c
--- /dev/null
+++ b/data/layouts/CeladonCity_Gym/map.bin
@@ -0,0 +1 @@
+����������������������������2�2�2�2�2�2�2�2�2�2�2���2�2��������2�2����2���2�2�2�2��2����2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2���2�2��2�2�2�2�2��2�2���2�2����2����2�2���2�2���2�2�2���2�2���2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2���2�2�2���2�2���2�2���2�2�2���2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2��2�2�2��2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�tuv
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_Hotel/border.bin b/data/layouts/CeladonCity_Hotel/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_Hotel/border.bin
diff --git a/data/layouts/CeladonCity_Hotel/map.bin b/data/layouts/CeladonCity_Hotel/map.bin
new file mode 100644
index 000000000..4573c1444
--- /dev/null
+++ b/data/layouts/CeladonCity_Hotel/map.bin
@@ -0,0 +1 @@
+�������������������������������������2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2���2�2�2�2�2�2�2�2�2�2�2��2�2�2���2�2�����������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2��2�2�2�2�2���2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/CeladonCity_Restaurant/border.bin b/data/layouts/CeladonCity_Restaurant/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeladonCity_Restaurant/border.bin
diff --git a/data/layouts/CeladonCity_Restaurant/map.bin b/data/layouts/CeladonCity_Restaurant/map.bin
new file mode 100644
index 000000000..a5391187c
--- /dev/null
+++ b/data/layouts/CeladonCity_Restaurant/map.bin
@@ -0,0 +1 @@
+�������������������������������2�2�2�2�2�2�2�2�2�2������2���2�2�2�2�2�2�2��2�2�2�2�2���2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2���2�2�2�2�2�2�2��2�2�2�2�2���2�2�2�2�2�2�2������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/CeruleanCave_1F/border.bin b/data/layouts/CeruleanCave_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/CeruleanCave_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/CeruleanCave_1F/map.bin b/data/layouts/CeruleanCave_1F/map.bin
new file mode 100644
index 000000000..33a822337
--- /dev/null
+++ b/data/layouts/CeruleanCave_1F/map.bin
diff --git a/data/layouts/CeruleanCave_2F/border.bin b/data/layouts/CeruleanCave_2F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/CeruleanCave_2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/CeruleanCave_2F/map.bin b/data/layouts/CeruleanCave_2F/map.bin
new file mode 100644
index 000000000..f2b9dcb9c
--- /dev/null
+++ b/data/layouts/CeruleanCave_2F/map.bin
@@ -0,0 +1 @@
+�����������������������������������������������������������������������������������������������������������������������������2�2�2�2�����2�2���2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2��������������2�2�2�2�2�2�2��2�2����2��2����������2�2�����������2�2�����2�����2���2��2��2�2�2�2�2�2�2�2�2��������������2�2�2�2�2��2�2�2�2�2�2�2�2�2������������2�2�2�2��������������2�������������2�2�2�2�2�2�2�2�2�����2�����������2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�2��2�����������2������������������2�2��2�2����2���2�����������2��2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2��2�����������2��2���2��2������2��������2������2��2�����������2��2�2��2��2�2�2�2�2��2�2�2�2�2�2�2��2�2�2�2�2��2��2�����������2��2�2��2������2��������2������2��2�������������2��2�2��2��2�2�2�2�2��2�2�2�2�2��2�2�2�2�2��2��2��2�����������2�����2��2������2����2��2��2��2��2��2��2�����������2��2�2�2�2��2�2�2�2�2�2�2�2�2��2��2��2��2��2��2��2�����������2��2�����2����������2��2��2��2����2��2�����������2��2�2�2�2��2�2�2�2�2��2�2�2�2�2��2��2��2�2�2�2�2��2�����������2�������������2������2��2��������2�����������2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2��2�2�2�2�2�2�2�2�2��������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/CeruleanCave_B1F/border.bin b/data/layouts/CeruleanCave_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/CeruleanCave_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/CeruleanCave_B1F/map.bin b/data/layouts/CeruleanCave_B1F/map.bin
new file mode 100644
index 000000000..f423b6e0e
--- /dev/null
+++ b/data/layouts/CeruleanCave_B1F/map.bin
diff --git a/data/layouts/CeruleanCity/border.bin b/data/layouts/CeruleanCity/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/CeruleanCity/border.bin
diff --git a/data/layouts/CeruleanCity/map.bin b/data/layouts/CeruleanCity/map.bin
new file mode 100644
index 000000000..de72d4e87
--- /dev/null
+++ b/data/layouts/CeruleanCity/map.bin
@@ -0,0 +1,5 @@
+qq�|||||||||||}u*+++,��2�2�2�0	00�*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
qqu�|||||||||||}*+++,��2�2�2�����*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
qquu ###########1+++,��2�2�2�	00	0�*+
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
qquu*+++++++++++++++,��2�2�2�000�*+++++++++
+
+
+
+qquu*+++++++++++++++,��2�2�2�	00	05������������������qquu*+(���������������000000��0�0�0�0�0�0�0�0
0�qquu*+,�0	00	00	00
00
00
000	00	00	0��0�0�0�0�0�0�0�0
0�qquu*+,�
0�0�0�0
00
00
00
00
0000000��0�01�0�01�0�0�2�����qquu*+,���2�2�2���������0	00	00	0�2��2�2�2���0�0�0������qquu*+,��������������000000��������0�0�0������qquu*+,��������������0	00	00	0��������0�0�0������||}u*+,��������������000000��������0�0�0000�y�0|z*+,��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00	00��0�0�0	0*+,��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0000��0�0�0
0*+,��0�01�0�0�2�2�2�2�2�2�2�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00	00�000
0*+,��0�0�000�������{1|1}1~11000000000�0�0�0000�&%$%$%####1+,��0�0�0���������HIJK�0	00	00	00	00�0�0�00	00�
0
0
0
0
0
0++++++,��0�0�000�������PQRS�00091:1:1:1:1:1;�0�0�0000�������++++++,��0�01�0�0�0�0�0�0�0�0�0XYZ[����ABBBBBC�0�0�0000000000
0���������0�0�0�0�0�0�0�0�0�0�0�0`ab��000IJJJJJK�0�0�00	00	00	00	00
0�0�0�0�0�0�0�0�01�01�0�0�0�0�0�01�0�00	00	000	0`1PQRSTUV����0	0��������0�0�0�0�0�0�0�0�0�0�00
00
00
0�0�0�00000000hX1Y1Z[\]1^1�0�0�0�00�000000�0�0�0�0�0�0�0�01�0�000
00
00�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�0	0��������0�0�0�0	0�2�2�2�2
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00��0�0�0�00����0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0	0��0�0�0�2�����0�0�0�0�2�2�2�2�2�2(0)0*0+0�2�2�2�2�200�00��0�0�0�2�����0�0�0�0
0������0123�����0	0�0	0��0�0�0�2�����	0�0�0�0
0������89:;�����00�00��0�0�0�0��2�2�0�0�0�0
0������@Abc�����0	0�0	0��0�0�01�0�2�2�2�2�01�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0	0��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00��=>>>>>>>>?��������
0=>>>>>>>>>?�0	0��	00	00	00	00	0	00	00	00	00	00	00	0	0	00	00	00	00	00	0��0000000000000000000000000000000000����������	00	00�	00	00	00	00�	00	00����������0000����������0000��	00	00�	00	00	00	00�	00	00��0000�00000000�0000��	00	00�	00	00	00	00�	00	00�
\ No newline at end of file
diff --git a/data/layouts/CeruleanCity_BikeShop/border.bin b/data/layouts/CeruleanCity_BikeShop/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeruleanCity_BikeShop/border.bin
diff --git a/data/layouts/CeruleanCity_BikeShop/map.bin b/data/layouts/CeruleanCity_BikeShop/map.bin
new file mode 100644
index 000000000..7bfc92082
--- /dev/null
+++ b/data/layouts/CeruleanCity_BikeShop/map.bin
@@ -0,0 +1 @@
+�����������������������2�����2�2�2��2�2�2�2��2���2�2��2�2�2��2�2��2�2�2����2�2��2��2�2�2�2�2��2�2�2�2�2�2�2�2��2�2�2�2��2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2��2
\ No newline at end of file
diff --git a/data/layouts/CeruleanCity_Gym/border.bin b/data/layouts/CeruleanCity_Gym/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeruleanCity_Gym/border.bin
diff --git a/data/layouts/CeruleanCity_Gym/map.bin b/data/layouts/CeruleanCity_Gym/map.bin
new file mode 100644
index 000000000..ee6d65165
--- /dev/null
+++ b/data/layouts/CeruleanCity_Gym/map.bin
@@ -0,0 +1 @@
+�����������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2����2�2�2�2�2�2���2��������������2���2������2�2�2������2���2���2�2�2�2�2�2�2�2�2���2���2������2�2�2���2���2���2�����������2���2���2���2�2�2�2�2�2�2�2�2���2���2���2�����2������2���2���2�����2������2���2���2�2�2�2�2�2������2���2��������2������2���2��������2������2���2�����2�2�2�2�2�����2���2������2�2�2������2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�tuv
\ No newline at end of file
diff --git a/data/layouts/CeruleanCity_House1/border.bin b/data/layouts/CeruleanCity_House1/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeruleanCity_House1/border.bin
diff --git a/data/layouts/CeruleanCity_House1/map.bin b/data/layouts/CeruleanCity_House1/map.bin
new file mode 100644
index 000000000..83ebe0b15
--- /dev/null
+++ b/data/layouts/CeruleanCity_House1/map.bin
@@ -0,0 +1 @@
+��bcd�������jk1l�����111111112121V1	1	1	1	1	1	1	1	1	1^	1	1	1	1#1$1$1$1%11	1	1	1	1+1&1()-1V1	1	1	1	1+1,101-1^	1	1	1	131414141511	1?1G1O1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/CeruleanCity_House2/border.bin b/data/layouts/CeruleanCity_House2/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeruleanCity_House2/border.bin
diff --git a/data/layouts/CeruleanCity_House2/map.bin b/data/layouts/CeruleanCity_House2/map.bin
new file mode 100644
index 000000000..21a7d4178
--- /dev/null
+++ b/data/layouts/CeruleanCity_House2/map.bin
@@ -0,0 +1 @@
+������a��������2�i���H1I1�2�2�2�2�2�2��1#1$1$1$1$1%1�2�2�1+1�2()�2-1�2�2�21+1�2�1�2-1	1�2	1V13141�2414151�2�2�2^	1?1G1O1�2�2	1��
\ No newline at end of file
diff --git a/data/layouts/CeruleanCity_House5/border.bin b/data/layouts/CeruleanCity_House5/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CeruleanCity_House5/border.bin
diff --git a/data/layouts/CeruleanCity_House5/map.bin b/data/layouts/CeruleanCity_House5/map.bin
new file mode 100644
index 000000000..1f06133b3
--- /dev/null
+++ b/data/layouts/CeruleanCity_House5/map.bin
@@ -0,0 +1 @@
+����aa���������ii�����2121211111M1N1M1N11	1	1	1	1	1	1	1ef	11.1	1	1	1	1	1o1mn	16	1	1	1	1	1	1ef	11.1	1	1	1	1	1	1mng16	1?1G1O1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/CinnabarIsland/border.bin b/data/layouts/CinnabarIsland/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/CinnabarIsland/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/CinnabarIsland/map.bin b/data/layouts/CinnabarIsland/map.bin
new file mode 100644
index 000000000..7631ea1d8
--- /dev/null
+++ b/data/layouts/CinnabarIsland/map.bin
@@ -0,0 +1 @@
+++,��������0�03141)�������
++,�������1�0	0031ABBBBC)��++,��������00	0	0	0IJJJJK*��++,����2���0000PQRSTV*++,�0�0�2�2�2000	0	0	0	0X1Y1Z[\�*++,�0�0000000�0�0�0�0�0�0�0	00h+��+,�2�2�2�2�2�2�20�0�0�0�0�0�0�0000+��+,�������{1|1}1~110	00	00	0*++,�������HIJK�(0)0*0+0�0�0*++,�������PQRS�0123�0�0*��++,�0�00	0�2�20XYZ[�89:;�0�0*��++,�0�0�0�0�0�0�0`ab��@Abc�0�0*+��+0##!�0�0�0�0000000000�0�0*+��++++,�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0*+++++,�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0*�
++++0###############1�
+��++++++++++++++++++++�
+����++++++����++++�
�
++�����������
�
�
�
�
�
++��+�
�
�
�
+��
\ No newline at end of file
diff --git a/data/layouts/CinnabarIsland_Gym/border.bin b/data/layouts/CinnabarIsland_Gym/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CinnabarIsland_Gym/border.bin
diff --git a/data/layouts/CinnabarIsland_Gym/map.bin b/data/layouts/CinnabarIsland_Gym/map.bin
new file mode 100644
index 000000000..39cd83f5a
--- /dev/null
+++ b/data/layouts/CinnabarIsland_Gym/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������������2�2�2�2�2������2�2���2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�������2�2�����������2�2��������2�2������������������������������������2�2�2�2�2�2�2������2�2�2�2�2�2����2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2������2�2�2���2�2�2�2�2�2�2�2�2��������2�2��������2�2�2�������2�2����������������2�2�2�2�2�2�2�����������������2�2�2�2�2�2��2�2�2�2�2�2�2�����2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2��2�2�2��2���2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�tuv
\ No newline at end of file
diff --git a/data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin b/data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin
diff --git a/data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin b/data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin
new file mode 100644
index 000000000..39ca3b4d7
--- /dev/null
+++ b/data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin
@@ -0,0 +1 @@
+hiiiijp�qq�r0x0�y0y0y0y0y0�z0�2�2�0�0�0�0�0�0�0���2�0���2�0�0jhi��jhi��jhi��j�2��0�0���2�0�0rpq�2�rpq�2�rpq�2�r�2��0�0�2�2�0�0�0z0x0y0y0y0y0z0x0y0y0y0y0z0x0y0y0y0y0z0���0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2�2�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0��0�0��0�0��0�0��0�0��0�0��0���
\ No newline at end of file
diff --git a/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin b/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin
diff --git a/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin b/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin
new file mode 100644
index 000000000..1dbda8fd5
--- /dev/null
+++ b/data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin
diff --git a/data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin b/data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin
diff --git a/data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin b/data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin
new file mode 100644
index 000000000..a84c9d1ab
--- /dev/null
+++ b/data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin
@@ -0,0 +1,3 @@
+h��kli$ikl��jp
stq%qst
rx0	3
+3{0|0y0y0y0y0y0{0|0	3
+3z0�0�0�0�0�2�2�2�2�2�2�2�0�0�0�0�2�0�0�0�2�2�6�6�6�2�2�0�0�0�2�2�0�0�0�2�2����2�2�0�0�0�2�2�0�0�0�2�2����2�2�0�0�0�2�0�0�0�0�2�2�2�2�2�2�2�0�0�0�0�2�0�0�0�0�0�0�0�0�0�0�0�0�0�0�6��0�0�0�0�0�0�0�0�0�0�0��
\ No newline at end of file
diff --git a/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin b/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin
diff --git a/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin b/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin
new file mode 100644
index 000000000..6032e183f
--- /dev/null
+++ b/data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin
diff --git a/data/layouts/DiglettsCave_B1F/border.bin b/data/layouts/DiglettsCave_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/DiglettsCave_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/DiglettsCave_B1F/map.bin b/data/layouts/DiglettsCave_B1F/map.bin
new file mode 100644
index 000000000..d29e66e00
--- /dev/null
+++ b/data/layouts/DiglettsCave_B1F/map.bin
@@ -0,0 +1 @@
+������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������2�2������������������������������������������������������������������������������������2�2������������������������������������������������������������������������������������2�2����������������������������������������������������������6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�����������2�2������������������������������������������������������������������������������������2�2�2�2�2��2���������������������������������������������������������������������������6�6���2�2�2�2�2�2��������������������������������������������������6�6�������������������������6�6���2�2�2�2�2�2�2���������������������������������������������������������������������������6�6���2�2�2�2�2�2�2���������������������������������������������������������������������������6�6��������2�2�2�2�2������������������������������������������������������������������������6�6��������2�2�2�2�2�2�����������������������������������������������������������������������6�6��������2�2�2�2�2�2����������������������������������������������������������������������������������2�2�2�2�����������������������������������������������������������������������6�6������������2�2���������������������������������������������������������������6�6��������������������2�2����������������������������������������������������������������������6�6�6������������2�2������������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2����������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2����������������������������������������������������������6�6���������������2�2�2�2�2�2�2�2�2�2�2�2����������������������������������������������������������6�6�����������������2�2��2��2�2�2�2�2�2�2�2�2�2�2�2����������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2���������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2�2�2����������������������������������������������������������������������������������2�2�2�2�2�2�2�2������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�������������������������������������������������������������������������������2�2�2�2�2�2�2�2�������������������������������������������������������������������������������2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2�2����������������������������������������������������������������������������������2�2�2�2������������������������������������6�6�6�6�6�6�6�6�6�6�������������������������������������2�2�2�2����������������������������������������������������������������������������������2�2�2�2����������������������������������������������������������������������������������2�2�2�2����������������������������������������������������������������������������������2�2�2�2����������������������������������������������������������������������������������2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2���������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2����������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2��2������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�����������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�����������������������������������������������������������������������������2�2�2�2�2�2�2�2�2������������������������������������������������������������������������������2�2�2�2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2�2����������������������������������������������������������������������������������2�2�2�2�����������������������������������������������������������������������������������2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�������������������������������������������������������������������������2��2�2�2�2�2�2�2�2�2�2�2�2������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2����������������������������������������������������������������������������������2�2�2�2����������������������������������������������������������������������������������2�2�2�2����������������������������������������������������������������������������������2�2�2�2����������������������������������������������������������������������������������2�2�2�2����������������������������������������������������������������������������������2�2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2�2�2�������������������������������������������������������������������������������2�2�2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2�2��������������������������������������������������������������������������������2�2�2�2�2�2�����������������������������������������������������������������������������������2�2�2�2�2�2���������������������������������������������������������������������������������2�2�2�2�2��������������������������������6�6�6�6�6�6�6�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������6�6�6�6�6��6�6�6��6�������������������������������������������������������������������������6��6�6�6�6�6�6�6�6�6�6�6���������������������������������������������������������������������������6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�����6������������������������������������������������������������6�6�6�6�6�6�6�6�6�6�6���������������������������������������������������������������������������6�6�6�6�6�6�6�6�6�6�6
\ No newline at end of file
diff --git a/data/layouts/DiglettsCave_NorthEntrance/border.bin b/data/layouts/DiglettsCave_NorthEntrance/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/DiglettsCave_NorthEntrance/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/DiglettsCave_NorthEntrance/map.bin b/data/layouts/DiglettsCave_NorthEntrance/map.bin
new file mode 100644
index 000000000..39007d306
--- /dev/null
+++ b/data/layouts/DiglettsCave_NorthEntrance/map.bin
@@ -0,0 +1 @@
+�6�6�6�6�6�6��6�6�6�6�6������6�6�6���2
33�2�2�2�6�6��
33�2�2�2�2�6��6��2�2�2�2�2�2�6��6�3�2�2�2�2�2�6�6�6��2�2�2�2�2�2�6�6�6�������6��6
\ No newline at end of file
diff --git a/data/layouts/DiglettsCave_SouthEntrance/border.bin b/data/layouts/DiglettsCave_SouthEntrance/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/DiglettsCave_SouthEntrance/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/DiglettsCave_SouthEntrance/map.bin b/data/layouts/DiglettsCave_SouthEntrance/map.bin
new file mode 100644
index 000000000..9d2c75793
--- /dev/null
+++ b/data/layouts/DiglettsCave_SouthEntrance/map.bin
diff --git a/data/layouts/Entrance_1F/border.bin b/data/layouts/Entrance_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Entrance_1F/border.bin
diff --git a/data/layouts/Entrance_1F/map.bin b/data/layouts/Entrance_1F/map.bin
new file mode 100644
index 000000000..e39d586e9
--- /dev/null
+++ b/data/layouts/Entrance_1F/map.bin
@@ -0,0 +1 @@
+����������������������2�2�2�2�2�2�2�2�2��2����������2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��������2�2���2�2�2�2�2�2��2�2���2�2�2�2�2�2��2�2��
\ No newline at end of file
diff --git a/data/layouts/Entrance_2F/border.bin b/data/layouts/Entrance_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Entrance_2F/border.bin
diff --git a/data/layouts/Entrance_2F/map.bin b/data/layouts/Entrance_2F/map.bin
new file mode 100644
index 000000000..bfac6e348
--- /dev/null
+++ b/data/layouts/Entrance_2F/map.bin
@@ -0,0 +1 @@
+������������������������2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2���2�2�2�2���2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2���2�2��2�2�2�2�2�2�6�6�2�2
\ No newline at end of file
diff --git a/data/layouts/FiveIsland/border.bin b/data/layouts/FiveIsland/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/FiveIsland/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/FiveIsland/map.bin b/data/layouts/FiveIsland/map.bin
new file mode 100644
index 000000000..98fa499f8
--- /dev/null
+++ b/data/layouts/FiveIsland/map.bin
diff --git a/data/layouts/FiveIsland_LostCave_Entrance/border.bin b/data/layouts/FiveIsland_LostCave_Entrance/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Entrance/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Entrance/map.bin b/data/layouts/FiveIsland_LostCave_Entrance/map.bin
new file mode 100644
index 000000000..7e68d2dd4
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Entrance/map.bin
@@ -0,0 +1 @@
+�������������������������2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room1/border.bin b/data/layouts/FiveIsland_LostCave_Room1/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room1/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room1/map.bin b/data/layouts/FiveIsland_LostCave_Room1/map.bin
new file mode 100644
index 000000000..1683057f5
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room1/map.bin
@@ -0,0 +1,2 @@
+�����������������2��������2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2��2�2�2�2�2���
+3�2�2�2�2�23	����2�2�2�2�2�2�2�����2�2�2�2�2��2�����2��2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room10/border.bin b/data/layouts/FiveIsland_LostCave_Room10/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room10/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room10/map.bin b/data/layouts/FiveIsland_LostCave_Room10/map.bin
new file mode 100644
index 000000000..9e26501cb
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room10/map.bin
@@ -0,0 +1 @@
+�������������������������2�2��2��2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room11/border.bin b/data/layouts/FiveIsland_LostCave_Room11/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room11/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room11/map.bin b/data/layouts/FiveIsland_LostCave_Room11/map.bin
new file mode 100644
index 000000000..6af11f8cc
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room11/map.bin
@@ -0,0 +1 @@
+�����������������2��������2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2333�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room12/border.bin b/data/layouts/FiveIsland_LostCave_Room12/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room12/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room12/map.bin b/data/layouts/FiveIsland_LostCave_Room12/map.bin
new file mode 100644
index 000000000..6f77bfda9
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room12/map.bin
@@ -0,0 +1 @@
+�������������������������2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2333�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room13/border.bin b/data/layouts/FiveIsland_LostCave_Room13/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room13/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room13/map.bin b/data/layouts/FiveIsland_LostCave_Room13/map.bin
new file mode 100644
index 000000000..bb1a69aa2
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room13/map.bin
@@ -0,0 +1,2 @@
+�������������������������2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2���
+3�2�2�2�2�2�2�����2�2333�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room14/border.bin b/data/layouts/FiveIsland_LostCave_Room14/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room14/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room14/map.bin b/data/layouts/FiveIsland_LostCave_Room14/map.bin
new file mode 100644
index 000000000..a4849c5d4
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room14/map.bin
@@ -0,0 +1 @@
+�������������������������2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�23	����2�2333�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room2/border.bin b/data/layouts/FiveIsland_LostCave_Room2/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room2/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room2/map.bin b/data/layouts/FiveIsland_LostCave_Room2/map.bin
new file mode 100644
index 000000000..f89ec37f3
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room2/map.bin
@@ -0,0 +1,2 @@
+�����������������2��������2��2�2�2���������2�2�2�2�2�����2�2�2�2�2�2����
+3�2�2�2�2�23	����2�2�2�2�2��2�����2��2�2�2�2�������2�2�2�2��������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room3/border.bin b/data/layouts/FiveIsland_LostCave_Room3/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room3/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room3/map.bin b/data/layouts/FiveIsland_LostCave_Room3/map.bin
new file mode 100644
index 000000000..24073548c
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room3/map.bin
@@ -0,0 +1,2 @@
+�����������������2��������2�2�2�2�2�2�������2�2�2�2�2������2�2�2�2�2�2�2���
+3�2�2�2�2�23	����2�2�2�2��2�2������2�2�2�2�2�2�����2��2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room4/border.bin b/data/layouts/FiveIsland_LostCave_Room4/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room4/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room4/map.bin b/data/layouts/FiveIsland_LostCave_Room4/map.bin
new file mode 100644
index 000000000..af2e57bb2
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room4/map.bin
@@ -0,0 +1,2 @@
+�����������������2��������2�2��2�2��2�����2�2�2�2��2�2�����2�2�2�2�2�2�2���
+3�2�2�2�2�23	����2�2�2�2�2�2�2�����2��2�2�2�2������2�2�2�2��2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room5/border.bin b/data/layouts/FiveIsland_LostCave_Room5/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room5/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room5/map.bin b/data/layouts/FiveIsland_LostCave_Room5/map.bin
new file mode 100644
index 000000000..b8db9de80
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room5/map.bin
@@ -0,0 +1,2 @@
+�����������������2��������2��2�2�2�2�2�����2�2�2�2�2�2�������2�2�2�2�2�2���
+3�2�2�2�2�23	����2�2�2�2�2�2�2�����2�2�2�2�2�2�2�����2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room6/border.bin b/data/layouts/FiveIsland_LostCave_Room6/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room6/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room6/map.bin b/data/layouts/FiveIsland_LostCave_Room6/map.bin
new file mode 100644
index 000000000..ddf7f4402
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room6/map.bin
@@ -0,0 +1,2 @@
+�����������������2����������2�2�2�2������2�2�2�2�2��2������2�2�2�2�2�2���
+3�2�2�2�2�23	����2�2�2�2�2�2�2�����2��2�2�2�2�������2�2�2�2��2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room7/border.bin b/data/layouts/FiveIsland_LostCave_Room7/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room7/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room7/map.bin b/data/layouts/FiveIsland_LostCave_Room7/map.bin
new file mode 100644
index 000000000..ff3353201
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room7/map.bin
@@ -0,0 +1,2 @@
+�����������������2��������2�2��2�2��2������2�2�2�2�2������2�2�2�2�2�2�2���
+3�2�2�2�2�23	����2�2�2�2�2�2�2�����2�2�2�2�2�2�������2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room8/border.bin b/data/layouts/FiveIsland_LostCave_Room8/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room8/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room8/map.bin b/data/layouts/FiveIsland_LostCave_Room8/map.bin
new file mode 100644
index 000000000..452a62af2
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room8/map.bin
@@ -0,0 +1,2 @@
+�����������������2���������2�2�2�2�2�2�����2�2�2�2�2��2�����2�2�2�2�2�2�2���
+3�2�2�2�2�23	����2�2�2�2�2�2�2�����2��2�2�2�2�2�����2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room9/border.bin b/data/layouts/FiveIsland_LostCave_Room9/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room9/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_LostCave_Room9/map.bin b/data/layouts/FiveIsland_LostCave_Room9/map.bin
new file mode 100644
index 000000000..ec3f1ac6e
--- /dev/null
+++ b/data/layouts/FiveIsland_LostCave_Room9/map.bin
@@ -0,0 +1,2 @@
+�����������������2����������2�2���������2�2�2�2��2�����2�2�2�2�2�2�2���
+3�2�2�2�2�23	����2�2�2�2�2�2�2������2�2�2�2�2������2��2�2���2������������������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_Meadow/border.bin b/data/layouts/FiveIsland_Meadow/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/FiveIsland_Meadow/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/FiveIsland_Meadow/map.bin b/data/layouts/FiveIsland_Meadow/map.bin
new file mode 100644
index 000000000..6126a6fa4
--- /dev/null
+++ b/data/layouts/FiveIsland_Meadow/map.bin
@@ -0,0 +1,5 @@
+����������������������++++++++��+���������
+
+
+
+++��+++++�������������313131313141+++++++��$%$'0
0
00
0	0u)+++��+��
00
00
0
0
0
00	031313141��+����$'	0
0
00000
0
0
0	00003141+����0
0
0
0
00000	0
0
000u)����00	0
0
0&%$%00
0
00u)����0	000	000
0
0&%
0
0
0u*yy�0�0yy�
0
0
0	0$'
0
0
0u*111111�0000
0
0
0
0
0u*��111111�
0
0000u*��#!�����
0
00u*+�s
0
0&'	0u*+�s
0
0
0
00u�+,s00
000u��,s������0	00u*+��,s������000u*+��,s������0	00u*+��,s��������0�0z�s$%�����r
0
0
0+s0	000	0
0r
0
0
0*+�,{�0&%0	000r
0
0
0*+�
0$
x�0y�00r
0
00*+0	00p
0	0&%r
0
00*+000p
000
0&'r0	00*++,0	00p&%$'	00	00
0
0r000*++0##$x||�
00000
0�z0	00*++��+++0##!s0
00	0
0	0r0000*++��++++,xyy�0�0yyz0	0*++++++++,
00000000&'00*++++++++,
0
000000	00	0*++++++++,
0&'
00	00000*+�+++++,
0
0
0
0
00&'00	0"1+�+++++0###########1+++��++��++++++++++++++++����++����++++��++++���+++����++��������������
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_MemorialPillar/border.bin b/data/layouts/FiveIsland_MemorialPillar/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/FiveIsland_MemorialPillar/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/FiveIsland_MemorialPillar/map.bin b/data/layouts/FiveIsland_MemorialPillar/map.bin
new file mode 100644
index 000000000..a5aae1ecc
--- /dev/null
+++ b/data/layouts/FiveIsland_MemorialPillar/map.bin
diff --git a/data/layouts/FiveIsland_ResortGorgeous/border.bin b/data/layouts/FiveIsland_ResortGorgeous/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/FiveIsland_ResortGorgeous/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/FiveIsland_ResortGorgeous/map.bin b/data/layouts/FiveIsland_ResortGorgeous/map.bin
new file mode 100644
index 000000000..aaf0ec4db
--- /dev/null
+++ b/data/layouts/FiveIsland_ResortGorgeous/map.bin
@@ -0,0 +1 @@
+�����������������+��+����+++����+++++����������������������������+++++++++++��������++++++����������������++++++++++++��++++����++++����+++++++����������+++++����++++1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
11����+++++��������������+����++++��++++1
1%1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�11+++++++++++++�������++��++++++++++++++++111�10����������������11++++++++++++++������++++1
1
1
11+++++++++1
1%111�1	0�000���11+��++��++++����++����++++1%1���1+++++++++11111�10�000&'���11+��++��++++��++��++��+��+++11�q�&11++++++1
1%11111�1
0���0�0�0�
���11++++++++++++1
1
1
11++��+��+++1-1�|�.11+++++1%1111111�1�10	0�0�0�0��0	00i����11+++++++++1%1���&11+����+��++++1-1111++++++111-111111�1�1
0�0�0�0�0�0�0�0�0�00	00�1�11+++++++++1�squ�&11����+��+++1111+++++++++11-11111�1�1�0�0�0�0�0�0�0�0�0
0�1�1�1.11+++++++++1�squ�11���++++++++++++++++++++111-111�1�1�1�1�1�1�1�1�1�1�1�1.111++++++++++1�{|}�11���+++++++++++++++++++++++1111111111111111+++++++��+++++1�y�0y�.11���+++��+++++++++++++++++++++++++++++++++++++++++��+++++1-111111+�����+++��+++++++++++++++��++++++++++++++++++++++++++++++111111+�����++++++++++++++����++++++++++++��+��+++��+++++++++++���++++++++++++++++��++++��++++��+����+++��++++++����+++��+++++++++++++++++++��+++++++��+++++����++�++��++++++++++++++������++++����������++++���++����++��
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_ResortGorgeous_House/border.bin b/data/layouts/FiveIsland_ResortGorgeous_House/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FiveIsland_ResortGorgeous_House/border.bin
diff --git a/data/layouts/FiveIsland_ResortGorgeous_House/map.bin b/data/layouts/FiveIsland_ResortGorgeous_House/map.bin
new file mode 100644
index 000000000..f313d50eb
--- /dev/null
+++ b/data/layouts/FiveIsland_ResortGorgeous_House/map.bin
diff --git a/data/layouts/FiveIsland_RocketWarehouse/border.bin b/data/layouts/FiveIsland_RocketWarehouse/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FiveIsland_RocketWarehouse/border.bin
diff --git a/data/layouts/FiveIsland_RocketWarehouse/map.bin b/data/layouts/FiveIsland_RocketWarehouse/map.bin
new file mode 100644
index 000000000..aef63eaf1
--- /dev/null
+++ b/data/layouts/FiveIsland_RocketWarehouse/map.bin
@@ -0,0 +1 @@
+������������������������������������������������������������2�2�2�2���������2�2�2�2�2��33�2�3�3����2�2�2���2�2�2�2�2�2�2���2�2�2���2�2�2���2���2�����2���2���2���2�2�2���2�2�2���2���2���2�2�2���2���2���2+3-3�2�2���2�2�2�2�2�2���2�2�2�3�2�2�2�2�3�2�2�3���2�2�2�2�2���2�2�2�2�2�2����2�2�������2�2�����2�2�2����2���������2�2�����2�2�����2�2�2����2���������2�2�23
3�2�2��2�2�2�2�2�2�2�2�2����2�2(3*3�3�3����2�2�2�2�2�2���2�2�2�2�2��2�2�2����2�2�2�2�����2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�����2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2����2�2���2�2�2�2�2�2���2�2�2�2�2����2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�����2�2������2�2�2��2�2�2�2���2�2�2�2�2�2�2������2�2����2�2�2�2��2��2�2����2�2�2�2��2�2���2�2�2�2�2
3���2�2�2�2��2�2�2�2����2�2�2�2��2�2�2�2�2�2�2�2�2�2���2�2�2�2��2�2�2�2�2�2��2�2�2�2������2�2�2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2����2�2���2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2���2�2���2�2������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2���2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2���2�2��2�2�����������2�2�2�2���2�2�2�2�2�2����2�2�2����2�2�2�2�2�2�2�2�2�2�����2�3�3�3�2�2�
\ No newline at end of file
diff --git a/data/layouts/FiveIsland_WaterLabyrinth/border.bin b/data/layouts/FiveIsland_WaterLabyrinth/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/FiveIsland_WaterLabyrinth/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/FiveIsland_WaterLabyrinth/map.bin b/data/layouts/FiveIsland_WaterLabyrinth/map.bin
new file mode 100644
index 000000000..66a91da60
--- /dev/null
+++ b/data/layouts/FiveIsland_WaterLabyrinth/map.bin
@@ -0,0 +1 @@
+���������������������++����������+++���++++++++++��+++��++������++��+++������+++++++++++++��+++++++++��+��++����++��+++����+++++++++��++����+++++��+++++�����+++++��++++++++++����++++++++++��+++++++��+++++�����+++++++++����++++++++++��+++++++��++++++++++++++++++++������+++++++++++++����+++++++++++++++++��++++++++++++++++++����+++(213131313131313141)+++��++++��++++++++++++++++++++++++++++�����+++,0	0�0�0�0�0�0�00*+++��++����++++++++++++++++++++��++�������+++,00�0�01�0�01�0*+++++++++����++++++++++++++++++++��+��������+++0$000�01�0�0�03141)++++++++++��++++++++++++++++��++++++++��++��������++��++0#$00�01�0�000*++++++++++��++++++++++++++++��++++++��++�������+��++0$0	0�01�00	0*++++++++++++++++++++++++++++++++++++�����++++++,000�0�000*++++++++++++++++��++++++++++++�������++++,0	000	00	0*++++++++++++++��+��+++++++����������+++0#######1+++++++++��++++++��+++��++++++++������+��++++++++++++++++++++++++��++++��+++++++++��+++++++++���+����++++��++++��+++��+++++��+�����++++++��++�������+++����++++++��+++��++++++++�����++++++++��++++��������++++++++++���+++++++��������++++++++++++�������������������������++�����������++++++++++++��
\ No newline at end of file
diff --git a/data/layouts/FourIsland/border.bin b/data/layouts/FourIsland/border.bin
new file mode 100644
index 000000000..75f2c916c
--- /dev/null
+++ b/data/layouts/FourIsland/border.bin
@@ -0,0 +1 @@
+vvvv
\ No newline at end of file
diff --git a/data/layouts/FourIsland/map.bin b/data/layouts/FourIsland/map.bin
new file mode 100644
index 000000000..dd45ba9bd
--- /dev/null
+++ b/data/layouts/FourIsland/map.bin
@@ -0,0 +1 @@
+vOssqsqq{|||||�qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqvOssqsqqqqqqqq{|||||||||||||�qqqqqqqqqqqqqqqqqqqvOssq{||||�qqqqqqqqqqqqqqqqqsqqqqqqqqqqqqqqqqqqqvOssqqqqqq{|||||||||||||||�qsqqqqqqqqqqqqqqqqqqqvOs{|||��yyyyyyyyyyyyyyy�qsqsqqqqqqqqqqqqqqqqqqqvO{||y����������������pqsqsqqqqqqqqqqqqqqqqqqqvWeeG1���1�1�10
0
00�pqsqsqqqqqqqqqqqqqqqqqqqvsssO1��##�1�1�100
00####�pqsq{||�qqqqqqqqqqqqqqqqvvosO1��00�1�1�1
00�1�10000�pq{�qqq{|||||||||||||�qqvvvsO1��0
00
0
0
00�1�1�1000�pqq{||�qqqqqqqqqqqqqqsqqvvvsO1�$%�
0�2�2�2�2	00�1�1�1000�pqqqqq{||||||||||||�qsqqDEvsO1�y��	0����00��������������|||||||||||�sqsqqLMvsO111��0����0	0�000000������||||yy�0yy�ssqsqqvvvsO111��������	0�	00�����u����0�0�0�0	0pssqsqqvvvsO111�0	00	00	000	00&%$'0�����u����0�0�0�00pssqsqqvvvsO111�000000	0	00	0	00	00	0	00	00	0u���������sssqsqqvvvoO111�0	00	0000{1|1}1~1100000000u���������sssqsqqvvvvO111�0000000HIJK������	00	0u���������sssqsqqvvDEO111�0	00	00PQRS������000u���������sssqsqqvvLMO111�0000&'XYZ[������	00	0u313131313141���sssq{�qvvvvO111�0	00	0000`ab�������0003��������sssqqsqvvvvO111�000	00	00	000003131313131	00	0&'0�����u���sssqqsqvvvvO111�0	0000000000	00	00	0000000a1�����u���sssqqsqvvDEO111��0�0�0yyyy�0	00(0)0*0+0�2�2�2�2�200i�����r313131pssqqsqvvLMO11111111111�0000123�����0	00	0	0000r0	00pssqqsqvvvvO11111111111�0	0089:;�����00000000r	00	0pssqqsqvvvvO11111111111�000@Abc�����0	00	0	0000r000pssqq{�vDEvWkkkk�1�1�1kkG1�0	00	00	00	00	00	00	0�y�0�0yyz0	00ps{�qqsvLMvsssss�2�2�2ssO1�00000000000000r00�1�10	0�1�10psqsqqsvvvvvos�������O1�00	00000000000	0r0	0�1�10�1�1�10psqsqqsvvvvvvs�������O1�yyy�	0	0r00000�1�1	00psqsqq{vvvvDEs�������O11111�&%$%$%$'hi���qsqqqvvvvLMs�������WkkG11�yyy�hiii�qqqqqqqqqqqqqqsqqqvvvvvvs�������sssO111111�sqqqqqqqqqqqqqqqqqqsqqqvvvvvvossssssssssO111111�sqqqqqqqqqqqqqqqqqq{|||vvvvvvvDEvvvvvvvoWkkG111�{||||||||||�qqqqqqqqqqqvvvvvvvLMvvvDEvvvvvoWkkG�||||||||||�sqqqqqqqqqqqvvvvvvvvvvvvLMvvvDEvsssWeeeeeeeeeeGs{|||||||||||vvvvvvvvvvvvvvvvvLMvvvosssss^_ssssO{||||||||||||vvvvvvvvvvvvvvvvvvvvvvvvvvvvLMvvosWeeeeeeeeeeeee
\ No newline at end of file
diff --git a/data/layouts/FourIsland_IcefallCave_1F/border.bin b/data/layouts/FourIsland_IcefallCave_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FourIsland_IcefallCave_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FourIsland_IcefallCave_1F/map.bin b/data/layouts/FourIsland_IcefallCave_1F/map.bin
new file mode 100644
index 000000000..22cfdf42e
--- /dev/null
+++ b/data/layouts/FourIsland_IcefallCave_1F/map.bin
diff --git a/data/layouts/FourIsland_IcefallCave_B1F/border.bin b/data/layouts/FourIsland_IcefallCave_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FourIsland_IcefallCave_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FourIsland_IcefallCave_B1F/map.bin b/data/layouts/FourIsland_IcefallCave_B1F/map.bin
new file mode 100644
index 000000000..b3db8d893
--- /dev/null
+++ b/data/layouts/FourIsland_IcefallCave_B1F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������������K3K3K3?_������������2�2�2�2�2J3K3OK3K3K3K3_���������������2�2J3K3O?K3K3K3_��������������2��2^K3K3OK3K3K3_��������������2�2s^K3K3K3K3K3K3_s�����������2�2�2�2�2BK3K3K3K3K3K3L3�2�����������2�2�2�2�2BK3?K3K3K3K3_s�����������2�2�2�2�2^K3K3K3GK3K3L3�2�����������2�2�2�2�2^K3K3?K3?K3D�2�����������2�2�2�2�^K3K3K3K3K3K3_�2�����������2�2�2�2�2^K3K3K3K3K3K3_�2�����������2�2���^K3HIK3K3K3L3�2�����������2��2�2�2R\t�S3S3\T�V��������U�����2�2�2��2�2�2�2�2��V������U����U���2�2�2�2�2��V�����������U�����2�2�2��V��V������������U�U���V���V��������������U�����V�����
\ No newline at end of file
diff --git a/data/layouts/FourIsland_IcefallCave_Back/border.bin b/data/layouts/FourIsland_IcefallCave_Back/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FourIsland_IcefallCave_Back/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FourIsland_IcefallCave_Back/map.bin b/data/layouts/FourIsland_IcefallCave_Back/map.bin
new file mode 100644
index 000000000..aa44dd119
--- /dev/null
+++ b/data/layouts/FourIsland_IcefallCave_Back/map.bin
@@ -0,0 +1 @@
+++++++++++++++++++++++++++++++++++++�+++++++++++++����U�+++++++++++�V��������)+++++(����������*+++,���������U�++++++++,������������)++++++++++�V�������U���*+++++++++(���V�������U��*+++++++++,��V�����������*+++++++++,��������������*+++++++++,��������������*+++++++++,�������������U�+++++++�V�����������U��gj3k3k3k3k3k3l3f��V���������������2�2�2�2�2�2�2������������������p�2�2�2�2�2�2���������������U���2�2�2�2�2�2q��V��������������U�or�2�2n�V���������������U����2�2q���V�������������������2�2�2�����������������������2�2�2�����������������������2�2�2����������������������p�2�2���������������������U���V�������������������U�����V���������
\ No newline at end of file
diff --git a/data/layouts/FourIsland_IcefallCave_Entrance/border.bin b/data/layouts/FourIsland_IcefallCave_Entrance/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/FourIsland_IcefallCave_Entrance/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/FourIsland_IcefallCave_Entrance/map.bin b/data/layouts/FourIsland_IcefallCave_Entrance/map.bin
new file mode 100644
index 000000000..b37ddd800
--- /dev/null
+++ b/data/layouts/FourIsland_IcefallCave_Entrance/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����������������2�2�2�����������2�2����������������2�2������������2�2����������������2�2������������2�2����������������2�2������������2�2����������������2�2�2�2�2�2�2������2�2�2��>�������������2�2�2�2�2�2�2#���"�2�2�2����������������������'''''�������������������������/////�������������������������/////�������������������������/////�������������������������/////�������������������������/////�������������������������77777����>����������������2�����������������������������2�2�2�2�������������>�������������2�2�2�2���������������������������2�2�2�2���������������������������������������������������������������������==�=��������������������������==�=��������������������2�2�2�2�2�2�==�=��������������������2�2�2�2�2�2�==�=��������������������2�2�2�2�2�2�==�=������������U������������V==�=�����������U��������������V��=����������U����������������V�=�����������������������������=�����U��������������������������V�
\ No newline at end of file
diff --git a/data/layouts/FourIsland_LoreleisHouse/border.bin b/data/layouts/FourIsland_LoreleisHouse/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FourIsland_LoreleisHouse/border.bin
diff --git a/data/layouts/FourIsland_LoreleisHouse/map.bin b/data/layouts/FourIsland_LoreleisHouse/map.bin
new file mode 100644
index 000000000..5ce78023d
--- /dev/null
+++ b/data/layouts/FourIsland_LoreleisHouse/map.bin
@@ -0,0 +1 @@
+
`5�� h���2�2��2�2�2�2�2�2�2�2�2��B��2�2�2�2�2���2�2��2�2���2�2���2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/FourIsland_PokemonDayCare/border.bin b/data/layouts/FourIsland_PokemonDayCare/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FourIsland_PokemonDayCare/border.bin
diff --git a/data/layouts/FourIsland_PokemonDayCare/map.bin b/data/layouts/FourIsland_PokemonDayCare/map.bin
new file mode 100644
index 000000000..d7207d8ff
--- /dev/null
+++ b/data/layouts/FourIsland_PokemonDayCare/map.bin
@@ -0,0 +1 @@
+���������������b�33333�2�2�2�2�2�2    !3�2�2�2�2�2�2�2"3�2�23�2	3��	3�2��2�2�2�2�2�2	3��	3�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/FuchsiaCity/border.bin b/data/layouts/FuchsiaCity/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/FuchsiaCity/border.bin
diff --git a/data/layouts/FuchsiaCity/map.bin b/data/layouts/FuchsiaCity/map.bin
new file mode 100644
index 000000000..e1517ef1d
--- /dev/null
+++ b/data/layouts/FuchsiaCity/map.bin
@@ -0,0 +1 @@
+������������������$%$%$%$%$%$%$%$%$%$%������$%$%$%$%$%$%$%$%$%���������������������������������������������0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00������
0
0	0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2�2�2�2�2�2�2�2�2�2�2�2�2�2�0�0	0	0�2�0�2
00000�2�2�2�2�2�2�2�2�2�2�2�2�2�0�0�0�0�0���������������0�0��0�0�0���	00��������������0�0�0�0�0���������0�0�0�0�0��0�00	000	000	0
0
0��0�0�0�0���0�0�0�0�0��0�0�0�0�0�34445���0�0�0�0�0��0�00000000000��0�0�0�0���0�0�0�0�0��0�0�0�0�0�888889��������0�000
0��������������0�0�0�0�000000000�0�0�0�0�0�0�0�00�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0	00	00(0)0*0+0�0�0�0�0�0�0�0�00�0�0�0�2�2�2�2�2�2�0�2�2�2�2�2�2�2�2�2�0�0�0�0�0�0�000000123
0�0�00������0���������00�0�0�0�0�0	00	0089:;0000000000�0�00������	0��0�0�0�0�0�0�0�	00�0�0$'�0�0�0�0�0�0�0@Abc0000000000�0�0�������0��0�0�0�0�0�0�0�00�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�������	0���������	00�0�0���������2�2�2�2�2�2�2�2�2�0�0�0�0�0�0�0�0�
0�0�0�00
00�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�����������0000000��0�0�0�	0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0����������	00000000�0�0�0�000��������������&%�0�0�0�01�0�0����������000000	0	0�0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0��00�0�0�0��3444445�	00	000000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0	00�0�0�0�6666666666������
0�0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�000�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�00��66666666670	0000	00�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00�0	00�������?00	00	0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00�00
0�������?0	00	0hiiiiiiiiiiiiiiiiiiiiiiij00�0	0031313131313131?0000pqqqqqqqqqqqqqqqqqq�����r00�000
00	0�0�0�0
0�0	00	0pq�����������������HIJK�r00��2�2�2�2�2��2�2�2��0000xyABBBBBC����������PQRS�z00������������0	00	0�
0IJJJJJK����������XYZ[��00a1����������00000�`1PQRSTUV����������`ab���00i����������0000	0�hX1Y1Z[\]1^1�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0000000000000	00	000��0�0�0�0�0�0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00�����
0
0
0����0	00	0��0�0�0�01�01�0�0�0�0�0�0�01�01�0�0�0�0�0�0�0	0	00	00	00	00	00	00	0000������0�0�0hiiiiij�0�0�0��������0000000000000000	000000�0�0�0pklllmr�0�0�0	00	00	00	0����������������0000000000psqqqur0000000000hiiiiij0000000000psqqqur0	00	00	00	00	0pklllmrpsqqqur0000000000psqqqur
\ No newline at end of file
diff --git a/data/layouts/FuchsiaCity_Building1/border.bin b/data/layouts/FuchsiaCity_Building1/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FuchsiaCity_Building1/border.bin
diff --git a/data/layouts/FuchsiaCity_Building1/map.bin b/data/layouts/FuchsiaCity_Building1/map.bin
new file mode 100644
index 000000000..4efd7d891
--- /dev/null
+++ b/data/layouts/FuchsiaCity_Building1/map.bin
@@ -0,0 +1 @@
+��������������������������M1N1M1N11111111111	1	1	1�2�2�2�2	1	1�2�2�2rf	1#1����%1	1���zn	131�2�2�2�251	1�1�s1	1	1	1	1	1	1	1	1	11111	1	1	1	1	1	1	1	1	1	1	1	1V1	1	1	1	1	1	1	1	1	1	1	1U1^	1	1	1	1?1G1O1	1	1	1	1]
\ No newline at end of file
diff --git a/data/layouts/FuchsiaCity_Gym/border.bin b/data/layouts/FuchsiaCity_Gym/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FuchsiaCity_Gym/border.bin
diff --git a/data/layouts/FuchsiaCity_Gym/map.bin b/data/layouts/FuchsiaCity_Gym/map.bin
new file mode 100644
index 000000000..390ee14be
--- /dev/null
+++ b/data/layouts/FuchsiaCity_Gym/map.bin
@@ -0,0 +1 @@
+�������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2��2�2�2�2�2�2�2�2�2�2���2�2��2�2�2����2�2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2��2�2��2�2�2�2��2�2�����2�2�2��2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2���������2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2��2�2�2�2�2�2�2��2�2�2�����2�2�2�2�2�2�2��2�2�2�2�2�2��2�2�2�2�2�2�2��2�2�2�2�2�2����������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���
\ No newline at end of file
diff --git a/data/layouts/FuchsiaCity_House2/border.bin b/data/layouts/FuchsiaCity_House2/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FuchsiaCity_House2/border.bin
diff --git a/data/layouts/FuchsiaCity_House2/map.bin b/data/layouts/FuchsiaCity_House2/map.bin
new file mode 100644
index 000000000..83ebe0b15
--- /dev/null
+++ b/data/layouts/FuchsiaCity_House2/map.bin
@@ -0,0 +1 @@
+��bcd�������jk1l�����111111112121V1	1	1	1	1	1	1	1	1	1^	1	1	1	1#1$1$1$1%11	1	1	1	1+1&1()-1V1	1	1	1	1+1,101-1^	1	1	1	131414141511	1?1G1O1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin b/data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin
diff --git a/data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin b/data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin
new file mode 100644
index 000000000..e84271730
--- /dev/null
+++ b/data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin
@@ -0,0 +1 @@
+��������������2��������2�2�2�����2��2�2�2��2���2��2�2�2��2���2��2�2�2��2�2��2��2�2�2��2���2��2�2�2��2�
\ No newline at end of file
diff --git a/data/layouts/FuchsiaCity_ZooBuilding/border.bin b/data/layouts/FuchsiaCity_ZooBuilding/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/FuchsiaCity_ZooBuilding/border.bin
diff --git a/data/layouts/FuchsiaCity_ZooBuilding/map.bin b/data/layouts/FuchsiaCity_ZooBuilding/map.bin
new file mode 100644
index 000000000..d18ddbd61
--- /dev/null
+++ b/data/layouts/FuchsiaCity_ZooBuilding/map.bin
@@ -0,0 +1 @@
+�����������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�����2�2�2�2�2�2�2�2�2�����2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2������������������2�2�2���������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��
\ No newline at end of file
diff --git a/data/layouts/House1/border.bin b/data/layouts/House1/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/House1/border.bin
diff --git a/data/layouts/House1/map.bin b/data/layouts/House1/map.bin
new file mode 100644
index 000000000..7fb8f8319
--- /dev/null
+++ b/data/layouts/House1/map.bin
@@ -0,0 +1 @@
+�������aapq�����5�iixyH1I11111111111	1	1#1$1$1$1$1%1	1	11	1	1+1&1()'1-1	1	11	1	1+1&101'1-1	1	1V1	1	1314141414151	1U1^	1	1?1G1O1	1	1	1	1]
\ No newline at end of file
diff --git a/data/layouts/House2/border.bin b/data/layouts/House2/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/House2/border.bin
diff --git a/data/layouts/House2/map.bin b/data/layouts/House2/map.bin
new file mode 100644
index 000000000..2f2d83996
--- /dev/null
+++ b/data/layouts/House2/map.bin
@@ -0,0 +1 @@
+  ./ -!" ��1267(5)*(��90:0>0?0	0=0	0	0	0	0	0	0
0
0C0D0D0D0D0F0
0
0	0
0
0S0K0LMN0V0
0
0	0
0
0S0K0TUN0V0
0
0W0
0
0[0\0\0\0\0^0
0G0_
0
0000
0
0
0
0O44444444
\ No newline at end of file
diff --git a/data/layouts/House3/border.bin b/data/layouts/House3/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/House3/border.bin
diff --git a/data/layouts/House3/map.bin b/data/layouts/House3/map.bin
new file mode 100644
index 000000000..73c6abf89
--- /dev/null
+++ b/data/layouts/House3/map.bin
@@ -0,0 +1 @@
+"
89*!@A211111111H1I11V1	1	1	1	1	1	1	1	1	1	1^	1	1	1o1efg1	1	1	11	1	1	1o1mng1	1	1	1V1	1	1	1	1	1	1	1	1	1	1^	1	1?1G1O1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/House4/border.bin b/data/layouts/House4/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/House4/border.bin
diff --git a/data/layouts/House4/map.bin b/data/layouts/House4/map.bin
new file mode 100644
index 000000000..f74c83441
--- /dev/null
+++ b/data/layouts/House4/map.bin
@@ -0,0 +1 @@
+
`` h h111111111111	1	1	1	1	1	1	1	1	1	1V1	1	1	1o1efg1	1	1	1^	1	1	1o1mng1	1	1	1V1	1	1	1	1	1	1	1	1	1	1^	1?1G1O1	1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/House5/border.bin b/data/layouts/House5/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/House5/border.bin
diff --git a/data/layouts/House5/map.bin b/data/layouts/House5/map.bin
new file mode 100644
index 000000000..4daf805f7
--- /dev/null
+++ b/data/layouts/House5/map.bin
@@ -0,0 +1 @@
+���a����apq���i�5��ixy�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0���0�0�0�0�0�0�0�0�0���0�0�0�0�0�0�0�0�0�0�0�0�0�0�0��0�0�0�0�0�0�0�0�0�
\ No newline at end of file
diff --git a/data/layouts/IndigoPlateau_Exterior/border.bin b/data/layouts/IndigoPlateau_Exterior/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/IndigoPlateau_Exterior/border.bin
diff --git a/data/layouts/IndigoPlateau_Exterior/map.bin b/data/layouts/IndigoPlateau_Exterior/map.bin
new file mode 100644
index 000000000..2bfc01f42
--- /dev/null
+++ b/data/layouts/IndigoPlateau_Exterior/map.bin
diff --git a/data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin b/data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin
diff --git a/data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin b/data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin
new file mode 100644
index 000000000..9a9319f8e
--- /dev/null
+++ b/data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin
diff --git a/data/layouts/Island_Harbor/border.bin b/data/layouts/Island_Harbor/border.bin
new file mode 100644
index 000000000..536a722ec
--- /dev/null
+++ b/data/layouts/Island_Harbor/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/Island_Harbor/map.bin b/data/layouts/Island_Harbor/map.bin
new file mode 100644
index 000000000..353d5f450
--- /dev/null
+++ b/data/layouts/Island_Harbor/map.bin
@@ -0,0 +1 @@
+�������������������������������������������2���������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�������#####!��2�2�2� #####+++++,���2��*++++++++++0#����1+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++�����������������
\ No newline at end of file
diff --git a/data/layouts/LavenderTown/border.bin b/data/layouts/LavenderTown/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/LavenderTown/border.bin
diff --git a/data/layouts/LavenderTown/map.bin b/data/layouts/LavenderTown/map.bin
new file mode 100644
index 000000000..9bba130ef
--- /dev/null
+++ b/data/layouts/LavenderTown/map.bin
@@ -0,0 +1 @@
+qqqqqqqr
0	00	0	0ps�������uqqqqq����10000ps�������uqqqq�HIJK�	00	0	0ps�������uqqqqrPQRS�0000ps�������uq�yyzXYZ[�	00	0ps�������uqr	00	0`ab��000
0p{'�89:�4}qr000
0b1c1d1
0	00	0
0xy/@3B5�qr	00	0
0r1s1t1	0
0
0
00	00	0b1c1c1c1d1pqz0000000�2�2�2�2�2000r1s1s1s1t1	0pq
0	00	00	00	0�����	00	0	00	00	00pq
00000000�����	00
00000	00pq
0	00	00	00�����00	00	0000pq�0	00
00
00	0b1c1d1	00	00	00(0)0*0+0pqj	00�2�2�2�2�2�2�2�2�2�2000000123pqr00����������	0	00	0089:;pqr	00����������00
0
0
0@Abcpqr00����������	00	0b1c1c1c1c1d1pqr	0b1c1c1c1c1c1c1c1c1c1d1000r1s1s1s1s1t1pqr0r1s1s1s1s1s1s1s1s1s1t1	00	00	00	00	0pq�iiiiiiiiij0
0hiiiiiiii�q
\ No newline at end of file
diff --git a/data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin b/data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin
diff --git a/data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin b/data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin
new file mode 100644
index 000000000..3e5dc6dda
--- /dev/null
+++ b/data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin
@@ -0,0 +1 @@
+���#$����������%&5�������2�2�2(3)3�2
3�2��2�2�2�2�2�2�2�2�2�2�2��2�2��2�2�23��3�2�2�2���2�2�23��3�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/Mart/border.bin b/data/layouts/Mart/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Mart/border.bin
diff --git a/data/layouts/Mart/map.bin b/data/layouts/Mart/map.bin
new file mode 100644
index 000000000..dee537e49
--- /dev/null
+++ b/data/layouts/Mart/map.bin
@@ -0,0 +1 @@
+�������������������������2��2�2�2�2�2�2��2�2���2�2�2�2�2�2�2�����2�2�2���2��2�2�2�2�2�2�2���2��2���2�2�2�2���2��2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/MtEmber_Exterior/border.bin b/data/layouts/MtEmber_Exterior/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/MtEmber_Exterior/border.bin
diff --git a/data/layouts/MtEmber_Exterior/map.bin b/data/layouts/MtEmber_Exterior/map.bin
new file mode 100644
index 000000000..28f5cc749
--- /dev/null
+++ b/data/layouts/MtEmber_Exterior/map.bin
@@ -0,0 +1 @@
+SQQSQSQSQSQSQSSQSSQSQSQSQSSSW�3�3UUUQUQUQUQUQUQUQUQUQUQUQUQSQQSQSQSQSQ[5SSQSSQSQSQSQSSS�3�3WUUUQUQUQUQUQUQUQUQUQUQUQUQSQQSQSQSQ[5QSS[5SSQSQSQ[5SS[\�\]UU4]QUQUQUQUQUQUQUQUQUQUQ[5QSQSQ[5QSQSSQSSSQ[5[5QSS[\\�\\]UUQ4]4]QU4]QUQUQUQUQUQUQQSQSQ[5QSQSQSSQSSSQQSQSQS[\\\�\\\]UQUQUQQUUQ4]QUQUQUQUQUQQSQ[5QSQSQ[5S>5SSSQQSQSQ[\\\\�\\\\]QUQUQQUUQUQ4]QUQUQUQUQQ[5QSQSQ[5QSS�36SSSQQSQ[\\\\\\�\\\\\\]QUQQUUQUQUQ4]QUQUQUQ5QSQSQ[5QSQSS�36SSSQQ[\\\\5�3�3W�1�3�3�34\\\\]QQUUQUQUQUQ4]QUQUQSQSQ[5QSQSQSS�36SS>YYYYY5QS�3�3�3�3�3W�3UQQQQQQQUUQUQUQUQUQ4]QUQ[5[5QSQSQSQSS�36SS�3�3�3�3�3�36QS�3W�3�3�3�3�3U4YYYYYY]UQUQUQUQUQUQ4]QQSQSQSQSQ[5SS�36SS�3�3�3�3�3�3>5S�3�3�3�3�3W�3U7�3�3	00	0�34]QUQUQUQUQUQUQ4QSQSQSQ[5QSSS�36SS�3�3�3�3�3�3�36[\\5�34\\]7�3�3}3}3}3�3UQQUQUQUQUQUQUQUQSQSQ[5QSQSSS�36S[�0�0\\5�3�3>Y5Q[�0]Q4Y?�3W�3�3�3�3UQ4]QUQUQUQUQUQUQ[5[5QSQSQSSS�36[\�0�0\5S�3�3�3�3>YY�0YY?�3W�3�3W�3�3WUQUQ4]QUQUQUQUQU5QSQSQSQSQSSS�3>YY�0�05SS�3�3�3�3�3�3�3�3�3W�3�3�3�3�3cddeU4]QUQ4]QUQUQUQUSQSQSQSQSQSSS�3�3�3�3�3�36S[\\5�3�3�3�3�3�3�3�3�3WW�3�3�3�3WUU4\]QUQ4]QUQUQUSQSQSQSQSQSSS�3�3�3�3�3�36[\\5S�3�3W�3�3�3�3�3�3�3�3W�3�3W�3UUU4\\]QUQ4]QUQUSQ[5[5SQSQSS[\\\\5W>\\5S[5�3�3�3�3�3�3W�3�3�3�3�3�3�34]UUU4\\\]QUQ4]QU[5QSQSSQSQSSQQQQQ[\\\5S[5[\\\�0�0\\\\\\\\\]4]UUUQQQ4\]QUQ4]QSQSQSSQ[5S[\\\5QQQQQS[5[YYYY�0�0YYYYYYYYF3Y?4]UUQ4Y]QQ4]4]QQSQSQS[5QSSQQQQ[\\\\5[5[\5�3�3�3�3�3�3�3�3�3�3�3~30	0�3�3U4]UQO04\\]QUQ4QSQ[5SQSQS[\\5QQQQQQ[5SQQS�3�3�3�3�3�3�3�3�3�3�3�3}3}34\]UQUQO0UQQQ4]4]Q[5QSSQSQSQQQ[\\\\5QQSSQQ[\\\�0�0\\\5�3�34\\]QQU4]QO0UQ4\]QUQ5QSQSSQSQSQ4\\\\5Q[5QSSQQ4YYY�0�0YY5S�3�3UQQQ4\]UQ4G0UQUQQ4]4SQSQSSQ[5SQU4\F35[5QSQSSQQ7�3�3�3�3�3�3�36[\\]Q4\]QQUQO00UQU4\]QUSQSQS[\5SSQUO0	0NQSQSQSSQQ7�3�3�3�3�3�3�36QQQQQUQ4\\]QO
04]QUUQQ4]SQSQSQQSSSQUO	00NQ[5SQSSQQ7dddddddTQQ4\\]QU4\\\G0UQ4]UQ4]QSQSQSQQSS[\]U}3~3E5QSSQS[\\?�3�3�3�3�3�3�3>\\]Q4\\]O0
0
00
0UQUQUQUQ4[5[5[\5SSQQQU�3�3}36QSSQ[\\\5�3�3�3�3�3�3�34\\\\]QQ4G
0
00
04]QUQUQUQUQSQSQQSS>\\\?�3�3�36QSSQQQQQ[\5�3�3�3�34]QQQQQ4YG
00
04\]Q4]QUQUQUQSQSQQSS�3�3�3�3�3�3�3�36QS>YYYY5QQ[\�0�0\]QQQ4YYG0
00
04]QQ4]Q4]QUQUQ[5SQQSE\\\\5�3�3�36QS�3�3�3�3�3>YYYY�0�0YYYYY?�30
00
0
0
0UQ4\]Q4]Q4]QU5QS[\5SV	00	00N�3�3�36QS�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�30
0
0
0
00UQUQ4\]Q4]Q4]SQSQQSS00000N�3�3�36QS�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3	04\\\\\]QUQUQ4\]Q4]QSQ[5QSEY�0�050E\5�36Q[�0�0\YYY�0�0YYYYYYYYY\\]QQQQQQ4]4]QUQ4\]QQ[5QSQSV
0	0
0N0	00N�3EYY�0�05�3�3�3�3�3�3g�3�3�3�3�3�3�34\\\\\\\\]QUQ4]QUQQQQQSQSQ[5	0
0
0N0	00N0	00	00	0N0	0�3�3�3�3f�3�3�3	00	0�3UQQQQQQQQ4\]QUQ4]QQQQQSQSQQS
0
0
0N000N000000N00000�3f�3�300	000UQQQQQQ4\]QQ4]QUQQQQQQSQ[\5S
0
0
0EY50EYYY�0�05S0	00	00�3o�3�3	00	004]Q4\\\\]4\\\]Q4]QQQQ4Q[5QQSSV
0
0
0VN0	00	00	0	0N[\\\�0�0\\\\\�0�0\]4Y]Q4YY\]QQQ4\]QQ4\\]5QSQQSS
00
00
0N0000000EYYYY�0�0YYYYY�0�0YY]Q4YG004\\\\]QQ4\]QQQSQSQQSS
0
00
00EYY5	00	00
00
000
0
0
0
0000	00	004YG	0	00	0UQQQQ4\\]QQQQQSQ[\5S[50
00	00	00N0	00
0
0
00
0
00
0
0
00000000O000000UQ4\\]QQQQQQQQ[5QQSSQ[\5
00000N00
00
0
0
0
0
0
0
00	0
00hiiijO00	0	00	0UQUQQQQQQ4\\\\QSQQS[5QQS0	00	00EYYYYYYYYYYYYYY50	00	00O0004\\]QUQQQ4\\]QQQQQ[\5SQ[\5S000000V000	0	000	00	00	00EY�0�0YYG00	0UQQQQU4\\]QQQQQQQ5QQS[5QQS[\\5	00000000V000000|3}3~3	000	0000	04]4\\\]UQQQQQQQ4\\SQQSQ[\5[\\5[\\\\\\\\500	00	0|3�3�3�3}3~3	00	0	000UQUQQQQUQQQQ4\\]QQSQQ[5QQ[\\5[\\5QQQQQQ[\5`ab�3�1�1�3^_b4\\\\]4]4\\\]Q4\\]QQQQQ[\5Q[\5QQQ[\5Q[\\\\\\\5SSQU4��5SQUU4\\\\]QUQQQQQUQQQQQQ4\QQ[5QQ[\\5QQ[\\\\\\5QQSSSQU7��6SQUUUQ4\\\\]Q4\\\]QQQ4\\]Q5QQ[\5QQQ[\\\\\\\5Q[5QSSSQU7��6SQUUUQUQQQQQ4]QQQQ4\\]QQQ4[\5QQ[\\5QQQQQQQQSQQSQSSSQU7��6SQUUUQUQ4\\\]Q4\\\]QQQ4\\]QQSQQQQQ[\\\\\\5Q[5QSQSSSQU7��6SQUUUQUQUQQQQ4]QQQQ4\\]QQQ
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_1F/border.bin b/data/layouts/MtEmber_RubyPath_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_1F/map.bin b/data/layouts/MtEmber_RubyPath_1F/map.bin
new file mode 100644
index 000000000..bfa5e7637
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_1F/map.bin
@@ -0,0 +1 @@
+�����������������������������2�2�������������������+������2�2����+���������������������2�2��������������������������2�2�����������)�������2�2�2�2�2���2�2�2�2�2���������������2�2�2�2�2�2���2�2�2�2�2���������������2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������2��)����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�!3�������������������2�2�2�2�2�2�2��2�������+����������#3�2�2�2�2�2�����������������)�����2�2�2�2�2��)����������������������2�2�2��������������������������2�2��������������������������2�2��������������������������2�2!3���������������������+���2�2�2������������������������#3�2�2������������������������������
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B1F/border.bin b/data/layouts/MtEmber_RubyPath_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B1F/map.bin b/data/layouts/MtEmber_RubyPath_B1F/map.bin
new file mode 100644
index 000000000..e92a27510
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B1F/map.bin
@@ -0,0 +1 @@
+������������������2������+����2�����������2�������2�2�2�2�2�������2�����������2���������!3�2����������2�2����������2�2���)������2�2����������2�2#3����������2�2����������2�2����������2�2�2�2��������2�2�2�2����������2�2�������+��2�2����������2�2����������2�2����������2�2!3���������2�2�2�2�2�2���������*��
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin b/data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin b/data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin
new file mode 100644
index 000000000..1ac916e78
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin
@@ -0,0 +1 @@
+�)��������2�2�����2�2�+���2������2�+��2�2�2����(���
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B2F/border.bin b/data/layouts/MtEmber_RubyPath_B2F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B2F/map.bin b/data/layouts/MtEmber_RubyPath_B2F/map.bin
new file mode 100644
index 000000000..09813c497
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B2F/map.bin
@@ -0,0 +1 @@
+�����������������������������2#3���������������2�2�2�����+��!3�2�2�2�2�2��2���������2�2��2��2��2������2�2�2�2�2��2�2�2�2�2������2�2�2�2�������2���2�2�2�2���������2�2���2�2�2�2���������2�2���(�����������2�2���������������(�
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin b/data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin b/data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin
new file mode 100644
index 000000000..4c7388aa5
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin
@@ -0,0 +1 @@
+���)�����+����2�2�������2�2������2�2����2�2�2�2�2����(��*��
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B3F/border.bin b/data/layouts/MtEmber_RubyPath_B3F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B3F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B3F/map.bin b/data/layouts/MtEmber_RubyPath_B3F/map.bin
new file mode 100644
index 000000000..882838538
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B3F/map.bin
@@ -0,0 +1 @@
+�������+����+��������������������)����������������)�����������������2�2�2��2�2�2�2�2����2������������������2�2�2�2���2�2���2�2�2�2���������������2�2�2�2�2�2��2�2�2�2�2�2�2��2�2�2�2������)������2�2�2�2!3�2�2�2�2��2�!3�����2�2������������������2�2�2���2�2������2�2�2�2�2�2�2�2�������+������(�����+����2����2�2�2�2�2�2����������������������2�������2�2�2�2���������������������2�������2��2�����������+����)�����2��+����2��2��������)�������������2�������2��2����+���������������2�2�2������2�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�������2���+���!3�2�2�2#3����*�������2�������2����������2���������������������2����������2����)�������)��������2���������2�2���������������������2�������#3�2�2�2��������������#3�2�2�2�2�2��������2�2�2!3�������������2�2�2�2�2�2�2���������������������������������+��+�������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B4F/border.bin b/data/layouts/MtEmber_RubyPath_B4F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B4F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B4F/map.bin b/data/layouts/MtEmber_RubyPath_B4F/map.bin
new file mode 100644
index 000000000..ea974a47e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B4F/map.bin
diff --git a/data/layouts/MtEmber_RubyPath_B5F/border.bin b/data/layouts/MtEmber_RubyPath_B5F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B5F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_RubyPath_B5F/map.bin b/data/layouts/MtEmber_RubyPath_B5F/map.bin
new file mode 100644
index 000000000..e67aaa03d
--- /dev/null
+++ b/data/layouts/MtEmber_RubyPath_B5F/map.bin
diff --git a/data/layouts/MtEmber_Summit/border.bin b/data/layouts/MtEmber_Summit/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/MtEmber_Summit/border.bin
diff --git a/data/layouts/MtEmber_Summit/map.bin b/data/layouts/MtEmber_Summit/map.bin
new file mode 100644
index 000000000..603170671
--- /dev/null
+++ b/data/layouts/MtEmber_Summit/map.bin
@@ -0,0 +1 @@
+QQQU4\\\\\\\\5QS[\5Q4\]U4\\\\\\5[5[\5SMU4\]U4\\\\5[5[\5SSUUU4\]U4\\5[5[5QSSSUUUU4\]UQQSQ[5[5SSSUUUUUQK�2�2�2�2�2MSQSSSSUU<<<LS�3�3�3�3�3U=L==SS�2�2MQKLS�3�3�3�3�3ULMK�2�2�2�3�3�2�2�2�2�2WW�3�3W�2�2�2�2�3�3�3�3�3�3�3�3�3W�3�3�3�3�3W�3�3�3�34\�3W�3�3�3�3W�3�3WW�3W�3�3�3�3U4\\5�3�3�3W�3�3�3�3W�3W�3�34]U\5S�3W�3WW�3�3�3W�3�3�34]4]QS[5�3�3�3WW�3�3�3W�3�3UQU45[5[\5W�3�3�3�3W�3�3WU4]U[5SQQS�3WW�1W�3W4\]UQU5S[\5[\\���\\]4\]4]S[\5[\\\���\\\]4\]4[\5[\\\\���\\\\]4\]\5[\\\\\���\\\\\]4\5[\\\\\\���\\\\\\]4[\\\\\\\���\\\\\\\]
\ No newline at end of file
diff --git a/data/layouts/MtEmber_SummitPath_1F/border.bin b/data/layouts/MtEmber_SummitPath_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_SummitPath_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_SummitPath_1F/map.bin b/data/layouts/MtEmber_SummitPath_1F/map.bin
new file mode 100644
index 000000000..40ec58172
--- /dev/null
+++ b/data/layouts/MtEmber_SummitPath_1F/map.bin
@@ -0,0 +1 @@
+���������������������������2������)������!3�2�2�������������2�2#3���������2�2�2�2�2�2���+������2�������������2�2�2����*��������2�������������2�2�2�������������2���������������2���������������2���������������2��)������������2���������������2���������������2������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/MtEmber_SummitPath_2F/border.bin b/data/layouts/MtEmber_SummitPath_2F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_SummitPath_2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_SummitPath_2F/map.bin b/data/layouts/MtEmber_SummitPath_2F/map.bin
new file mode 100644
index 000000000..960c58b68
--- /dev/null
+++ b/data/layouts/MtEmber_SummitPath_2F/map.bin
@@ -0,0 +1 @@
+�����������������������������������������������������������������������������������������������������������������������+�2��������������������������������������������������2����������������������������������������������2�������������)��������2����������������������������2�2��2�2�2�2�2�������������2�������������������������������2�2�2�2�2�2�2����2�������2�2������������������������������2�����2�2�2�2�2�2�2�������2������������������������������2���������2�2#3�������2����������������������������!3�2������������������������������������������2�2�2�2�2�2�2���������2)��������������������������������2�2#3�������������2�2���2�����������������������������2���������2+������2������������������������)�������2����������������2��2�������������������������2��2�2�2�2���������������������������������������������2����)�������������2��������������������������2�2�2�2�2�������2����2���������������������������������2������������+�2�2���������������������������������2�����������������������������������������������2�2���������IIIII������������������������������#3�2�2�2��6������B@������������������������������2�2�2!3��6��IIIIJL@������������������������������2�2�2����BECHIIIIII������������������������2�2�2���+BLLLLMC@������������������������2����IJEKLLLLLL@������������������������2���B7EC@��������������������2�2�2�2�2�2�IJLMCH��������������������2�2�2�2�2#3B7EC@�������������������2�2�IIIJ7MK@�������������������2�2B7777ECH�������������+�����2�2B7LLLLMC@������������������2�2B7EKH��������������2��2�2�2!3B7E7C@���������������2�2�2�2B7E77K@��������������2�2�2�IJ7E777C@��������������2�2�2B77E7777CH�������������#3�2�2B7LM7777C@�������������2�2�2B7E777K@�������������2�2�2B7E777C@�������������2�2!3B7E7777C@������������6����6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6��������������������6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�������������������6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6������������������6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�2�2�2�2�2�2�2�2�2�2�2�����������������6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�2�2�2�2�2�2�2�2�2�2�2����������������6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�2�2�2�2�2�2�2�2�2�2�2��������������
\ No newline at end of file
diff --git a/data/layouts/MtEmber_SummitPath_3F/border.bin b/data/layouts/MtEmber_SummitPath_3F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtEmber_SummitPath_3F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtEmber_SummitPath_3F/map.bin b/data/layouts/MtEmber_SummitPath_3F/map.bin
new file mode 100644
index 000000000..b107b027e
--- /dev/null
+++ b/data/layouts/MtEmber_SummitPath_3F/map.bin
@@ -0,0 +1 @@
+���������������������������)�����2�2�2�2�2�����������2�2�2�2�2�2�2���������2������2�2�2�2����������*���2�2�2��*����������2�2!3�������������2�2�2������������#3�2�2��������������������������������
\ No newline at end of file
diff --git a/data/layouts/MtMoon_1F/border.bin b/data/layouts/MtMoon_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/MtMoon_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtMoon_1F/map.bin b/data/layouts/MtMoon_1F/map.bin
new file mode 100644
index 000000000..0a2146855
--- /dev/null
+++ b/data/layouts/MtMoon_1F/map.bin
diff --git a/data/layouts/MtMoon_B1F/border.bin b/data/layouts/MtMoon_B1F/border.bin
new file mode 100644
index 000000000..23857cf75
--- /dev/null
+++ b/data/layouts/MtMoon_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtMoon_B1F/map.bin b/data/layouts/MtMoon_B1F/map.bin
new file mode 100644
index 000000000..89714677c
--- /dev/null
+++ b/data/layouts/MtMoon_B1F/map.bin
diff --git a/data/layouts/MtMoon_B2F/border.bin b/data/layouts/MtMoon_B2F/border.bin
new file mode 100644
index 000000000..23857cf75
--- /dev/null
+++ b/data/layouts/MtMoon_B2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/MtMoon_B2F/map.bin b/data/layouts/MtMoon_B2F/map.bin
new file mode 100644
index 000000000..9b546adb5
--- /dev/null
+++ b/data/layouts/MtMoon_B2F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������������������������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�������2�2�2�2���������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2��2�2�2�2��2�2�2�2��2�2�2�2����������2�2���������2�2���������2�2�2�2��2�2�2�2���2�2���2�2�2�2���������2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2����2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2���������2�2�2��2�2��2�2�2�2�2�2�2�2�2�2�2����2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2���������2�2�2�2��2��2�2�2�2�2�2�2�2�2�2�2����2�2�2�2��2�2���2�2�2�2�2�2�2�2�2�2���������2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2����2�2�2�2��2�2��2�2�2�2�2�2�2�2��2�2���������2�2�2�2�2�������2�2����2�2����2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2����������������2�2�2�2�2�2�2�2��2�2����2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2���������������2�2�2�2�2�2�2�2�2��2�2����2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2����������2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2����������2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2��������������2�2�2���������2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�������������2�2�2��������2�2�2�2�2�2���2�2������2�2���2�2�2�2�2��������������2�2�2���������2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2��������������2�2�2���������2�2��2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2����������2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2��2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2����������2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2��2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2����������2�2�2�2�2�������������������������������2�2�2�2����������2�2�2�2�2������������������������������2�2�2�2����������2�2�2�2�2�������������������������������2�2�2�2����������2�2�2�2�2����������������2�2�2�2������������2�2�2�2����������2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2��2�2���2�2�2�2�2�2�2�2�2�2����������2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2���2�2���2�2���2�2�2�2�2�2�2�2�2�2����������2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2���������������2�2�2�2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2���������������2�2�2�2�2���2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2���������������2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2���������������2�2�2�2�2�������������������������2�2�2�2�2���������������2�2�2�2�2�����������������������2�2�2�2�2���������������2�2�2�2�2�������������������������2�2�2�2�2���������������2�2�2�2�2�������������������������2�2�2�2�2���������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_1F/border.bin b/data/layouts/NavelRock_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_1F/map.bin b/data/layouts/NavelRock_1F/map.bin
new file mode 100644
index 000000000..6398304c9
--- /dev/null
+++ b/data/layouts/NavelRock_1F/map.bin
@@ -0,0 +1 @@
+���������������������������������������2���2�2�2�2�2�2���������2�2�2�2�2�2�2�2�2���������2�2�2�2�2�2�2�2�2���������2�2�2�2�2�2�2�2�2����������2�2�2�2�2�2�2�2�����������2�2�2�2�2��������������2�2����������������2�2�2����������������2�2���������������2�2�2���������������2�2�2���������������2�2����������������2�2�2���������������2�2�2���������������2�2����������������2�2�2���������������2�2�2���������������2�2�2���������������2�2�2����������������2�2���������������2�2�2���������������2�2�2�����������������������������������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_B1F/border.bin b/data/layouts/NavelRock_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_B1F/map.bin b/data/layouts/NavelRock_B1F/map.bin
new file mode 100644
index 000000000..856e2a21f
--- /dev/null
+++ b/data/layouts/NavelRock_B1F/map.bin
@@ -0,0 +1 @@
+��������������������������������������2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2���������������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_Base/border.bin b/data/layouts/NavelRock_Base/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_Base/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_Base/map.bin b/data/layouts/NavelRock_Base/map.bin
new file mode 100644
index 000000000..dcfeee21e
--- /dev/null
+++ b/data/layouts/NavelRock_Base/map.bin
@@ -0,0 +1 @@
+���**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.vvv6+++((������**---.8886+++((������**---93;3;3;3:3+++((������**-99%,3,3,3#::+((������**-,,-%,3#+,,+((������**-,,--3++,,+((������**-,,-93,3:3+,,+((������**-&45,3,33/'+((������**--,3,3,3,3,373++((������**--,,3,3,3,3++((������>><<�������==??���
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B10F/border.bin b/data/layouts/NavelRock_BasePath_B10F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B10F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B10F/map.bin b/data/layouts/NavelRock_BasePath_B10F/map.bin
new file mode 100644
index 000000000..3f718d185
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B10F/map.bin
@@ -0,0 +1 @@
+�����������������2�2������2�2������2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B11F/border.bin b/data/layouts/NavelRock_BasePath_B11F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B11F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B11F/map.bin b/data/layouts/NavelRock_BasePath_B11F/map.bin
new file mode 100644
index 000000000..48a1246d4
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B11F/map.bin
@@ -0,0 +1 @@
+�����������������2�2�2�����2�2�2�����2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B1F/border.bin b/data/layouts/NavelRock_BasePath_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B1F/map.bin b/data/layouts/NavelRock_BasePath_B1F/map.bin
new file mode 100644
index 000000000..48a1246d4
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B1F/map.bin
@@ -0,0 +1 @@
+�����������������2�2�2�����2�2�2�����2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B2F/border.bin b/data/layouts/NavelRock_BasePath_B2F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B2F/map.bin b/data/layouts/NavelRock_BasePath_B2F/map.bin
new file mode 100644
index 000000000..3f718d185
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B2F/map.bin
@@ -0,0 +1 @@
+�����������������2�2������2�2������2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B3F/border.bin b/data/layouts/NavelRock_BasePath_B3F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B3F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B3F/map.bin b/data/layouts/NavelRock_BasePath_B3F/map.bin
new file mode 100644
index 000000000..48a1246d4
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B3F/map.bin
@@ -0,0 +1 @@
+�����������������2�2�2�����2�2�2�����2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B4F/border.bin b/data/layouts/NavelRock_BasePath_B4F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B4F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B4F/map.bin b/data/layouts/NavelRock_BasePath_B4F/map.bin
new file mode 100644
index 000000000..3f718d185
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B4F/map.bin
@@ -0,0 +1 @@
+�����������������2�2������2�2������2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B5F/border.bin b/data/layouts/NavelRock_BasePath_B5F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B5F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B5F/map.bin b/data/layouts/NavelRock_BasePath_B5F/map.bin
new file mode 100644
index 000000000..48a1246d4
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B5F/map.bin
@@ -0,0 +1 @@
+�����������������2�2�2�����2�2�2�����2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B6F/border.bin b/data/layouts/NavelRock_BasePath_B6F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B6F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B6F/map.bin b/data/layouts/NavelRock_BasePath_B6F/map.bin
new file mode 100644
index 000000000..3f718d185
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B6F/map.bin
@@ -0,0 +1 @@
+�����������������2�2������2�2������2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B7F/border.bin b/data/layouts/NavelRock_BasePath_B7F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B7F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B7F/map.bin b/data/layouts/NavelRock_BasePath_B7F/map.bin
new file mode 100644
index 000000000..48a1246d4
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B7F/map.bin
@@ -0,0 +1 @@
+�����������������2�2�2�����2�2�2�����2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B8F/border.bin b/data/layouts/NavelRock_BasePath_B8F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B8F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B8F/map.bin b/data/layouts/NavelRock_BasePath_B8F/map.bin
new file mode 100644
index 000000000..3f718d185
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B8F/map.bin
@@ -0,0 +1 @@
+�����������������2�2������2�2������2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B9F/border.bin b/data/layouts/NavelRock_BasePath_B9F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B9F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_BasePath_B9F/map.bin b/data/layouts/NavelRock_BasePath_B9F/map.bin
new file mode 100644
index 000000000..48a1246d4
--- /dev/null
+++ b/data/layouts/NavelRock_BasePath_B9F/map.bin
@@ -0,0 +1 @@
+�����������������2�2�2�����2�2�2�����2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_Exterior/border.bin b/data/layouts/NavelRock_Exterior/border.bin
new file mode 100644
index 000000000..75f2c916c
--- /dev/null
+++ b/data/layouts/NavelRock_Exterior/border.bin
@@ -0,0 +1 @@
+vvvv
\ No newline at end of file
diff --git a/data/layouts/NavelRock_Exterior/map.bin b/data/layouts/NavelRock_Exterior/map.bin
new file mode 100644
index 000000000..4d169ee3a
--- /dev/null
+++ b/data/layouts/NavelRock_Exterior/map.bin
diff --git a/data/layouts/NavelRock_Fork/border.bin b/data/layouts/NavelRock_Fork/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_Fork/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_Fork/map.bin b/data/layouts/NavelRock_Fork/map.bin
new file mode 100644
index 000000000..e6ce2d331
--- /dev/null
+++ b/data/layouts/NavelRock_Fork/map.bin
@@ -0,0 +1 @@
+���������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������������V�2T3�2W����������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2�������������������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�����������2��������2�����������2�2�2�2�2�2�2�2�2�2�2�2��������2�����������2�2������������������2�����������2�������������������2�����������2�������������������2�����������2�������������������2�����������2�������������������2�����������2�������������������2�����������2�������������������2�����������2�������������������2�����������2�������������������2�����������2�������������������2�����������2�������������������2�2�2�2�2�2�2�2�2�2�2�2�����������������������������2�2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2������������������������������2�����������������������������2�2�2����������������������������2�2�2�����������������������������2���������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_Summit/border.bin b/data/layouts/NavelRock_Summit/border.bin
new file mode 100644
index 000000000..4ecad6cd2
--- /dev/null
+++ b/data/layouts/NavelRock_Summit/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_Summit/map.bin b/data/layouts/NavelRock_Summit/map.bin
new file mode 100644
index 000000000..d49777f32
--- /dev/null
+++ b/data/layouts/NavelRock_Summit/map.bin
@@ -0,0 +1,2 @@
+������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������6�6�6�6�6�6�6�63�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�3��6�6�6�6�6�6�6�6�6�6�6�6�6��3���6�6�6�6�6�6�6�6�6�6�6�6���2���6�6�6�6�6�6�6�6�6�6�6�6���2���6�6�6�6�6�6�6�6�6�6�6�6�2�2�2�2�2�6�6�6�6�6�6�6�6�6�6@�2�2�2�2�2@�6�6�6�6�6�6@:�2�2�2�2�29@�6�6�6:�2�2�2�2�29�6::�����99::�������99:					
+9:
9:
9
\ No newline at end of file
diff --git a/data/layouts/NavelRock_SummitPath_2F/border.bin b/data/layouts/NavelRock_SummitPath_2F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_SummitPath_2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_SummitPath_2F/map.bin b/data/layouts/NavelRock_SummitPath_2F/map.bin
new file mode 100644
index 000000000..48a1246d4
--- /dev/null
+++ b/data/layouts/NavelRock_SummitPath_2F/map.bin
@@ -0,0 +1 @@
+�����������������2�2�2�����2�2�2�����2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_SummitPath_3F/border.bin b/data/layouts/NavelRock_SummitPath_3F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_SummitPath_3F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_SummitPath_3F/map.bin b/data/layouts/NavelRock_SummitPath_3F/map.bin
new file mode 100644
index 000000000..3f718d185
--- /dev/null
+++ b/data/layouts/NavelRock_SummitPath_3F/map.bin
@@ -0,0 +1 @@
+�����������������2�2������2�2������2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_SummitPath_4F/border.bin b/data/layouts/NavelRock_SummitPath_4F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_SummitPath_4F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_SummitPath_4F/map.bin b/data/layouts/NavelRock_SummitPath_4F/map.bin
new file mode 100644
index 000000000..48a1246d4
--- /dev/null
+++ b/data/layouts/NavelRock_SummitPath_4F/map.bin
@@ -0,0 +1 @@
+�����������������2�2�2�����2�2�2�����2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/NavelRock_SummitPath_5F/border.bin b/data/layouts/NavelRock_SummitPath_5F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/NavelRock_SummitPath_5F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/NavelRock_SummitPath_5F/map.bin b/data/layouts/NavelRock_SummitPath_5F/map.bin
new file mode 100644
index 000000000..3f718d185
--- /dev/null
+++ b/data/layouts/NavelRock_SummitPath_5F/map.bin
@@ -0,0 +1 @@
+�����������������2�2������2�2������2�2�2����������������
\ No newline at end of file
diff --git a/data/layouts/OneIsland/border.bin b/data/layouts/OneIsland/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/OneIsland/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/OneIsland/map.bin b/data/layouts/OneIsland/map.bin
new file mode 100644
index 000000000..26fbb1b50
--- /dev/null
+++ b/data/layouts/OneIsland/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqq�������uu*1+qqqqqq������������uuqqqqqqr�������uuqqqqqqr�������uu*1+qqqqqqr�������uu*1+qqq�||z&%$'�������&'uu*1+qqqu��������0�200��qqqurx|�0�0�0|z�����rqqqurs��30�0�0�000������qqqur�����0�0�0�0�0�0������qqqur�����0�0�0�0�0�0�0�0�000�qqqur�����0�0�0�0�0��0�0�0||�qqqur0�0�0�0�0�0�0�0�0�0��111111q�|}r0�0�0�0�0�0�0�0�0r�1�11111|}�|z&'0000�0�0�0000rh�����q�}�|||||||�0�0�0|||zpqqqqq|}�} #	###�1�1�1#	$sqqqqq||} 1++++�1�1�1+,{||||�###1+++++�2�2�2++��####!s++��+++���������++,s
\ No newline at end of file
diff --git a/data/layouts/OneIsland_KindleRoad/border.bin b/data/layouts/OneIsland_KindleRoad/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/OneIsland_KindleRoad/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/OneIsland_KindleRoad/map.bin b/data/layouts/OneIsland_KindleRoad/map.bin
new file mode 100644
index 000000000..4d4abca6d
--- /dev/null
+++ b/data/layouts/OneIsland_KindleRoad/map.bin
diff --git a/data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin b/data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin b/data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin
new file mode 100644
index 000000000..9817d8614
--- /dev/null
+++ b/data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin
@@ -0,0 +1 @@
+������������������������������������������������������)�����''�����''����������+�������//�����//�������������+��017
7
2����//������)���������8999:�-3��//����������������8'99:�-3�07
7
112��5555�������������-3�`999&a��2-3-3-3"36���)��7 3-3-3-3-3-3,3,3,3,3,3,3,3,3-3-3-3-3-36�����+7-3-3"3-3-3-3 3-3-3-3-3-3-3 3-3-3-3-3-36�������-3-3�������2��������2���������������07131333131327�����2������������)��87&393939393:7��+7-36��������03131323��8793939393&3:7���?-36��������83'393:3��879393'39393:7��7-3-36��������������*���(����7-3 36���������55������������7-3-36��������7-3-3>5555����+�5�-3-36��������7-3-3-3-3-3-3-3>5555?-3-3"3-36��������7 3-3-3-3"3-3-3-3-3-3-3-3-3-3-3-3-36��������7-3-3-3-3-3-3-3-3-3-3 3-3-3-3-3-3-36���������44/-3-3-3-3-3-3-3-3-3-3.444�������������444/-3-3-3.44��������������������7-3-3-36����������������������7-3-3-36����������������������7"3-3-36�����������������������/-3-36�����������������������7-3 36�����������������������7-3.������������������������7-36������������������������7-36������������������������7-36������������������������7-36������������������������7-36������������������������7-36������������������������7-36�������������������������=36������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/OneIsland_PokemonCenter_1F/border.bin b/data/layouts/OneIsland_PokemonCenter_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/OneIsland_PokemonCenter_1F/border.bin
diff --git a/data/layouts/OneIsland_PokemonCenter_1F/map.bin b/data/layouts/OneIsland_PokemonCenter_1F/map.bin
new file mode 100644
index 000000000..a9016b670
--- /dev/null
+++ b/data/layouts/OneIsland_PokemonCenter_1F/map.bin
@@ -0,0 +1 @@
+����������������������������b��HI``JK��2�2����2c3���2�2�2PQUURS 7�2�2��������2�2�2LMVVNOn�2�2��2�2�2�2�2�2�2�2�2T\XY^Wn��B�B��2�2�2�2�2�2�2�2ABFGCD�2�2�2��2�2�2�2�2�2�2�2�2E3�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/OneIsland_PokemonCenter_2F/border.bin b/data/layouts/OneIsland_PokemonCenter_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/OneIsland_PokemonCenter_2F/border.bin
diff --git a/data/layouts/OneIsland_PokemonCenter_2F/map.bin b/data/layouts/OneIsland_PokemonCenter_2F/map.bin
new file mode 100644
index 000000000..a1b551a73
--- /dev/null
+++ b/data/layouts/OneIsland_PokemonCenter_2F/map.bin
diff --git a/data/layouts/OneIsland_TreasureBeach/border.bin b/data/layouts/OneIsland_TreasureBeach/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/OneIsland_TreasureBeach/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/OneIsland_TreasureBeach/map.bin b/data/layouts/OneIsland_TreasureBeach/map.bin
new file mode 100644
index 000000000..fe6ef01a7
--- /dev/null
+++ b/data/layouts/OneIsland_TreasureBeach/map.bin
diff --git a/data/layouts/PalletTown/border.bin b/data/layouts/PalletTown/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/PalletTown/border.bin
diff --git a/data/layouts/PalletTown/map.bin b/data/layouts/PalletTown/map.bin
new file mode 100644
index 000000000..f2113394f
--- /dev/null
+++ b/data/layouts/PalletTown/map.bin
@@ -0,0 +1 @@
+�2�2$%$%$%$%$'�2�2&%$%$%$%�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������2�2�2�2������2�2�2�2�20������2�2�20������2�2�2�2�2�2������2�2�2�2������2�2�2�2�2�������2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2�����2�2�2��������2�2�2�2�200000�2�2�2��������2�2�2�2�200000�2�2�2��������2�2�2�2�2	00	00�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������2�2�2�2�2�2�2�2�##��2�2�2�2�2�2�2�2�2�2�200	00	0*++,�2�2�2�2�2�2�2�2�2�2�200000*++,00000000000
\ No newline at end of file
diff --git a/data/layouts/PalletTown_GarysHouse/border.bin b/data/layouts/PalletTown_GarysHouse/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PalletTown_GarysHouse/border.bin
diff --git a/data/layouts/PalletTown_GarysHouse/map.bin b/data/layouts/PalletTown_GarysHouse/map.bin
new file mode 100644
index 000000000..a29b5dbdc
--- /dev/null
+++ b/data/layouts/PalletTown_GarysHouse/map.bin
@@ -0,0 +1 @@
+  ./ -!" � +,1267(5)*(�(3490:0>0?0	0=0	0	0	0	0	0;0<0	0
0
0
0C0D0D0D0D0F0
0
0
0	0
0
0
0S0K0LMN0V0
0
0
0	0
0
0
0S0K0TUN0V0
0
0
0	0
0
0
0[0\0\0\0\0^0
0
0
0W0
0
0
0
0
0
0
0
0
0
0
0G0_
0
0000
0
0
0
0
0
0O4444444444
\ No newline at end of file
diff --git a/data/layouts/PalletTown_PlayersHouse_1F/border.bin b/data/layouts/PalletTown_PlayersHouse_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PalletTown_PlayersHouse_1F/border.bin
diff --git a/data/layouts/PalletTown_PlayersHouse_1F/map.bin b/data/layouts/PalletTown_PlayersHouse_1F/map.bin
new file mode 100644
index 000000000..b93d823c9
--- /dev/null
+++ b/data/layouts/PalletTown_PlayersHouse_1F/map.bin
@@ -0,0 +1 @@
+  ./ -!"    1267(5)*((90:0>0?0	0=0	0	0	00	0
0
0C0D0D0D0D0F0%0&0'0	0
0
0S0K0LMN0V0
0
0
0	0
0
0S0K0TUN0V0
0
0
0W0
0
0[0\0\0\0\0^0
0
0G0_
0
0
0
0
0
0
0
0
0
0O	0
0000
0
0
0
0
0
0
0
\ No newline at end of file
diff --git a/data/layouts/PalletTown_PlayersHouse_2F/border.bin b/data/layouts/PalletTown_PlayersHouse_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PalletTown_PlayersHouse_2F/border.bin
diff --git a/data/layouts/PalletTown_PlayersHouse_2F/map.bin b/data/layouts/PalletTown_PlayersHouse_2F/map.bin
new file mode 100644
index 000000000..b5d3bee2d
--- /dev/null
+++ b/data/layouts/PalletTown_PlayersHouse_2F/map.bin
diff --git a/data/layouts/PalletTown_ProfessorOaksLab/border.bin b/data/layouts/PalletTown_ProfessorOaksLab/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PalletTown_ProfessorOaksLab/border.bin
diff --git a/data/layouts/PalletTown_ProfessorOaksLab/map.bin b/data/layouts/PalletTown_ProfessorOaksLab/map.bin
new file mode 100644
index 000000000..1067109ab
--- /dev/null
+++ b/data/layouts/PalletTown_ProfessorOaksLab/map.bin
@@ -0,0 +1 @@
+�mmnii���klkl��uv�����stst�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�2����2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2sstst�2�2�2ststt�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2����
\ No newline at end of file
diff --git a/data/layouts/PewterCity/border.bin b/data/layouts/PewterCity/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/PewterCity/border.bin
diff --git a/data/layouts/PewterCity/map.bin b/data/layouts/PewterCity/map.bin
new file mode 100644
index 000000000..fc42368cb
--- /dev/null
+++ b/data/layouts/PewterCity/map.bin
@@ -0,0 +1 @@
+�����������$%$%$%$%������������2�2�2�2�$%$%$%$%$%�0�0�0�0�0000�����������������
00
00�0�0�0�0�0�0�0�0�0�0000�����������������0
00�0�0�0�0�0�0�0�0�0�0�0
000���������������������0�0�0�0�0�0
00
00
00
00�����������
0	00	0
0
0	00	0
0�0�0�0�0
0&%���
00
00
0��2�
0
0�������	00	0
0
0	0
0	0���
00��������2�2�2�����������������
0
0
00
0�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�10
00
00
00�2�2�2�2�2�1�1�100�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1	0
0
00
000������1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�10
00
00
0
0������1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1	0
0	0
0	0
0
0������1�1�1�1�1�100	091:1:1:1:1:1;1	000�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�10ABBBBBC0�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�IJJJJJK��1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1`1PQRSTUV	0�1�1�1	0(0)0*0+0000�0�000�1�1�1�1�1�1&'hX1Y1Z[\]1^10&'�1�1�10012300�0�0�0�00�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�10��1�1�1089:;�0�0�0�00�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�10��1�1�1	0@Abc$%0�0�000�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�10��1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1$%$%$%$'�����������������1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1	00	00	00000000000{1|1}1~1100�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�10000000000000HIJK��1�1�1000000000000�1�1�1�1�1	00	00	000000000PQRS��1�1�100�1�1�1000000000	00	00	00XYZ[��1�1�10&%$%$%$%$'0�1�1�10000000&'`ab��&'�1�1�1	0�����������1�1�10	00	00	000�1�1�1�1�1�1�1�1�1�1�10�000000000��1�1�100�2�2�2�2�20�1�1�1�1�1�1�1�1�1�1�10�000000000��1�1�10	0�����0�1�1�1�1�1�1�1�1�1�1�1
0�000000000��1�1�100�����000	000000�1�1�10�000000000��1�1�10	0�����0000	00	00�1�1�1
0�����
0������1�1�10�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�10�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1	00	00	00	00	00	00	00	0�0�0�0	00	00	00	00	00	00	00	00000000000000000�0�0�00000000000000000000000000000000�0�0�000000000000000000�0�0�00�0�0�00�0�0�00�0�0�0
\ No newline at end of file
diff --git a/data/layouts/PewterCity_Gym/border.bin b/data/layouts/PewterCity_Gym/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PewterCity_Gym/border.bin
diff --git a/data/layouts/PewterCity_Gym/map.bin b/data/layouts/PewterCity_Gym/map.bin
new file mode 100644
index 000000000..7a22de0f9
--- /dev/null
+++ b/data/layouts/PewterCity_Gym/map.bin
@@ -0,0 +1 @@
+������������������2�2�2�2�2�������������������2�2�2�2��2��2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2��2�2�2��2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2��2��2��2��2�2����2�2�2�2�2�2�2�2�2����2�2�2��2�2�2��2�2�2����2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2���2�2�2��2�2�2��2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�tuv
\ No newline at end of file
diff --git a/data/layouts/PewterCity_Museum_1F/border.bin b/data/layouts/PewterCity_Museum_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PewterCity_Museum_1F/border.bin
diff --git a/data/layouts/PewterCity_Museum_1F/map.bin b/data/layouts/PewterCity_Museum_1F/map.bin
new file mode 100644
index 000000000..1485da6ef
--- /dev/null
+++ b/data/layouts/PewterCity_Museum_1F/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2��2�2�2�2��2�2�2�����2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�����2�2����2�2�2����2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2����2�2�2�2�2��2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2����2�2�2�2���2�2�2�2�2�2���2�2
\ No newline at end of file
diff --git a/data/layouts/PewterCity_Museum_2F/border.bin b/data/layouts/PewterCity_Museum_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PewterCity_Museum_2F/border.bin
diff --git a/data/layouts/PewterCity_Museum_2F/map.bin b/data/layouts/PewterCity_Museum_2F/map.bin
new file mode 100644
index 000000000..d8d372f70
--- /dev/null
+++ b/data/layouts/PewterCity_Museum_2F/map.bin
@@ -0,0 +1 @@
+���������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�����2�2�2�2�2�2�2�2����2�2�2�2�����2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2���2�2�2�2�2�2����2�2�2�2�2�2��
\ No newline at end of file
diff --git a/data/layouts/PokemonCenter_1F/border.bin b/data/layouts/PokemonCenter_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/border.bin
diff --git a/data/layouts/PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F/map.bin
new file mode 100644
index 000000000..590f47989
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/map.bin
@@ -0,0 +1 @@
+��2������������������������b����2�2�2�2����2c3���2�2�2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2��B�B��2�2�2�2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/PokemonCenter_2F/border.bin b/data/layouts/PokemonCenter_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/border.bin
diff --git a/data/layouts/PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F/map.bin
new file mode 100644
index 000000000..a1b551a73
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/map.bin
diff --git a/data/layouts/PokemonLeague_AgathasRoom/border.bin b/data/layouts/PokemonLeague_AgathasRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonLeague_AgathasRoom/border.bin
diff --git a/data/layouts/PokemonLeague_AgathasRoom/map.bin b/data/layouts/PokemonLeague_AgathasRoom/map.bin
new file mode 100644
index 000000000..718b7678c
--- /dev/null
+++ b/data/layouts/PokemonLeague_AgathasRoom/map.bin
diff --git a/data/layouts/PokemonLeague_BrunosRoom/border.bin b/data/layouts/PokemonLeague_BrunosRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonLeague_BrunosRoom/border.bin
diff --git a/data/layouts/PokemonLeague_BrunosRoom/map.bin b/data/layouts/PokemonLeague_BrunosRoom/map.bin
new file mode 100644
index 000000000..96107bfa1
--- /dev/null
+++ b/data/layouts/PokemonLeague_BrunosRoom/map.bin
@@ -0,0 +1 @@
+����������������������������R�������S���E3KF3�2�2�2�2�2E3KF3��L3P3�2�2�2�2�2�2L3P3�2���2Y�2�2�2�2�2�2�2Y�2��X3[�2�2�2�2�2�2X3[�2���2Q3�2�2�2�2�2�2�2Q3�2���2Y�2�2�2�2�2�2�2Y�2��X3[�2�2�2�2�2�2X3[�2���2�2�2�2�2�2�2�2�2�2�2������012����������89:�����
\ No newline at end of file
diff --git a/data/layouts/PokemonLeague_ChampionsRoom/border.bin b/data/layouts/PokemonLeague_ChampionsRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonLeague_ChampionsRoom/border.bin
diff --git a/data/layouts/PokemonLeague_ChampionsRoom/map.bin b/data/layouts/PokemonLeague_ChampionsRoom/map.bin
new file mode 100644
index 000000000..3e83caa24
--- /dev/null
+++ b/data/layouts/PokemonLeague_ChampionsRoom/map.bin
@@ -0,0 +1 @@
+������������������������������7��7�����������3�3�3�����������3�3�3��������������������������������������3������������3�3�3�����������3�3�3������������3�������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonLeague_HallOfFame/border.bin b/data/layouts/PokemonLeague_HallOfFame/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonLeague_HallOfFame/border.bin
diff --git a/data/layouts/PokemonLeague_HallOfFame/map.bin b/data/layouts/PokemonLeague_HallOfFame/map.bin
new file mode 100644
index 000000000..e8a598e9b
--- /dev/null
+++ b/data/layouts/PokemonLeague_HallOfFame/map.bin
@@ -0,0 +1 @@
+�����������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/PokemonLeague_LancesRoom/border.bin b/data/layouts/PokemonLeague_LancesRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonLeague_LancesRoom/border.bin
diff --git a/data/layouts/PokemonLeague_LancesRoom/map.bin b/data/layouts/PokemonLeague_LancesRoom/map.bin
new file mode 100644
index 000000000..0ba5c9ff0
--- /dev/null
+++ b/data/layouts/PokemonLeague_LancesRoom/map.bin
@@ -0,0 +1 @@
+����������������������������O�������W���3r3333333s3��������������3j33333333k33��������������3p33 3!3"333q3��������������3x3&3#3$3%3'33y3�333333333333�3h33.3+3,3-3/33i33�333333333333�3p33(3)3*333q3�333333333333�3x3�2�2�2�2�23y3�333333@2333@23��2�2�2�2�2�2�2�2�2�2�2���333333I?333I?3�����673@�������33333�����>?3H�������333333A233A23?3�2A233A2333333333I?33I?333I?33I?3333333333333333333333333333333333333333333333333@233@2333@233@233333333���2�2��2�2�2��2�2��2�2�2�2�2�2�2�2����������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonLeague_LoreleisRoom/border.bin b/data/layouts/PokemonLeague_LoreleisRoom/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonLeague_LoreleisRoom/border.bin
diff --git a/data/layouts/PokemonLeague_LoreleisRoom/map.bin b/data/layouts/PokemonLeague_LoreleisRoom/map.bin
new file mode 100644
index 000000000..340b78d78
--- /dev/null
+++ b/data/layouts/PokemonLeague_LoreleisRoom/map.bin
@@ -0,0 +1 @@
+����������������������������C�������D����2I�2�2�2�2�2�2�2I�2���2A3�2�2�2�2�2�2�2A3�2���2J�2�2�2�2�2�2�2J�2���2M�2�2�2�2�2�2�2M�2���2B3�2�2�2�2�2�2�2B3�2���2J�2�2�2�2�2�2�2J�2���2M�2�2�2�2�2�2�2M�2���2�2�2�2�2�2�2�2�2�2�2���������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonMansion_1F/border.bin b/data/layouts/PokemonMansion_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonMansion_1F/border.bin
diff --git a/data/layouts/PokemonMansion_1F/map.bin b/data/layouts/PokemonMansion_1F/map.bin
new file mode 100644
index 000000000..491753551
--- /dev/null
+++ b/data/layouts/PokemonMansion_1F/map.bin
diff --git a/data/layouts/PokemonMansion_2F/border.bin b/data/layouts/PokemonMansion_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonMansion_2F/border.bin
diff --git a/data/layouts/PokemonMansion_2F/map.bin b/data/layouts/PokemonMansion_2F/map.bin
new file mode 100644
index 000000000..87db6b0ea
--- /dev/null
+++ b/data/layouts/PokemonMansion_2F/map.bin
diff --git a/data/layouts/PokemonMansion_3F/border.bin b/data/layouts/PokemonMansion_3F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonMansion_3F/border.bin
diff --git a/data/layouts/PokemonMansion_3F/map.bin b/data/layouts/PokemonMansion_3F/map.bin
new file mode 100644
index 000000000..9a05ce1b8
--- /dev/null
+++ b/data/layouts/PokemonMansion_3F/map.bin
diff --git a/data/layouts/PokemonMansion_B1F/border.bin b/data/layouts/PokemonMansion_B1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PokemonMansion_B1F/border.bin
diff --git a/data/layouts/PokemonMansion_B1F/map.bin b/data/layouts/PokemonMansion_B1F/map.bin
new file mode 100644
index 000000000..a7b0eeeb1
--- /dev/null
+++ b/data/layouts/PokemonMansion_B1F/map.bin
@@ -0,0 +1 @@
+��������������������������������������������������������������������������������������������������2�2l3l3m3�2�2l3m3�2�2��2l3l3l3�2�2m3m3n3n3n3n3��2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2��23�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�R3�2�2S3�2�2�2Q3�2�2�2�2��2,�2�2�2�2�2�2�2�2�2���2�2�2�2\3]3^3�2�2�2�2������2�2�2�����R3R3W3S3�2�2�2�2Q3�2�2.��2�2�2�2[3�2�2�2������2�2�2�����������2�2�2�2���6��2�2Z3�2[3�2�2�2P����2�2�2����������2�2�2�2������2�2�2�2d3e3f3�2�2�2�2X�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2b�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2j�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2r�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�-R3�2�2S3�2�2�2Q3�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2S3�2�2�2�2�2�2�5�����2�2�2������������������������2�2�2�2�2�2�������2�2�2������������������������2�2�2�2�2�2������2�2�2�����������������������2�2�2�2�2�2���2i3i3i3�2�2�2i3i3i3�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2���2aaa�2�2�2aaa�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�R3S3�2�2�2Q3.��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�6��2Y3Y3Y3�2�2�2Y3Y3Y3�2��2�2�2Q3�2�2S3�2�2�2Q3�2�2S3�2�2�2����2�2�2����2aaa�2�2�2aaa�2��2�2�2�����2�2�2�����2�2�2��2�2�2�-R3�2�2�2�2�2�2�2�2�2�2��2�2�2����������2�2�2�2�2�2�2�2�2�2�5�������������2�2�2�TUV��2�2�2�2�2�2�2�2�2�2���������������2�2�2�n3n3�2�2�2�2�2l3m3��2�2�2�2�2�2�2�2�2�2��������������2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2Q3�2�2�2.��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2\3]3^3�2�2�2��2�2�2�2�2�2����6��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2v[3�2�2��2�2�2�2�2�2���t���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2Z3�23�2��2�2�2�2�2�2������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2d3e3f3�2,�2��2�2�2�2�2�2�2c3�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2k3���-R3�2�2�2�2�2�2�2�2�2�2�2�2�2�2�R3�2�2�2�2�2�2�2�2�R3�2�2�2�2�2�2�2�2�2.1������������������������������������29������������������������������������:A������������������������������������B
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_1F/border.bin b/data/layouts/PokemonTower_1F/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/PokemonTower_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_1F/map.bin b/data/layouts/PokemonTower_1F/map.bin
new file mode 100644
index 000000000..f393c9f34
--- /dev/null
+++ b/data/layouts/PokemonTower_1F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������2�2�2�2�2������������������2�2�2�2�2�2�2�2�2��������������2�2�2�2�2�2�2�2�2�2�2�2�2�����������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������2�2�2�2�2�2�2�2�2�2�2�2�2�������������2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���������2�2�2�2�2�2�2�2�2�2�2��2�2�2������������2�2�2�2�2�2�2�2�2��2�����������������2�2�2�2�2���������������������2�2�2��������������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_2F/border.bin b/data/layouts/PokemonTower_2F/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/PokemonTower_2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_2F/map.bin b/data/layouts/PokemonTower_2F/map.bin
new file mode 100644
index 000000000..0d1e67b03
--- /dev/null
+++ b/data/layouts/PokemonTower_2F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������������������������������2�2�2�2�2�2�2������������������2�2�2�2�2�2�2�2�2���������������2�2�2�2�2�2�2�2�2�2�2���������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�2����������2�2�2�2���������2�2�2����2�2�2�2�2�2�2�2�2����������2������2�2�2������2�6�6��������2������2�2�2������2����������2�2�2����2�2�2�2�2�2�2�2�2��������2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2�������2����������2�2�2�2�2�2�2������������������2�2�����2���������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������2�2�2�2�2�2�2�2�2�2�2�������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_3F/border.bin b/data/layouts/PokemonTower_3F/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/PokemonTower_3F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_3F/map.bin b/data/layouts/PokemonTower_3F/map.bin
new file mode 100644
index 000000000..c591995c1
--- /dev/null
+++ b/data/layouts/PokemonTower_3F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������2�2�2�2�2��������������������2�2�2�2�2�2�2������������������2�2�2�2�2�2�2�2�2�����������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���������2�2�2��������������2��������2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�������2�2�2�2��2�2�2�2�2�2�2�2�2�2��2��6��������2�2��2�2�2����2�2�2��2�2����������2�2��2�2�2����2�2�2��2�2����������2�2��2�2�2�2�2�2�2�2�2��2�2��������2�2�2�2��2�2�2�2�2�2�2�2�2��2�2���������2�2�2��2�2�2��������2����������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������2�2�2�2�2�2�2�2�2�2���������������2�2�2�2�2�2�2�2�2�2�������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_4F/border.bin b/data/layouts/PokemonTower_4F/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/PokemonTower_4F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_4F/map.bin b/data/layouts/PokemonTower_4F/map.bin
new file mode 100644
index 000000000..eebe48c13
--- /dev/null
+++ b/data/layouts/PokemonTower_4F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������2�2�2�2�2������������������2�2�2�2�2�2�2�2�2��������������2�2�2�2�2��2�2�2���������������2�2����2��2���2�2�2�2����������2�2�2�2�2�2�2��2�2�2�2�2���2�2��������2�2�2����2�2�����2�2�2�2�2�������6��2�2�2�2�2�2��2�2�2�2�2�2�2�2����������2�2�2�2�2�2��2�2�2�2�2�2�2�2�6�6��������2�2�2����2�2����2�2�2�2����������2�2�2��2�2�2��2�2�2�2�2�2�2��������2�2�2�2�2����2�2����2�2�����������2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2��2���2�2�2�����2�2�2���������2�2�2�2�2�2�2��2�2�2�2�2�2�2���������������2�2�2���2�2�2�������������������2�2�2����������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_5F/border.bin b/data/layouts/PokemonTower_5F/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/PokemonTower_5F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_5F/map.bin b/data/layouts/PokemonTower_5F/map.bin
new file mode 100644
index 000000000..efc99cca9
--- /dev/null
+++ b/data/layouts/PokemonTower_5F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������2�2�2�2�2������������������2�2�2�2�2�2�2�2�2��������������2�2�����2�2����2�2�����������2�2���2�2�2�2�2�2�2����2���������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2�2�2������2�2�2�2�2�2�2�������2�2�2����2�2�2�2�2�2�2����2��6��������2����2�2�2�2�2�2�2����2����������2����2�2�2�2�2�2�2����2����������2��2�2�2�2�2�2�2���2�2�2�2��������2�2�2��2�2�2�2����2�2�2�2�2�2�2�2�������2�2���2�2�2�2�2�2�2�2�2�2�����������2�2���2�2�2�2�2�2�2�2�2��2�2�2���������2�2�����2�2�2����2�2�2������������2�2�2�2�2�2�2�2�2�2�2�����������������2�2�2�2�2����������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_6F/border.bin b/data/layouts/PokemonTower_6F/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/PokemonTower_6F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_6F/map.bin b/data/layouts/PokemonTower_6F/map.bin
new file mode 100644
index 000000000..fb8746f20
--- /dev/null
+++ b/data/layouts/PokemonTower_6F/map.bin
@@ -0,0 +1 @@
+��������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2���������������2�2�2�2�2�2�2�2�2�2�2�2������������2�����2�2�2���2�2�2����������2�2�2�2�2�2�2�2�2�2���2�2�2�2���������2�2�2�2�2�2�2�2�2�2���2�2����������2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2���������2�2��2�2�2�2�2���2�2�2�2�6�6���������2�2�������2�2�2�2�2�2��������2�2�2�2�2�2������2�2�2�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�����2���2���������2�2�2����2�2�2�2���2�2���������2�2�2�2�2��6��2�2�����2������������2������2�2���2�2�2�2������������2�2����2�2���2�2�������������������2������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_7F/border.bin b/data/layouts/PokemonTower_7F/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/PokemonTower_7F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/PokemonTower_7F/map.bin b/data/layouts/PokemonTower_7F/map.bin
new file mode 100644
index 000000000..7554673cf
--- /dev/null
+++ b/data/layouts/PokemonTower_7F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������2����2������������������2�2��2�2�2��2�2��������������2�2����2�2�2����2�2�����������2�����2�2�2�2�2�����2���������2������2�2�2�2�2������2��������������2�2�2�2�2�������������2�������2�2�2�2�2�������2�������������2�2�2�2�2��������������������2�2�2�2�2��������������������2�2�2�2�2���������������������2�2�2��������2��������������2�2�2���������������2�������2�2�2�������2���������2�����6�6�2�2�2�����2�����������������2�2�2����������������������2�2�2����������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PowerPlant/border.bin b/data/layouts/PowerPlant/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/PowerPlant/border.bin
diff --git a/data/layouts/PowerPlant/map.bin b/data/layouts/PowerPlant/map.bin
new file mode 100644
index 000000000..48a6e1984
--- /dev/null
+++ b/data/layouts/PowerPlant/map.bin
diff --git a/data/layouts/RockTunnel_1F/border.bin b/data/layouts/RockTunnel_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/RockTunnel_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/RockTunnel_1F/map.bin b/data/layouts/RockTunnel_1F/map.bin
new file mode 100644
index 000000000..80a6a266c
--- /dev/null
+++ b/data/layouts/RockTunnel_1F/map.bin
diff --git a/data/layouts/RockTunnel_B1F/border.bin b/data/layouts/RockTunnel_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/RockTunnel_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/RockTunnel_B1F/map.bin b/data/layouts/RockTunnel_B1F/map.bin
new file mode 100644
index 000000000..68eed9a4c
--- /dev/null
+++ b/data/layouts/RockTunnel_B1F/map.bin
diff --git a/data/layouts/RocketHideout_B1F/border.bin b/data/layouts/RocketHideout_B1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/RocketHideout_B1F/border.bin
diff --git a/data/layouts/RocketHideout_B1F/map.bin b/data/layouts/RocketHideout_B1F/map.bin
new file mode 100644
index 000000000..4a2ed565f
--- /dev/null
+++ b/data/layouts/RocketHideout_B1F/map.bin
diff --git a/data/layouts/RocketHideout_B2F/border.bin b/data/layouts/RocketHideout_B2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/RocketHideout_B2F/border.bin
diff --git a/data/layouts/RocketHideout_B2F/map.bin b/data/layouts/RocketHideout_B2F/map.bin
new file mode 100644
index 000000000..f849a0642
--- /dev/null
+++ b/data/layouts/RocketHideout_B2F/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������UVW���������2�2�2�2�2��2�2�2�2�2�2�2�2�23
3���2�2]2^_��
3�2�2����2����2��2��2��2��2��2�2����2�2e2fg��	�2�2����2�2�2�2�2�2�2�2�2�2�2�2�2�������2�2�2�2�2��
3�2�2�2�2����2�2������2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2	�2�2�2�2��2��2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2��2���2��2��2��2�2�2����2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2��2��2��2��2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�����2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2���2�2�2������������2���2����2�2�2�2�2�2�2�2�2�����������2�2�2�2������2�2�2�2�2�2�2���3�2�2�2�2����2����2�2�2��2�2�2�2�2�2�2�2����2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2�2�2���2����2�2�2�2�2�2�2��2���2��2��2��2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�������2��2�2�2�2��2������2��2�2�2�2�2�2�2�2�2�2�2�������2�2��2��2��2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2��2��2��2�2�2�2�2�2�2��2�2���2�2�2�2�2�2�2�2�2�2�2�2��2�2��2��2��2�2�2������2���2�2�2�2�2�2����2�2�2�2�2�2�2���2�2�2���������������
\ No newline at end of file
diff --git a/data/layouts/RocketHideout_B3F/border.bin b/data/layouts/RocketHideout_B3F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/RocketHideout_B3F/border.bin
diff --git a/data/layouts/RocketHideout_B3F/map.bin b/data/layouts/RocketHideout_B3F/map.bin
new file mode 100644
index 000000000..bdd886346
--- /dev/null
+++ b/data/layouts/RocketHideout_B3F/map.bin
@@ -0,0 +1 @@
+����������������������������������������������23
3�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�������������2�2�������2�2�������������2�2�����2�2���2�2�2�2�2�2�2�2�2�2�2�2��33�2�2�2�2�������2�2������2���2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2����2��2����2�2������2�2�������2�2�2�2�2�2�2�2�2������2�2������2���2��2��2�2���2���2�23���2���2���2��2�2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2���2���2�2�2�2���2�����2�2�2�2�2�2�2���2�2�2�������2�2�2�2�2�2�2���2�2�2n���������2���2���2�2�2���2�2���2�2�2�2��2�2���2�2�2���2�2���2�2�2�2�2�2�2���2�2�2�2�2�2�2���2�2�2�2�2�����2�2�2�2�2�2�2���2�2�2�2�2�2�2���2�2�2�2�2�2�2������2�2�����2�2�2�2�2�2�2�����2�2�����2�2�2�2�2�2�2���23�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/RocketHideout_B4F/border.bin b/data/layouts/RocketHideout_B4F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/RocketHideout_B4F/border.bin
diff --git a/data/layouts/RocketHideout_B4F/map.bin b/data/layouts/RocketHideout_B4F/map.bin
new file mode 100644
index 000000000..0e0b8ec93
--- /dev/null
+++ b/data/layouts/RocketHideout_B4F/map.bin
diff --git a/data/layouts/RocketHideout_Elevator/border.bin b/data/layouts/RocketHideout_Elevator/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/RocketHideout_Elevator/border.bin
diff --git a/data/layouts/RocketHideout_Elevator/map.bin b/data/layouts/RocketHideout_Elevator/map.bin
new file mode 100644
index 000000000..42e08c38d
--- /dev/null
+++ b/data/layouts/RocketHideout_Elevator/map.bin
@@ -0,0 +1 @@
+����������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/Route1/border.bin b/data/layouts/Route1/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/Route1/border.bin
diff --git a/data/layouts/Route1/map.bin b/data/layouts/Route1/map.bin
new file mode 100644
index 000000000..02ee26860
--- /dev/null
+++ b/data/layouts/Route1/map.bin
@@ -0,0 +1 @@
+�0�0�0�0$%$%$%$'�0�0�0�0&%$%$%$%0	00	00	00	0�0�0�0�0	00	00	00
0000000000�0�0�01�0�0�0�0�0�0�0�00	00	00	0�0�0�0�0�0�0�0�01�0�0�0������������00�0�0�0�0
0000
00
0
0
0
0
0
0
0
0
0
0
0
00
00	000
0
0
0
0
0
0
0
0
0
0
0
0
0000
00
0
0
0
0
0
0
0
0
0
0
0
00
00	00
0
0
0
0
0
0
0
0
0
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0000000&'000�0�0�0�0�0�0�0�0�000000000	0	00�0�01�0�0�0�0�0�000000000000�0�0�0
0
0
0
0
0
000000000000000
0
0
0
0
0
0������
0
0
0
0
0
0&'000000&%$%$'
0
0
0
0
0
000000000000�0�0�0
0
0
0
0
0
0000�0�0�0�0�0�0�0�01�0�00000000	00�0�0�01�0�0�0�0�0�0�0000000��0����00�����������0	00�0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�00	00�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�00000000000000000�0�0�0�00000000000
0
0
0
0
0
0�0�0�0�0
0
0
0
0
0
0�0�0�0�0&%$%$%$%$'
0
0
0
0
0
0����00000	00	00	0
0
0
0
0
0
0�0�0�0�00000
000000
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�0�0�0�0�0�0�0�0�0�01�0�01�0�0�0�0�0�0�0����	000������������
0	0
0
0
0
0
0
0
0�0�0�0�00	0
0
0
0
0
0
00
0
0
0
0
0
0
0�0�0�0�000
0
0
0
0
0
0
0
0
0
0
0
0	00�0�0�0�0
0
0
0
0
000
0
0
0
0
0
0
000	0
0
00
0
0
0
0
0	00����������
0
0��������000000000�
0
0�0000000�
0
0�
0
0
\ No newline at end of file
diff --git a/data/layouts/Route10/border.bin b/data/layouts/Route10/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route10/border.bin
diff --git a/data/layouts/Route10/map.bin b/data/layouts/Route10/map.bin
new file mode 100644
index 000000000..7e40aae43
--- /dev/null
+++ b/data/layouts/Route10/map.bin
@@ -0,0 +1 @@
+m�||||||||||||||||||||�quu ##################!squu*++++++++++++++++++,squu*++++++++++++++++++,squr3131313131313131313131313131313141)+,squr��
0	0�������������*+,sq}r0	000
0
0
0
0
0
0
0
0
0
0
0	0�*+,sqy��0�00	0
0
0
0
0
0
0
0
0
0
0
00�*+,sq�0�0�0�0�00
0
0
0
0
0
0
0
0
0
0
0	0�*+,sq�0�0�0�0�0	0
0
0
0
0
0
0
0
0
0
0
00�*+,sq�0�0�01�00
0
0
0
0
0
0
0
0
0
0
0	0�*+,sq��0�0	00	00	00	00	00	00	00�*+,sqm��������������
0
0�L*+,squr
0	0
0	0
0	0
0	0
0	0
0	0
0	0
0	0�*+,squr0000000000000000�*+,squ�iiiiiiiij	0
0	0
0	0
0	0�*+,sq�llllllllmr{1|1}1~1100�*+,sqqqqqqqqqqurHIJK�
0	0�*+,sq|||||||||}rPQRS�00�*+,sqq�yyyyyy�0yzXYZ[�
0	0�*+,sqq��0�0�0�0�01�0�0
0`ab��00�*+,sqq��0�0����
0�0�0�0�0�0
0	0�*+,sqq��0�0�0�01�0
0	0
0�0�0�0�0�000�*+,sqq��0�0�0�0�0
000�0�0�0�0�0
0	0�*+,sqq��0�0�0�0�00
0	0
0	0
0	0
0	0
0	0�*+,sqq��0�0�01�0
0000000000�*+,sqq��01�0�0�0000
0	0
0	0
0	0
0	0�*+,sqq��0�0000
0	0
00000000�*+,sqqr
0	0
0	0
0000
0	0
0	0
0	0
0	0�*+,sqqr00000
0	0
00000000�0�*+,sqqr�����������������*+,sqq�iiiiiiiiiiiiiij00*+,sqqklllllllllllllmr
0	0*+,sqqsqqqqqqqqqqqqqur00*+,sqq{||||||||�ur
0	0*+,sq�yP�%�%�%�%�S�sur00*+,sqr0Q,-$-$-$-.Tpsur
0	0*+,sqr
0R3���������Up{}r00*+,sqr0�2����Wpqqr�0�0*+,sqr
0�� !!!#�Tpqq��0�0*+,sq����()3*+�U3pq���0�0*+,sqr00000313"323330�0�0q��0�0�0*+,sq�j000000�0�0�0�0�q��0�0�0*+,sqqr�0�0�0�0�0�0�0�0�0�0�0�y��0�0�0*+,sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0*+,sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0*+,sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0 #1+,sqqu ##############1+++,sqqu*++++++++++++++++++,sqqu*++++++++++++++++++,sqqXYqqqqqqqqqqqqqqqqqqqqqqqqqqklllllllmqqqqqqkllllmqqqsqqqqqqquqqqqqqsqqqquqqqsqqqqqqq�lmqqqq{||||}qqq{||�qqqqqquqqqq�yyyyy�qqqqq{||||||}qqqq��00	00	0pqqq�yyyyy�0yyyyyyy��000�00pqqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�00	00	0pqqq��0�0�0�0�0�0�0�0�0�0�0�01�00000pqqq��0�0�0�0�0�0�0�0�0�0�0�01�0	00	00	0pqq���0�0�0�0�0�0�0�0�0���Mj00000pqq��0�0�0�0�0�0�0�0�0�0�klm��
0����qq��0�0�0��������squr0	00	00pqq��0�0�0�kllllll�qur00000pqq�����sqqqqqqqqur0	00	00pqq��0�01�{||||||||}�����
0pqq�1�0�0xyyyyyyyyyyz0000
0pqq��0000000000000000	00	00pqqr0	00	00	00	00	00	00	000000	0pqqr00000000000000000000pqq�iiiiiiiij0	00	00	0
0
0
00	0pqkllllllllmr000000�2�2�200pqsqqqqqqqqur0	00	0�2�2�2�2�2�2�2pqsqqqqq�||}���
0h��������qsqqqqqu�yyz000p�������qqsqqqqqur0	00	00	0p�������qqsqqqqqur000000p�������qqsqqqqqur0	00	00h��������qq{|||||}r00000pk�������mq
\ No newline at end of file
diff --git a/data/layouts/Route11/border.bin b/data/layouts/Route11/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/Route11/border.bin
diff --git a/data/layouts/Route11/map.bin b/data/layouts/Route11/map.bin
new file mode 100644
index 000000000..6062ac7f3
--- /dev/null
+++ b/data/layouts/Route11/map.bin
@@ -0,0 +1,7 @@
+$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%	00	0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
00	00	00$����%000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
000000hsq0q0uj	00	0�0�01�0�0�0�0�0�0�0�0�0�0�0�01�0�0
0
0
0
0�0�01�0�0�0�0�0�0�0�0�01�0�0
0
0
00	00	00$%$'psq0q0ur000�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0�0�0�0
0
0
0
0
0
0
0
0
0�0�0�0
0
0
0	000�0	00	0
0p{||}r	00	0�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
00	00	00���xy�0yyz&'000�0�0�0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0
0
0	0���DEEEEF%$%$%$%0	00	00	00	000�0�0�0�0�0�0�0�0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0
0
00	00�1LMMMMN'������0000000000�0�0�0�0�0�0�0�0
0
0
0
0�0�01�0�0�0�0�01�0�0
0
0
0
0�0�01�0�0�0�0�01�0�0
0
0
0
0�0�0�0�00�081������<1�0�0�0�0�0�00	00	00	00	00	0�0�0�0�0�01�0�0�0�0�0�0�0�0�0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0�0�0�0
0
0
0
0�0�0�0�0	0�0@1������D1�0�0�0�0�0�0############$0	0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0�0�0�0
0
0
0
0�0�01�00�0H1deeeefL1�0�0�0�0�0�0++++++++++++,00�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0�0�0�0�0�0�0�01�0�0
0
0
0
0
0�0�0�0
0
0
0
0�0�0�00����������������
+
+
+
+
+
+,0	0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0
0�0�0�0
0
0
0
0�0�0�0	0	00	0000000000��������������0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0�0�0�00000000	0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0�0�0�00	00	000�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�01�0�0�0�0�01�0�0
0
0
0
0�0�0�000000	0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�00	00	000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0000000�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�200000�2�2�2�2�2�2�2�2�2�200000
\ No newline at end of file
diff --git a/data/layouts/Route12/border.bin b/data/layouts/Route12/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route12/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route12/map.bin b/data/layouts/Route12/map.bin
new file mode 100644
index 000000000..ca203b565
--- /dev/null
+++ b/data/layouts/Route12/map.bin
diff --git a/data/layouts/Route12_NorthEntrance_1F/border.bin b/data/layouts/Route12_NorthEntrance_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Route12_NorthEntrance_1F/border.bin
diff --git a/data/layouts/Route12_NorthEntrance_1F/map.bin b/data/layouts/Route12_NorthEntrance_1F/map.bin
new file mode 100644
index 000000000..f723c9817
--- /dev/null
+++ b/data/layouts/Route12_NorthEntrance_1F/map.bin
@@ -0,0 +1 @@
+���������������2������2�2��2�2�2�2�2��2�2��2��2�2�2�2�2��2�2�2�2��2�2�2�2�2��2�2�2�2��2�2�2�2�2��2�2�2�2��2�2�2�2�2��2�2��2��2�2�2�2�2����2�2��2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2���2�2��2�2�2�2�2�2����2��2�2�2�2�2�2�����
\ No newline at end of file
diff --git a/data/layouts/Route13/border.bin b/data/layouts/Route13/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route13/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route13/map.bin b/data/layouts/Route13/map.bin
new file mode 100644
index 000000000..b1f55a645
--- /dev/null
+++ b/data/layouts/Route13/map.bin
diff --git a/data/layouts/Route14/border.bin b/data/layouts/Route14/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route14/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route14/map.bin b/data/layouts/Route14/map.bin
new file mode 100644
index 000000000..48d7c0dcd
--- /dev/null
+++ b/data/layouts/Route14/map.bin
@@ -0,0 +1 @@
+$%$%$%$%$%$%$%$%$%�0	00	00	00	00	00	00	00	00�00����������������0	00	00	00	00	000	0	00	00������������00�����0	00	00	00	00	00	00	00	00���00��������������0	00	00	000	000	00	00	00��������000�������00000	00�0�0�00	00	00	00�0000000�0�0�0��������000	00	00�0�0�0��000000
0�0�0�0��
0�0�0�0��&%$%$�0�0�0�0��
0
0
0
0
0�0�0�0��
0
0
0
0
0�0�0�0��
0
0
0
0
0�0�0�0��
0
0
0
0
0�0�0�0�&%$%$%�
0
0
0
0
0�0�0�0�"#####�
0
0
0
0
0�0�0�0�*+�
�
�
�
�0	00	0
0�0�0�0�*+�
�
�
�
�
0�����0�0�0�*+�
�
�
�
�0	0�0�0�0�0�0�0�*+�
�
�
�
�00�0�0�0�0�0�0�*++�
�
�
�0	0�0�0�0�0�0�0�*++++�
�00�0�0�0�0�0�0�31313141)�
�0	0�0�0�0�0�0�0�����*�
�00�0�0�0�0�0�00	00	0�*�
�0	0�0�0�0�0�0�00000�*�
�00�0�0�0&'�0�0�00	00	0�*�
�0	0�0�0�000�0�0�00000�*�
�00�0�0�0�0�0�00	00	0�*�
�0	0�0�0�0�0�0�00000�*�
�00�0�0�0�0�0�00	00	0�*�
�0	0�0�0�0�0�0�00000�*�
�00�0�0�0�0�0�0000	0�*�
�0	0�0�0�0�0�0�00000�*�
�00�0�0�0�0�0�0000	0�*�
�0	0�0�0�0�0�0�00000�*�
$%$%�
0
0�0�0�0�0�0�0000
0�*�
�0�0�0�0�0�0�01�0�0&'�0�0�0000
0�*�
$%�0�0�0�0�0�0�0�0�0�00	0�0�0�00	00
0�*�
	0
0�0�0�0�0�0�0�0�0�0�000�0�0�0000
0�*�
0�0	00	00	00	00	00	0�0�0�00	00
0�*�
��000000000000�0�0�0000
0�*�
0
00	00000000	00	0�0�0�00	00
0�*�
00
00	00	00	00	00	00�0�0�0000
0�*1�1�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�00	00
0�*1�1�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�000�0
0�*1�1�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00	00
0�*1�1����������������������*1�10000000000000000000000*1�1*�
*�
*�

\ No newline at end of file
diff --git a/data/layouts/Route15/border.bin b/data/layouts/Route15/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/Route15/border.bin
diff --git a/data/layouts/Route15/map.bin b/data/layouts/Route15/map.bin
new file mode 100644
index 000000000..786f67988
--- /dev/null
+++ b/data/layouts/Route15/map.bin
@@ -0,0 +1 @@
+$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0$%$%$%$%$'��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
00	00	00��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0����DEEEEF�0	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00	00$%$%$'
0
0
0�1LMMMMN�1��������������������������������������������������������0�0�0�0�0�0�0�0�081������<1�0�0�0
0
0
0
0
0
00
00
00
0
0
0
0
0
0
00	00
00	00	000
00
0
0
0
0
00
00
0
0
0
0
0
0
0
00
00
00	0�0�0�0�0�0�0�0�0�0@1������D1�0�0�0
0
0
0
0
0
0000000
0
0
0
0
0
0000000000000
0
0
0
00000
0
0
0
0
0
0
0000000�0�0�0�0�0�0�0�0�0H1deeeefL11�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0������������������0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00000000000��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0��������������������������������������������������������00000000000000000000000000000000000000000000000000000000
\ No newline at end of file
diff --git a/data/layouts/Route16/border.bin b/data/layouts/Route16/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route16/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route16/map.bin b/data/layouts/Route16/map.bin
new file mode 100644
index 000000000..a88b95a6a
--- /dev/null
+++ b/data/layouts/Route16/map.bin
@@ -0,0 +1 @@
+�
,�
,+
,(
21&%$%$%$]-0-0-0^$%$%$%$DEEEEF%$%$%$%$%$%$%$%,��������45667������.LMMMMN/��������������,�0�0�0�0�0�0�0<=BC?�0�0�0�0�0�081LMMMMN<1�0�0�0�0�0
0
0
0
0
0
0
0
0
0,�0�0�0�0�0�01�0�0�0�0�01�0�0�0�0�0@1LMMMMND1�0�0�0�0�0
0
0
0
0
0
0
0
0
0,�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�0H1������L1�0�01�0�0
0
0
0
0
0
0
0
0
0,�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00	00	0DEEEEF0	00�0�01�0�0�0�0�0�0�0�0�0,�0000000000000000000LMMMMN000�0�0�0�0�0�0�0�0�0�0�0�0,��������������������LMMMMN����0�0�0�0�0�0�0�0�0�0�0�0,�0	00	00	00	00	00	00	00	00	0�1�������1
0�����������
0&%$%$%,�0�0�0�00000�0�0�0�0�0�0�0�0�0�081������<1�0�00	00	00	00	00	00	00	0
0,�0�0�0�00	00	0�0�0�0�0�0�0�0�0�0�0@1\]0]0]0]0^D1�0�000000000000000000
0,�0�0�0�00000�0�0�0�01�0�0�0�0�0H1deeeefL1�0�00	00	00	00	00	00	00	0
0,�0�0�0�00	00	0�0�0�0�0�0���������������������������������,�0�0�0�00000�0�0�0�0�0�,�0�0�01�0�0�01�0�0�0�0�,�0�0�0�0�0�0�0�0�0�0�0�0�0�,�0�0�01�0�0�0�01�01�0�0�
\ No newline at end of file
diff --git a/data/layouts/Route16_NorthEntrance_1F/border.bin b/data/layouts/Route16_NorthEntrance_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Route16_NorthEntrance_1F/border.bin
diff --git a/data/layouts/Route16_NorthEntrance_1F/map.bin b/data/layouts/Route16_NorthEntrance_1F/map.bin
new file mode 100644
index 000000000..c41db67b6
--- /dev/null
+++ b/data/layouts/Route16_NorthEntrance_1F/map.bin
@@ -0,0 +1 @@
+����������������������2333333333�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2
�2�2�2�2�2�2�2�2�2�2�2������������2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��������2�2���2�2�2�2�2�2��2�2���2�2�2�2�2�2��2�2��
\ No newline at end of file
diff --git a/data/layouts/Route17/border.bin b/data/layouts/Route17/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route17/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route17/map.bin b/data/layouts/Route17/map.bin
new file mode 100644
index 000000000..24ce3c11f
--- /dev/null
+++ b/data/layouts/Route17/map.bin
@@ -0,0 +1 @@
+,�>3 3!3"3>3?3>3?3 3!3"3?3>3�,#$3(3)3*3F3G3F3G3(3)3*3G3,3%&%$%$%$%,+>3(3)3*3>3?3>3?3(3)3*3?3F3->3"######,343(3)3*3F3G3F3G3(3)3*3G3>35F3*+�
�
�
�
�
,�>3(3)3*3>3?3>3?3(3)3*3?3>3�>3*�
�
�
�
�
�
,�F3(3)3*3F3G3F3G3(3)3*3G3F3�F3*�
�
�
�
�
�
,#$3(3)3*3>3?3>3?3(3)3*3?3,3%>3*+�
�
�
�
�
,+>3(3)3*3;3<3<3=3(3)3*3G3F3-F3*+++++�
,343(3)3*3C3D3D3E3(3)3*3?3>35>3313131313141)
,�F3(3)3*3C3D3D3E3(3)3*3G3F3��������*,�>3(3)3*3C3D3D3E3(3)3*3?3>3?3>3?3>3?3>3?3�*,#$3(3)3*3C3D3D3E3(3)3*3G3F3R3R3R3R3R3R3,3%*,+>3(3)3*3C3D3D3E3(3)3*3?3>3R3R3R3R3R3R3F3-*,343(3)3*3C3D3D3E3(3)3*3G3F3R3R3R3R3R3R3>35*,�>3(3)3*3K3L3L3M3(3)3*3?3>3R3R3R3R3R3R3?3�*,�F3(3)3*3F3G3F3G3(3)3*3G3F3R3R3R3R3R3R3G3�*,#$3(3)3*3>3?3>3?3(3)3*3?3>3R3R3R3R3R3R3,3%*,+>3(3)3*3F3G3F3G3(3)3*3G3F3R3R3R3R3R3R3F3-*,343(3)3*3>3?3>3?3(3)3*3?3>3R3R3R3R3R3R3>35*,�F3(3)3*3F3G3F3G3(3)3*3G3F3R3R3R3R3R3R3G3�*,�>3(3)3*3>3?3>3?3(3)3*3?3>3R3R3R3R3R3R3?3�*,#$3(3)3*3F3G3F3G3(3)3*3G3F3R3R3R3R3R3R3,3%*,+>3(3)3*3>3?3>3?3(3)3*3?3>3?3>3?3>3?3>3F3-*,343(3)3*3F3G3F3G3(3)3*3G3;3<3<3=3F3G3F3>35*,�>3(3)3*3>3?3>3?3(3)3*3?3C3D3D3Q3<3<3=3?3�*,�F3(3)3*3F3G3F3G3(3)3*3G3C3D3D3D3D3D3E3G3�*,#$3(3)3*3>3?3>3?3(3)3*3?3K3L3L3P3D3D3E3,3%*,+>3(3)3*3F3G3F3G3(3)3*3G3F3G3F3K3L3L3M3F3-*,343(3)3*3>3?3>3?3(3)3*3?3>3?3>3?3>3?3>3>35*,�F3(3)3*3F3G3F3G3(3)3*3G3F3G3F3G3F3G3F3G3�*,�>3(3)3*3>3?3>3?3(3)3*3XYYZ 3!3"3>3?3�*,#$3(3)3*3F3G3F3G3(3)3*3`aab(3)3*3F3,3%*,+>3(3)3*3>3?3>3?3(3)3*3`aab(3)3*3>3F3-*,343(3)3*3F3G3F3G3(3)3*3`aab(3)3*3F3>35*,�>3(3)3*3>3?3>3?3(3)3*3`aab(3)3*3>3?3�*,�F3(3)3*3F3G3F3G3(3)3*3`aab(3)3*3F3G3�*,#$3(3)3*3>3?3>3?3(3)3*3`aab(3)3*3>3,3%*,+>3(3)3*3F3G3F3G3(3)3*3`aab(3)3*3F3F3-*,343(3)3*3>3?3>3?3(3)3*3`aab(3)3*3>3>35*,�F3(3)3*3F3G3F3G3(3)3*3`aab(3)3*3F3G3�*,�>3(3)3*3>3?3>3?3(3)3*3`aab(3)3*3>3?3�*,#$3(3)3*3F3G3F3G3(3)3*3`aab(3)3*3F3,3%*,+>3(3)3*3>3?3>3?3031323`aab(3)3*3>3F3-*,343(3)3*3F3G3F3G3F3G3F3`aab(3)3*3F3>35*,�>3(3)3*3XYYZ8393:3`aab(3)3*3>3?3�*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3>3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3F3F3-*,343(3)3*3`aab@3A3B3`aab(3)3*3>3>35*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3F3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3>3F3-*,343(3)3*3`aab@3A3'`aab(3)3*3F3>35*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3>3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3F3F3-*,343(3)3*3`aab@3A3B3`aab(3)3*3>3>35*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3F3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3>3F3-*,343(3)3*3`aab@3A3B3`aab(3)3*3F3>35*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3>3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3F3F3-*,343(3)3*3`aab@3A3'`aab(3)3*3>3>35*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3F3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3>3F3-*,343(3)3*3`aab@3A3B3`aab(3)3*3F3>35*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3>3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3F3F3-*,343(3)3*3`aab@3A3B3`aab(3)3*3>3>35*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3F3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3>3F3-*,343(3)3*3`aab@3A3'`aab(3)3*3F3>35*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3>3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3F3F3-*,343(3)3*3`aab@3A3B3`aab(3)3*3>3>35*,�F3(3)3*3`aab@3A3B3`aab(3)3*3F3G3�*,�>3(3)3*3`aab@3A3B3`aab(3)3*3>3?3�*,#$3(3)3*3`aab@3A3B3`aab(3)3*3F3,3%*,+>3(3)3*3`aab@3A3B3`aab(3)3*3>3F3-*,343(3)3*3`aab@3A3B3`aab(3)3*3F3>35*,�>3(3)3*3N3N3N3N3@3A3B3`aab(3)3*3>3?3�*,�F3(3)3*3F3G38393O3A3B3`aab(3)3*3F3G3�*,#$3(3)3*3>3?3@3A3A3A3B3`aab(3)3*3>3,3%*,+>3(3)3*3F3G3H3I3I3I3`aab(3)3*3F3F3-*,343(3)3*3>3?3XYYYYdaab(3)3*3>3>35*,�F3(3)3*3F3G3`aaaaaaab(3)3*3F3G3�*,�>3(3)3*3>3?3`aaaaaaab(3)3*3>3?3�*,#$3(3)3*3F3G3`aaaaaaab(3)3*3F3,3%*,+>3(3)3*3>3?3`aaaaaaab(3)3*3>3F3-*,343(3)3*3F3G3`aaaaaaab(3)3*3F3>35*,�>3(3)3*3>3?3`aaaaaaab(3)3*3>3?3�*,�F3(3)3*3F3G3`aaaaaaab(3)3*3F3G3�*,#$3(3)3*3>3?3`aaaaaaab(3)3*3>3,3%*,+>3(3)3*3F3G3`aaaaaaab(3)3*3F3F3-*,343(3)3*3>3?3`aaaaaaab(3)3*3>3>35*,�F3(3)3*3F3G3`aaaaaaab(3)3*3F3G3�*,�>3(3)3*3>3?3`aaaaaaab(3)3*3>3?3�*,#$3(3)3*3F3G3`aaaaaaab(3)3*3F3,3%*,+>3(3)3*3>3?3`aaaaaaab(3)3*3>3F3-*,343(3)3*3F3G3`aaaaaaab(3)3*3F3>35*,�>3(3)3*3>3?3`aaaaaaab(3)3*3>3?3�*,�F3(3)3*3F3G3`aaaaaaab(3)3*3F3G3�*,#$3(3)3*3>3?3`aaaaaaab(3)3*3>3,3%*,+>3(3)3*3F3G3`aaaaaaab(3)3*3F3F3-*,343(3)3*3>3?3`aaaaaaab(3)3*3>3>35*,�F3(3)3*3F3G3`aaaaaaab(3)3*3F3G3�*,�>3(3)3*3>3?3`aaaaaaab(3)3*3>3?3�*,#$3(3)3*3F3G3`aaaaaaab(3)3*3F3,3%*,+>3(3)3*3>3?3N3N3N3N3N3N3N3N3N3(3)3*3>3F3-*,343(3)3*3F3G3F3G3F3G3F3G3F3G3F3(3)3*3F3>35*,�>3(3)3*3>3?3>3?3>3?3>3?3>3?3>3(3)3*3>3?3�*,�F3(3)3*3F3G3F3G3F3G3UG3F3G3F3(3)3*3F3G3�*,#$3(3)3*3>3?3XYYYYYYYZ(3)3*3>3,3%*,+>3(3)3*3F3G3`aaaaaaab(3)3*3F3F3-*,343(3)3*3>3?3`aaaaaaab(3)3*3>3>35*,�F3(3)3*3F3G3`aaaaaaab(3)3*3F3G3�*,�>3(3)3*3>3?3`aaaaaaab(3)3*3>3?3�*,#$3(3)3*3F3G3`aaaaaaab(3)3*3F3,3%*,+>3(3)3*3>3?3`aaaaaaab(3)3*3>3F3-*,343(3)3*3F3G3N3N3N3N3N3N3N3N3N3(3)3*3F3>35*,�>3(3)3*3>3?3>3?3>3?3>3?3>3?3>3(3)3*3>3?3�*,�F3(3)3*3F3G3F3G3F3G3F3G3F3G3F3(3)3*3F3G3�*,�>3031323>3?3>3?3>3?3>3?3>3?3>3031323>3?3�*,�������F3G3F3���F3F3G3������*0	###$� 3!3"3?3>3?3 3!3"3�"#	#1�
+++,�(3)3*3G3F3G3(3)3*3�*++�
�
+++,�(3)3*3?3>3?3(3)3*3�*++�
�
�
++,�(3)3*3;3<3=3(3)3*3�*++�
�
�
++,�(3)3*3C3D3E3(3)3*3�*++�
�
�
++,�(3)3*3C3D3E3(3)3*3�*++�
�
�
++,�(3)3*3C3D3E3(3)3*3�*++�
�
�
++,�(3)3*3C3D3E3(3)3*3�*�
�
+++,�(3)3*3C3D3E3(3)3*3�*++�
�
+++,�(3)3*3C3D3E3(3)3*3�*++�
�
+++,�(3)3*3C3D3E3(3)3*3�*++�
�
+++,�(3)3*3C3D3E3(3)3*3�*++�
�
+++,�(3)3*3C3D3E3(3)3*3�*++�
�
+++,�(3)3*3C3D3E3(3)3*3�*++�
�
+++,�(3)3*3K3L3M3(3)3*3�*�
�
+++,�(3)3*3G3F3G3(3)3*3�*++�
�
+++,�(3)3*3?3>3?3(3)3*3�*++�
�
�
++,�(3)3*3G3F3G3(3)3*3�*+�
�
�
�
++,�(3)3*3?3>3?3(3)3*3�*+�
�
�
�
�
+,�031323F3G3031323�*+�
�
�
�
�
+,�����>3�����*+�
�
�
�
�
+,�0	00	00	00	00�*+�
�

\ No newline at end of file
diff --git a/data/layouts/Route18/border.bin b/data/layouts/Route18/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route18/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route18/map.bin b/data/layouts/Route18/map.bin
new file mode 100644
index 000000000..9e246b459
--- /dev/null
+++ b/data/layouts/Route18/map.bin
@@ -0,0 +1 @@
+�
�
�
++�0
000000
00�++�
�
�
�
�
�
�
�
+,��
�
�
++�00	00	00	000���+�
�
�
�
�
�
�
+,��
�
�
��+,�0
00000000�*+��+�
�
�
�
�
�
++,��
�
+��+,�00	00	00	00
0�*+++��++����
�
++,�000000000�*+++������
+++,�00	00	00	00	0�*++++++++++,�&%$%$%$%$%$%$%$%$%$%$%$%$%�
��+++,�0	00000000�mnnnnnnnnnnnno�DEEEEF��
��+++,�0�0�0�0�0�0�0�0003131313131313131313131313131���������1LMMMMN�1	00	0��������
+++,��01�0�0�0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�081������<1�0�0�0�0�0�0�0�0�0�0�0�
+++,��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0@1������D1�0�0�0�0�0�0�0�0�0�0�0�
+��++,��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�0�0H1deeeefL1�0�0�0�0�0�0�0�0�0�0�0�
+��++jffffffffffffffffffffffffffffffg����������	00�����������
++++++++++++++++++++++++++++++++,�0	00	00	00000	0�
++++++++++++++++++++++++++++++++,�0
0
0
0
0
0
0	0	000�
�
++��+++++����++++++++++++++++++++++,�0
0
0
0
0
0
00��
�
�
+��+++����+++++++++��++��++�0
0
0
0
0
0
0	0��
�
�
+++��++++++�����������0
0
0
0
0
0
00��
�
�
�
++++������++++��++++��+,�0	00	00	00	0�&%$%$%�
�
�
�
�
�
�
�
++++��+++�
�
�
�
�
�
�
�
�
�
�
�
�
+,����������"####$�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
0##########1�
�
�
�
0
\ No newline at end of file
diff --git a/data/layouts/Route19/border.bin b/data/layouts/Route19/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route19/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route19/map.bin b/data/layouts/Route19/map.bin
new file mode 100644
index 000000000..54388bc49
--- /dev/null
+++ b/data/layouts/Route19/map.bin
@@ -0,0 +1 @@
+psqqqu��1�1�1�1�1�1�1�1�1�1�sqqqurpsqqqu�1111111111�sqqqurpsqqqu�1111111�11�sqqqurpsqqqu���������11�sqqqurpsqqqu�1111111�11�{�qqurpsqqqu���������11�qsqqurp{�q�}�1111111�11�qsq�}rpq{|}q���������11�q{|}qrx|||||�1111111111�|||||z#####	!11111111 	#####�
�
+++,11111111*++�
�
�
�
�
�
�
+��,11111111*��+�
�
�
�
�
�
�
�
+��0!111111*��+�
�
�
�
�
�
�
�
++0#!11111*+�
�
�
�
�
�
�
�
++++0#####1��+�
�
�
�
�
++++++++++++++��+�
�
�
�
�
+++++++++++++++�
�
�
�
�
+++++++++++++++�
�
�
�
�
+++++++++++��+�
�
�
++++++++++++++��+�
�
�
+++++++++++++++++���
�
++++++++++++++++++���
�
++++++++++++++++++�
�
+��++++++++++++++++�
��+��++++++++++++++++�
��++++++++++++++++++++++++++++++++++++��+��+++++++++++++++��+��+��++++++++++++++++++��++++++++++++++++++++++++++++++++++++++��++++++++++++++++++++��++��++++++++++++++++++��+++++++++++++++++++++++++++++++++++++++++++++++++++++��++��++++++++++++++����+�
��++++++++++++++++��+�
+++++++++++++++��++�
+++++++++++++++��++�
+��+++++++++++++++��+�
+��+++++++++++++++��+�
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++��++++++++++++++++++++++��++++++++++++++++++++++��++++++++++++++++++++++��+++++++++++++++++++++++++++++++++++++++++��+�
++++++++++++++++++��+�
+++++++++++++++++++�
+++++++++++++++++�
++++++++��+++++++�
++++++++��+++++++++�
�
�
++��++��+++++�
�
�
����+�
�
�
�
�
+�
�
�
�
++++++�
�
�
�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route2/border.bin b/data/layouts/Route2/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/Route2/border.bin
diff --git a/data/layouts/Route2/map.bin b/data/layouts/Route2/map.bin
new file mode 100644
index 000000000..1d093f92b
--- /dev/null
+++ b/data/layouts/Route2/map.bin
@@ -0,0 +1 @@
+	0�0�0�0$%$%$%	0�0�0�0$%$%$%$%$%
0
0
0
0
0
0
0�0�0�0����������
0
0
0
0
0
0
0�0�0�0�0	00	00	00	00
0
0
0
0
0
0
0�0�0�0�000000000
0
0
0
0
0
0
0�0�0�0�0	00	00	00	00
0
0
0
0
0
0
0�0�0�0�hiiiiiij0
0
0
0
0
0
0
0�0�0�0�pkllllmr	0
0
0
0
0
0
0
0�0�0�0�psqqqqur00	0�0�0�0�0�01�0�0�psqqqqur000�0�0�0�0�0�0�0�0�p{||||}r	00	0�0�0�01�0�0�0�0�xyyy�0yyz000�0�0�0�000	00�0�0�0�0�0�0�0�0��x1y1y1z1���0�0�0�0�0�0�0�0�0�0DEEEEEEF�	00	0�0�0�0�0�0�0�0�0LMMMMMMN0000�0�0�0�0�0�0�0�0LMMMMMMN0�0�0�0�0�0�0	0��������00000000��������0	00	00	00	0��������00000000,0-0-0-0/0	00	046657�0�0�0<=?�0�0�000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0��0���0000000	00	00	00000000	00	00	0000000���
0��0	00	00	00000000	00	00	0000000���
0��0000000�0�0�0�0	0
0�0�0�0�0
0�x1y1y1z1�DEEEEFLMMMMN������D0E0E0E0E0E0E0F0p����qLMMMMMMNd��1�1�fLMMMMMMN��1�1�1�1���������	0�0�0�0�0	0��������0�0�0�0�00\]0����]0^
000
000de��1�1�ef$%$%���
0�����1�1�1�1������0�0�0�0�0	000�0�0�0�00	00	00	00�0�0�0�0000�0�0�0�00000000�0�0�0�0	0���������	00	00
0�0�0�000�0�0�0
0
0
0
0
0
0
000	0�0�0�0	00�0�0�0
0
0
0
0
0
0
00��
0���0�0�0�0
0
0
0
0
0
0
0	00	0
00
0
00�0�0�0
0
0
0
0
0
0
0000�0�0�0
00�0�0�0
0
0
0
0
0
0
000	0�0�0�0	00�0�0�00	00	00	00	0&'00�0�0�000�0�0�00000000000
0�0�0�0�0
00�0�0�00�0�0�0�0	00�0�0�00�0�0�0�000�0�0�0
0000
000�0�0�0&%$%$%$%00	000
00�0�01�0�0�0�0�0�0�0�0
0�0�0�0�000�0�0�0�0�0�0�0�0�0�0�0&'
0�0�0�0�0
00�0�0�0�0�0�0�0�01�0�00	0
0�0�0�0
0
0�������
0
0���00��
0���00�0�0�0�0�0�0�01�0�00	00	00	0�0�01�0�0�0�01�0�00�0�0�000�0�0�0	00	0�0�0�0�0�0�0�000�0�0�0
0000�0�0�0�0�0�0�0
00�0�01�0�0�0�01�0�0�0�0�0�000�0�0�0�0�01�01�0�0�0�0�00000000	0�0�0�000000000�00�0�0�000�0	0�0�0�0
\ No newline at end of file
diff --git a/data/layouts/Route20/border.bin b/data/layouts/Route20/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route20/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route20/map.bin b/data/layouts/Route20/map.bin
new file mode 100644
index 000000000..534a7034d
--- /dev/null
+++ b/data/layouts/Route20/map.bin
@@ -0,0 +1 @@
+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++����+++�
�
�
�
�
�
�
�
++��++++����++++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+�
�
�
�
�
�
�
�
�
++++++++++++��++++++����++�
�
�
�
+�klm�������++�
�
�
�
�
�
�
�
�
�
�
�
�
++++++++�
�
�
�
�
�
�
�
�
++��+�
�
�
�
�
�
�
++��++��������++++++++�k�q�m�+++++��++++++++��++++++++����++++++++++++��++++++++��++����+++++++++sqsqqququ+(�2�2�2�2�2�2�2�2)+��������++������+++++++++++++��+++++++��++1
11+++++++++++++++++++++++(�sq{�q�}quu�2�211111111�2)++++��++��++++++����++++++++++����+��++++��+1%11&1
11++++++++++++++++++++���{�q{|}q�}�11111111111�2)+++++++++++++++++++++++++++++++++++++++��+++��+++++++11111&11+++++++++++++++++++++����{�qqq�}��1111�����111*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++11111.11++++++++++++1
1
1
11+++++++,1��{|||}��1111��klm��11*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++111111+++++++++++++1111&11+++++11�yy�0yy�111��k�q�m��1*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++111111+++++111111111111�sqsqqququ�*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++11-1111++++++0!11111111111�sq{�q�}quu++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111+++++++,1111111 ##!�{�q{|}q�}u+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1
11+++++++++++++++++++0#######1+��{�qqq�}�}*+++++++++++++++++++++++++++++++++++++++++++++++++++1
11++++++++++++1.11+++++++++++++++++++++++++++1��{|||}�} 1+++++++++++++++++++++++++++++++++++++++��+++++++++1%111++++++++++++11++++++++++++++++++++����+0!�yy�0yy} 1++��++++++++++++++++++++++++++++++++++++++��+++++++++1111++++++++++++++++++++++++++++++++++����++++,1111111 1+++����++++++++++++++++++++++++++++++++++��+++++++++++++++++++++++++++++++++++++++++++++++++++0##!1111*++++����++��++++++++++��++++++++++++++++��++��++++��++++��++��++++++++++++++++++++++0####1++����++++��++++����++++��++++++��++++����++������++��������������������++�
�
�
�
++������++++����++�
�
�
�
�
+��+�
�
�
�
+++�
�
�
+��+�
�
�
++��++++��++������������++�
�
�
�
�
�
�
�
++++��++�
�
�
�
�
�
++��++++
\ No newline at end of file
diff --git a/data/layouts/Route21_North/border.bin b/data/layouts/Route21_North/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route21_North/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route21_North/map.bin b/data/layouts/Route21_North/map.bin
new file mode 100644
index 000000000..02a4bcd54
--- /dev/null
+++ b/data/layouts/Route21_North/map.bin
@@ -0,0 +1 @@
+�*++,��������*++,0	00	00	0��*++,000000��*++,0	00	00	0��*++,000000��*++,
0
0
0
0
0
0��*++,
0
0
0
0
0
0��*++,
0
0
0
0
0
0��*++,
0
0
0
0
0
0��*++,
0
0
0
0
0
0�$%$%$%�*++,
0
0
0
0
0
0��������*++0######	#####�*+++++++++++�
�
�
$%$%$'�*+++++++++++�
�
�
�������*++++++++++�
�
�
�
#####	1++++++++++�
�
�
�
�
�
++++++++++++�
�
�
�
�
�
�
��++++++++++++���
�
�
�
�
�
��++++++++++++���
�
�
�
�
�
++++++++++++++++�
�
�
+��++++++++++��++�
�
�
+��++++++++++��++���
�
+��+++++++++++++++++���
�
+��+++++++++1
1
11+++��++++++++++1%1111+++��++++++++++++111.11+++++++++++++++1111+++++++1
1
11+++++++++++++++1%111&1
11+++++++++++++1111111++++++++++++��+1111111++++++++++++��+111-11.11++++++++++++++++111++++++++++++++++++++++++++++++++++��++++++++++++++++++��+++++++++++++++++��+++++++++++++++��+��+++++++++++++++��++�
++++++++++++++++++�
�
+++��+++++++++++++�
�
+��++��++++++++1
11++�
�
+��+++++++++++1%11&11+�
�
++++++++++++11111+���
�
++++++++++++111.11+��+�
++��++++++++++1111+++�
++��+++++++++++++++++�
��++++++++++++++++++++��+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
diff --git a/data/layouts/Route21_South/border.bin b/data/layouts/Route21_South/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/Route21_South/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route21_South/map.bin b/data/layouts/Route21_South/map.bin
new file mode 100644
index 000000000..30c2cba6f
--- /dev/null
+++ b/data/layouts/Route21_South/map.bin
@@ -0,0 +1 @@
+++��++++++++++++��++++��++++++++++++��++++++++++++++++++++++�
++++++++++++++++�
�
+++++++++++++++��+�
�
�
��++++++++++++++��+�
�
�
��+++++++++++++++++�
�
�
+++1
11+++++++++++�
�
�
+++11&1
11+++++++++���
�
�
++��+1-1111+++++++++���
�
+��++1111+++++++���
�
++++++++++++++++���
�
��++++++++++++++++++���
�
��++++++++++1
1
1
11+���
�
+++++++++1%11111+�
�
+++++++++++1111.11+�
�
+��++++++++++1-1111++�
�
+��+++++++++++1111++�
�
+++++++++++++++++��+�
�
+++++++++++++++++��+�
�
��++++++++++++++++++�
�
��++1
1
1
1
11++++++++++�
�
++11111&11++++++++++�
++1-111111++++++++++++++1-11111++++++++��+++11111++++++++����++++++++++++++++++++��++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++��+++++++++++++++++��+��+��+��+++++++++++++��++��+��++++++++++++++�
++++++++++++++++�
�
++++++++++++++++�
�
+++++1
1
11+++++++���
�
+++1
1%1111+++++++���
�
+++1111.11+++++++�
�
+++11111+++++++��+�
�
+++++++++++++++��+++�
�
+++++++++++++++++�
�
�
+��+++++++++++++�
�
�
�
+��++++++++++��+++�
�
�
�
+++++++++++��++�
�
�
�
�
��++++(�2�2)+++�
�
�
�
+��++++++,�0�0*+++�
�
�
�
+++++++++,�0�0*+++�
�
�
�
++(�2�2�2�2�2�2�2�0�0*+++�
�
�
�
++,�2�2�2�2�2�2�2�01*++++�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route22/border.bin b/data/layouts/Route22/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route22/border.bin
diff --git a/data/layouts/Route22/map.bin b/data/layouts/Route22/map.bin
new file mode 100644
index 000000000..1caf49cc7
--- /dev/null
+++ b/data/layouts/Route22/map.bin
@@ -0,0 +1 @@
+qqur���������psqqqqqqqqqqqqqqqqq�|||||||||||�q0q0q0qqur���������p{|�qqqqqqqqqqqqq�|}�yyyyyyyy�q0sq0q0q0�|}r���������pqq{|||||||||||||}qqr	00	00	00	00pq0{|�q0u�yz���������xyyyyyyyyyyyyyyyyyyyz����	0���pq0q0q0{|ur��������������������b1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1d10	0pq0q0q0q0q0ur�����[�����b1c1c1c1c1c1c1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1l100xyyyyyur��2�2�2�2�2�2�2�r1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1t1	00	00	00ur�b1c1c1c1c1c1c1c1c1c1d1�0	00	00	00	00	00	00��iiij	000	00	00�0�0�0�0�0ur�r1s1s1s1s1s1s1s1s1s1t1���������������kllmr��	0	0��	0�0�0�0�0�0ur��������
00���
0
0
0
0
0
0
0�������sqqur
0
0
0
0
0
00�0�01�0�0ur�00	00	00	00	00	0�
0
0
0
0
0
0
0�������sqqur
0
0
0
0
0
00�0�0�0hiur�00000000000�
0
0
0
0
0
0
0�������sqqur
0
0
0
0
0
00�0�0�0pqur��0	00�������
0
0
0
0
0
0
0313131313131p{||}r
0
0
0
0
0
00�0�0�0pqu�ij00
0	00	00	00	00
0
0
0
0
0
0
0000000pqqqqr
0
0
0
0
0
0&'0�0�0�0pq�lmr0	00000000000	00	00	00000000xyyyyz	000	00	00	00000pqqqur�����������������������������������	00�����pqqqurb1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1d1pqqqurj1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1k1l1pqqqurr1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1s1t1pkqqu�iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii�sqq�llllllllllllllllllllllllllllllllllllllllllll�qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
\ No newline at end of file
diff --git a/data/layouts/Route22_NorthEntrance/border.bin b/data/layouts/Route22_NorthEntrance/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Route22_NorthEntrance/border.bin
diff --git a/data/layouts/Route22_NorthEntrance/map.bin b/data/layouts/Route22_NorthEntrance/map.bin
new file mode 100644
index 000000000..1452ebb13
--- /dev/null
+++ b/data/layouts/Route22_NorthEntrance/map.bin
@@ -0,0 +1 @@
+�����������������������2����������23133�2�2�23133�2���2�2�233/43�2�2�233/43�2�2�2�2�2�2536373�2�2�2536373�2�2�2�2�203.323�2�2�2�2�203.323�2�2�2�233/43�2�2�2�2�233/43�2�2�2�2536373�2�2�2�2�2536373�2�2�2�2�203.323�2�2�203.323�2�2�2�2�2�233/43�2�2�233/43�2�2�2���2536373�2�2�2536373�2�����
\ No newline at end of file
diff --git a/data/layouts/Route23/border.bin b/data/layouts/Route23/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/Route23/border.bin
diff --git a/data/layouts/Route23/map.bin b/data/layouts/Route23/map.bin
new file mode 100644
index 000000000..f6f5f5662
--- /dev/null
+++ b/data/layouts/Route23/map.bin
@@ -0,0 +1 @@
+qqqqqq�yy��2�2�2�yy�qqqqqqq������z�2�2��2�2�2�2�2xy��������2��2�2�2�2�2�2�2�2���2���2�2��2��2�2��2��2��2�2��2��2��������2�2�2��2�2��2�2������������2�2�2��2�2��2�2�2����������2�2��2��2��2�2�2�2�2���������2�2��2��2��2�2�2��2����������2�2��2��2��2�2��2����������2�2��2��2��2�2��2���������2��2�2��2�2��2�2�2�2������������2��2�2��2��2�2����������2��2��2�2��2��2�2����������2��2��2�2��2��2�����������2��2�2�2�2�2�2��2�������2�2��2�2�2�2�2�2�2�2�2�2�2�2��2�2�	0�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�200�00	00	0�2�2�2�2�2�2�2�2�2	00	00	000000000000000000000hiiiiiiiiiiiiiiij0	0
0pklllllllllllllmr00
0psqqqqqqqqqqqqqur0	0
0psqqqqqqqqqqqqqur0	0
0psqqqqqqqqqqqqqur00
0psqqqqqqqqqqqqq��j
0
0psqqqqqqqqqqqqqqquj
0p{||||||�qqqq�|||}r
0x�y�0y�y�sqqqqu�y�0yz
0�0��2�2�2��psqqqqur0	00	000	0�2�2�20	0psqqqqur000000�2�2�20�psqqqqur000	00	00�2�2�20	0psqqqqur00	000�0�2�2�200psqqqqu�iiiij0�2�2�2�2�2�psqqqq�llmqqr���2�2�2�0psqqqqqqquqqr0	0�2�2�20�psqqqqqqquqqr00�2�2�200p{�qqqqqquqqr0��2�2�20�pqsqqqqqquqqr00�2�2�20�pq{||||||}qqr��2�2�2�2�20pqqqqqqqqqqqr0��2�2�2�	0xyyyyyyyyyyyz�	0�2�2�20	00���
0
0
0
00	0�	0	00�000000	0��
0
0
0000000�2�2�2�200	000��
0
0
0000000����0000	0
0���0�2�2�2�2�2�2�����2�2�200
0���0�2�2�2�2�2�2�������0	0
00	0
00�2�2�2�2�2�2��������2�2�2�2�2�20000000��������2�2�2�2�2�20	00	00	00��������2�2�2�2�2�20000000�������000�2�2�2�2�2�2�2�2�2�2�00�00�	00	0�2�2�2�������0000000000�2�2�2��������2�2�2�2�2�2�2�2�2�2�2�2�2������������������2�2�2������������������2�2�2������������������2�2�2������������������2�2�2������������������2�2�2������������������2�2�2��������������
0
0��2�2�2�00����������
0
0
0
0�2�2�2
0
000���������
0
0
0
0
00	0000
0���������
0
0
0��000
0
00���������
0
0
0��
0
0
0
0
0
0����������000�
0
0
0
0
0
0����������0�0
0�
0
0
0
0
0
0����������	000�	00��	00����������000�00��00���������
0
0
0��	00
0�	00���������
0
0
0��00
0�00���������00
0
0
0	00�	000����������
0
0
0
000�000�
0���������	00	0
0000	0
0
0
0
0��������0000	0000
0
0
0
0��������	00	0
000
00
0
0
0
0�������0�0�0�0�0�0�0�0�0	00	00	0������.1111111-1�2�2�2�2�2�2������1++++++1������������1++++++1������������1++++++1������������1++++++1�������211�21�21++++++1�21�2113�2++++++++++++++++++3�2++++++++++++++++++3�2++++++++++++++++++3�2++++++++++++++++++3�2++++++++++++++++++3 3���()*+,����������!3�����%&'�����������������-./�����������������+++�����������������+++���������������.1$+++#311�211�21-1������1++++++++++++1������1++++++++++++1������1++++++++++++1������1++++++++++++1������1++1
1
1
1
11++++1������1++111111++++1������1++111111++++1������1++111111++++1���31�21++111111++++1���3+++++++++++++++1���3+++++++++++++++1���3+++++++++++++++1��� 3���������()*+,��2��������������%&'�����������������-./�����������������+++�����������������+++������311�2�211�211$+++#311�2133++++++++++++++++++33++++++++++++++++++33++++++++++++++++++33++++++++++++++++++3 3���������+++������!3�����������2�2�2������������������2�2�2������������������2�2�2������������������2�2�2������������������2�2�2��������2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�2�2
0�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
0
0�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
0000�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�20	00�����2�2�2����������0�00�����2�2�2����������000�����2�2�2����������0	00�����2�2�2����������000�200��2�2�2�00�200�200�20	00	0	0�2�2�20	0000	00	0000000000000000000000	00	00	0000	00	0000	00	0���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2������������������2�2�2������������������2�2�2������������������2�2�2��������������0	0��2�2�2�00�200�200�200�0000�2�2�2	0�2�2�2�2�2�2�2�2�2�2000	00000�2�2�2�2�2�2�2�2�2�200	00	0	0�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��������2�2�2������������2�2�2������������2�2�2������������2�2�2�����00�200��2�2�2�	00��2�2�2�2�2�2�2�2�2	00	00$'�2�2�2�2�2�2�2�2�20	00	0&%�2�2�2�2�2�2�2�2�2000000���'����2�2�2�����iiiii��qquj������hsqqqqqujqqur���������psqqqqqurqqur���������psqqqqqurqqur���������psqqqqqur&%qqur���������psqqqqq��iiqqur���������psqqqqqqqqq
\ No newline at end of file
diff --git a/data/layouts/Route24/border.bin b/data/layouts/Route24/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route24/border.bin
diff --git a/data/layouts/Route24/map.bin b/data/layouts/Route24/map.bin
new file mode 100644
index 000000000..80de4b1f1
--- /dev/null
+++ b/data/layouts/Route24/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqq�|||||||�qqqqqq�||||||||}qqqqqqq{||||qqu�yyyyyyyyy|yyyyyyyyyyq�}��0�0�0�0�0�0�0�0�0��0�0�0�0	00	00	0quq��0�0�0�0�0�0�0�0�0��0�0�0�0�00000qu���0�0�0�0�0�0�0�0�0��0�0�0�0	00	00	0qu������0�0������0�0�0�������qu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��0�0�0�0�0�0�01�01�0�0�0�0�0�0�0�0�0�0�0qur0
000000�0�0�0F>>>>>>>>>>qur
00	0	000	0�0�0�0W0	00	00	00	00	0qur0000000�0�0�0W000hiiiiii�}r00	00	0	00�0�0�0W0	00pqklllluqr0
0	0000	0�0�0�0W000pqsqqqquqr	000	00	00�0�0�0W0	00pk�qqqquqr
000"#$��0�0�0M000psqqqqquqr	00	0*+,��2�2�2�0	00psqqqqquqr
000*+,��2�2�2�000psqqqqquqr
0
0
0*+,��2�2�2�0	00psqqqqquqr
0
0
0*+,��2�2�2�000psqqqqquqr
0
0
0*+,��2�2�2�0	00psqqqqquqr
0
0
0*+,��2�2�2�000p{�qqqquqr
0
0
0*+,��2�2�2�0	00pqsqqqquqr
0
0
0*+,��2�2�2�000pqsqqqquqr
0
0
0*+,��2�2�2�0	00x�{||||uqr
0
0
0*+,��2�2�2�000�x|||||uqr
0
0
0*+,��2�2�2�0	00�"#####�mr
0
0
0*+,��2�2�2�000�*+
�
�
�
�
qur
0
0
0*+,��2�2�2�0	00�*+
�
�
�
�
qur
0
0
0*+,��2�2�2�000�*�
�
�
�
�
qur
0
0
0*+,��2�2�2�0	00�*�
�
�
�
�
qu�j"#1+,��2�2�2�000�*�
�
�
�
�
ququ*+++,��2�2�2�0	00�*�
�
�
�
�
ququ*+++,��2�2�2�000�*�
�
�
�
�
q�mu*+++,��2�2�2�0	00�*�
�
�
�
�
qquu*+++,��2�2�2�000�*�
�
�
�
�
qquu*+++,��2�2�2�0	00�*�
�
�
�
�
qquu*+++,��2�2�2�000�*�
�
�
�
�
qquu*+++,��2�2�2�0	00�*�
�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route25/border.bin b/data/layouts/Route25/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route25/border.bin
diff --git a/data/layouts/Route25/map.bin b/data/layouts/Route25/map.bin
new file mode 100644
index 000000000..9ec2e35d4
--- /dev/null
+++ b/data/layouts/Route25/map.bin
@@ -0,0 +1 @@
+qqqqqqqq�|||||||||||||||||||||||||||||||||||||||||||||||||||||||||�qqqqq||||||||}qq�yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy��������������������qqq{�qqqqyyyyyyyyyyyz0	000	000	0	00	00	00	0000
00	00	00
00������x|||�sqqqq
0
0
0
0
0
0
0
0
00	0000000000000000000	00	00	00	0�0	0�&%$%$������$%$%$%$'"##!s{�qqq
0
0
0
0
0
0
0
0
00000	00
00	00
000	00	0
00	00	00	00	00	00
0������i�������������*�
�
,sqsqqq
00	00	00	00	00	00	00	0
0
0
000000	000	00	0
0
00
00
0	000	0000	00j1k1l1	00	0	00	00	0�*�
�
,{�{|||����������
0
0
00	00
0
0000
00000
00
00
0
0
0	00
00	0b1c1c1k1k1k1c1c1d1
00
00
0�*�
�
0!{|�qq�0�0�0�0�0�0�0�0�0�0�0�0�0
00	000	00	00	00	00
00
00	0
0	00	00	000	000r1s1s1s1s1s1s1s1t1	00	00	0�*�
�
�
0#!{||�0�0�0�0�0�0�0�0�0�0�0�0�00000000	00000000�0
0	0
00	00	0
0	0
0	0
0	00	00	0	00	00	0
00
00
0�*�
�
�
�
�
0###�0�0�0�0�0�0�0�0�0�0�0�0�00	0
00
0
0
0000000
00
0
00	0000
00
0	0�������0�0�0�0�0������	0�*�
�
�
�
�
�
�
�
�
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>?���������0�0�0�0�0������
0�*�
�
�
�
�
�
�
�
�
00000000000000000000000000000000000000000
0
0�������0�0�0�0�0������	0�*�
�
�
�
�
�
�
�
�
iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiij0
031313131313100
00
0313131313131
0�*�
�
�
�
�
�
�
�
�
lllllllmqqqqqqqqqqqqqqqqklllllllmqqqqqqqr���������������������*�
�
�
�
�
�
�
�
�
qqqqqqq�lllllllllmqqqqqqsqqqqqqq�lllmqqqr"####################1�
�
�
�
�
�
�
�
�
qqqqqqqqqqqqqqqqq�llllll�qqqqqqqqqqq�llmu*+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqquu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqquu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqquu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqquu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route25_SeaCottage/border.bin b/data/layouts/Route25_SeaCottage/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Route25_SeaCottage/border.bin
diff --git a/data/layouts/Route25_SeaCottage/map.bin b/data/layouts/Route25_SeaCottage/map.bin
new file mode 100644
index 000000000..dbf7d06ba
--- /dev/null
+++ b/data/layouts/Route25_SeaCottage/map.bin
@@ -0,0 +1 @@
+��������������������������������2�����������2�2��������������2���2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2��
\ No newline at end of file
diff --git a/data/layouts/Route2_Entrance/border.bin b/data/layouts/Route2_Entrance/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Route2_Entrance/border.bin
diff --git a/data/layouts/Route2_Entrance/map.bin b/data/layouts/Route2_Entrance/map.bin
new file mode 100644
index 000000000..dfde7c299
--- /dev/null
+++ b/data/layouts/Route2_Entrance/map.bin
@@ -0,0 +1 @@
+��������������������2��������2�2�2��2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2���2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2���2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���
\ No newline at end of file
diff --git a/data/layouts/Route3/border.bin b/data/layouts/Route3/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route3/border.bin
diff --git a/data/layouts/Route3/map.bin b/data/layouts/Route3/map.bin
new file mode 100644
index 000000000..7e4fd76ff
--- /dev/null
+++ b/data/layouts/Route3/map.bin
@@ -0,0 +1 @@
+psqqqqqqqqqqqqqq�|||||||||||||�qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqu��0�0�0�0�0�0�0�0�sqqqqqqpsqqqqqqqqq�||||}qqqqqqqqqqqqq{|||||�qqqqqqqqqqqqqqqqqqqqqqqqqqqqqu��0�0�0�0�0�0�0�0�sqqqqqqpsqqqqqqq�|}�yyyyyyyyyyyyyyyyyyyyyy�{|�qqqqqqqq�|||||||�qqqqqqqqqqu�1�0�0�0�0�01�0�sqqqqqqpsqqqqqqqu�y��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�y�sqq�|||||}qqqqqqq{||||�qqqqqur�01�0�01�0�0h�sqqqqqqpsqqqqqqqu��0�0�0�0�01�0�0�0�0�0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�sq�}�yyyyyyyyyyyyyyyy�{|�qqqur
0�0�0�0�0hi�qsqqqqqqp{�qqqqq�}��0�0�0�0�0�00	00	00	0	0�0�0�0�0�0�0�0�0�0�01�0�0�squ���0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�y�sqqqur0	00	0	0pkll�qqqqqqpq{|||||}qr0	00	00	00	00hij0	00	00	00hj0	0�0�0�0�squ��0�0�01�0�0�0�0�0�0�0�0�0�01�0�0�0�0�sqqqur00000psqqqqqqqqqpqqqqq�yyyz���00�����q�������������
00p{|}��0�0�0�00000000000�0�0�0�0�0�sqqqur0	00	0	0psqqqqqqqqqxyyyyyz000000	00	00	00	0pqr0	00	00	00pr0	00	00xyyyz����00hiiiiij�����0p{|||}����
0
0p{|||�qqqqq0	00	00	00	000	0000000000pqr000�0000pr00	00	00	000	00	00	00	0pklllmr0	0	0
0	0
0pqqq�yz
00	000xyyy�{|�qqq0000000000000	00	00	00	0pqr0	00	00	00p�j000000000000000psqqqur000
00
0xyyyz0	00	000
0
0
0
0
0xy�sqqq0	00	00	00	00hij00000000pqr0000000pqr
0
0
0
0
0
0
00	00	00	00	0psqqqur	0
0	0
0	0
00	00	00	00	00��
0
0
0
0
0
0psqqq00hiiiiii�q�����0	0���q���������qr
0
0
0
0
0
0
0
0
0
0
0
0
0
0h�sqqqur0
00
00
00000	00	00	0
0
0
0
0
0
0
0
0
0psqqqhi�qqqqqqqqr0	00	00	00	0xyz	00	00	00	0pqr
0
0
0
0
0
0
0
0
0
0
0
0
0
0pk�qqqur
0	0	0
0	0
00	00	000000
0
0
0
0
0
0
0
0
0psqqqpqklllllllmr�0�0�0�0�0�0�0�0�0	00	00	00	0	0h�q�ij
0
0
0
0
0
0
0
0
0
0
0
0psqqqqur0
00
00
0	0
0	00	00	00	0
0
0
0
0
0
0
0
0
0psqqqpk�qqqqqqqu����0�0�0�0�0�0�0�0�0�0�0�0�0�0�0kllmr
0
0
0
0
0
0
0
0
0
0
0
0psqqqqu�ij
00
00
0	0000000	0
0
0
0
0
0
0
0
0
0psqqqpsqqqqqqqq�lm�����������������sqqu�iiij
0
0
0
0
0
0
0
0psqqqq�lmr0
00
00
0	00	00	00	0
0
0
0
0
0
0hii�sqqqpsqqqqqqqqqq�lllllllllllllllll�qq�lllm�iiiiiiii�sqqqqqqu�iiiiiiiiiiiiiiiiiii�kll�qqqpsqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq�llllllllll�qqqqqq�lllllllllllllllllllll�qqqqqqpsqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
\ No newline at end of file
diff --git a/data/layouts/Route4/border.bin b/data/layouts/Route4/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route4/border.bin
diff --git a/data/layouts/Route4/map.bin b/data/layouts/Route4/map.bin
new file mode 100644
index 000000000..447d87b5c
--- /dev/null
+++ b/data/layouts/Route4/map.bin
@@ -0,0 +1 @@
+qqqqqqqq�|||||||�qqsqqqqqqqqqqqqqquqqqqq�||||||||||||||�qqqqq�||||||||||�qqqqqqqqqqq�|||||||||||||�qqqqqqqqqqqqqqqqqu��2�2�2�2�2�sqqsqqqqqqqqqqqqqquqqqqquq�yyyyyyyyy|y�{|||||}�yyyyyyyy�{|||||||||||}�yyyyyyyyyyy�{|||||||||q�||||||}rHIJK�psqq{|||�qqqqqq�|||}qqqqquqr0	0�	00	00	00�	0x|yyyyyyz	0�0	00	00�xyyyyyyyyyyyyyz	00	00�0�0�0�0�0�0�0�yyyyyyyyyyqu�yyyyyyzPQRS�p{�qqqqqsqqqq�|}qqqqqqqq�}qr00�000000�00�
00
00
0�	00�00000�0	00
00
00	00	00	00	000000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��	0�0	0�
0
0XYZ[�x�{||||�sqqqqu�|||||||||}�yz0	0�	00	00	00�
0
0�0
00
00�00�0	00	00�00	00
00000000000	00	00�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��0�0�0	00
0`ab���0�yy�0y�s{�qq�}u�y�0yyyyyyyz0	000���0	0���
0
0�0
0
000�	00�00000��������������������������������������qu��0�0�0�0�0�00	0	00	0�0�0�0�0�0�0�0�{�sqqu�}��0�0�0�0�0�0�0�0�0000	00	00	00	00	00	00�00	000�00�0	00	00	00	00	00	00	00	00	00	00	00	00	00	00	000�"#########qu�������0�0�0�0�0�0�0�0�0�0�0�0��ssqquu���01�0�0�0�0�0�0000000000000000�	00000�	00��
0
0������������������������������*+++++++++qu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0��ssqquu��0�0�00	00	00	000	00	00	00	00	00	00	00�00	000�00	0	00	00	00	00	00	00	00
0	00	00	000000
0	00	00	00�*+++++++++qu��0�0�0�0�0�0�0�0�0�0�0�0��������ssqquu������������000������������	0�0�0�00��o000000000000000
0	00	00	00������������������qu��0��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�s{||}ur0	00	00	00	00	00	00	00	0000000000
00�0�0�0
0
0
0������
0
0�����������	00�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu�����������0�0�0�0�0�0�0�0��0�sqqqqur000000000000	00	00	00	0	0�0�0�0�0�0�0�01�01�0�0�0�0�0�0�0�0�0�0	0
0
0
0
0
0
0
0
0
0
0
000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��0�0�0�0�0�0�0�0�0�0�0�0��������sqqqqu�iiiiiiiiiij000000000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00
0
0
0
0
0
0
0
0
0
0
0&%	00�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0qu�����0��0�0�0�0�0�0�0�0�0�0�0�0�0�0�sqqqq�lllllmqqqqq�iiij	0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00
0
0
0
0
0
0
0
0
0
0
0
0
000�0�0�0	00�����������q�lmq����0�0�0�0�0�0�0�0�0�0�0�0�0��sqqqqkllllm�llllmqqqqr&%$'0000000000000000000000
0
0
0
0
0
0
0
0
0
0
0
0
0���0�0�0���qqq�llm�����0�0�0�0�0�0�0�����sqqqqsqqqq�llllmuqqqq�iiij��
0
0���������
0
0�����
0
0
0
0
0
0
0
0
0
0
0
0
0	00�0�0�0	00�qqqqqqu��0�0�0�0�0�0�0�0����kll�qqqqsqqqqqqqqqu�lmqqqqqqr
00
00
0	0
0	0	00	00	00	00	000	0
0
0
0
0
0
0
0
0
0
0
0
0	0&'00�0�0�000�qqqqqqu��0�0�0�0�0�0�0�0�kll�qqqqqqk�qqqqqqqqquqquqqqqqqr0
00
00
00
00000000000�00$%$'
0
0
0
0
0
0
0
0
0
0
0	00	00	00	00	0
0
0�&%$%$%$%$%qqqqqqu��0�0�0�0�0����sqqqqqqqqqsqqqqqqqqqquqquqqqqqq�iiiiiij
0	00	00	00	00	000	0&'hiiiiiiiiiiiiij000000000hiiiiiiiiiiijqqqqqqu��0�0�0�0�0�0�0�0�sqqqqqqqqqsqqqqqqqqqquqquqqqqqqqqqqqqq�iiiiiiiiiiiiiii�qqqqqqqqqqqqq�iiiiiiiii�qqqqqqqqqqqr
\ No newline at end of file
diff --git a/data/layouts/Route5/border.bin b/data/layouts/Route5/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/Route5/border.bin
diff --git a/data/layouts/Route5/map.bin b/data/layouts/Route5/map.bin
new file mode 100644
index 000000000..3c357908f
--- /dev/null
+++ b/data/layouts/Route5/map.bin
diff --git a/data/layouts/Route5_PokemonDayCare/border.bin b/data/layouts/Route5_PokemonDayCare/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/Route5_PokemonDayCare/border.bin
diff --git a/data/layouts/Route5_PokemonDayCare/map.bin b/data/layouts/Route5_PokemonDayCare/map.bin
new file mode 100644
index 000000000..85114f523
--- /dev/null
+++ b/data/layouts/Route5_PokemonDayCare/map.bin
@@ -0,0 +1 @@
+���������������������b��2�2�2�2�2�2�2�2�2�2�2��23�2��2�2�2�2�2�2�2�2�2�2�2�2	3��	3�2�2��2�2�2�2�2	3��	3�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/Route6/border.bin b/data/layouts/Route6/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/Route6/border.bin
diff --git a/data/layouts/Route6/map.bin b/data/layouts/Route6/map.bin
new file mode 100644
index 000000000..c4e9b6b92
--- /dev/null
+++ b/data/layouts/Route6/map.bin
@@ -0,0 +1 @@
+DEEEEFLMMMMN������$%$%$%$%������$%$%$%��������\����^������0	00�00	00�d��1�1�f�	00	00	00000000�0�1�1�1�10�00000���
0����0�0�0�0�00���
0��0	00	00	00	0
0�0�0�0�0
00	00	00	0000000000	00	00	00000000000000000000000D0E0E0F0�������
0��������LMMN�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0TgUV�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0d=ef�0�0�0�01�01�0�0�0�0�0�01�01�0�0�0�0
0
0
0
0�0�0�0
0
0
0
0
0
0�0�0�0�0�0�0
0
0
0
0�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�01�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�01�0�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0
0
0�������������
0
0�0�0�0
0
0�������������
0
0�0�0�0
0
0�������������
0
0�0�0�0
0
0
0
0�0�0�0
0
000000000�0�0�0�0�0�0�01�0�0
0
00	00	00	00	0�0�0�0�0�0�0�0�0�0�0
0
000000000�0�01�0�0�0�0�0�0�0
0
0�����	00	0�0�0�0
0
0
0
0�����0000�000�0�0�0
0
0
0
0�0000�	00	0�0�0�0
0
0
0
0��000�0�0�0
0
0
0
0������0�0�0�����000��0�0�0�00000��0�0�0�$%$%$%$'0��0�0�0�########$��0�0�0��
�
�
�
�
�
�
�
,�000�
\ No newline at end of file
diff --git a/data/layouts/Route7/border.bin b/data/layouts/Route7/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/Route7/border.bin
diff --git a/data/layouts/Route7/map.bin b/data/layouts/Route7/map.bin
new file mode 100644
index 000000000..08212179a
--- /dev/null
+++ b/data/layouts/Route7/map.bin
@@ -0,0 +1 @@
+$%$%$%$%$%$%$%$%$%$%0	00	00	00	00	0�
0
0
0
0
0
0
0
0�0000000000�
0
0
0
0
0
0
0
0�0	00	00	00	00	0�
0
0
0
0
0
0
0
0�0000000000�
0
0
0
0
0
00
0�&%$%0	00	00	0�
0
0
0
0
0
000�000
0000000�0
00
0
0D0E0E0EEF����00���
00
0
0�1LMMMMN�1
00	00	00	00	00	0�081������<1�00000000000�0@1������D1�00	0D0E0E0F00	00	0�0H1deeeefL1�0��LMMN0
0������������0
0TgUV	00	00	00	00	0�000
0d=ef000000000�0	00	00	000	00	00�00	0�000000000000000�0000000000000000
\ No newline at end of file
diff --git a/data/layouts/Route8/border.bin b/data/layouts/Route8/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route8/border.bin
diff --git a/data/layouts/Route8/map.bin b/data/layouts/Route8/map.bin
new file mode 100644
index 000000000..9d370b135
--- /dev/null
+++ b/data/layouts/Route8/map.bin
@@ -0,0 +1 @@
+pqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqq�;<<=yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy�������������qqqpqqqqqqrLMMN0�0�0�0�0�0�0�0�0�0	00	00	00	00	00	00	00	00	00	0	00	00	00	00	00pqqqpqqqqqqrTgUV0�0�0�0�0�0�0�0�0�000000000000000000000000000000pqqqpqq�yyyzd=ef0�01�01�0�0�0�0�0	0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00	00pqqq$%$'pqqr
00
00
0�0�0�01�0�������00�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0000&%$%$'pqqq
0
0
0
0xyyz0
00
0
0�0�0�0�0�0�0��0�0�0�0�0�0	0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�00	00000
00
0pqqq�DEEEEF���	00	0�0�01�0�0�0��0�0�0�0�0�00�0�0�00	00	00	00	00	00	00	00	000	0�0�0�0000
00
0000pqqq�1LMMMMN�1	00	00	0�0�0�00	00��0�0�0�0�0�0	0�0�0�000
0�������������000�0�0�00	00	00	00	00xyyy81������<1�0�0�0�0�01�0�0000�������00�0�0�00	0��0
0
00
0
00
0
00
0��0	0�0�0�0000000�0�0�0�0�0�0�0@1������D1�0�0�0�0�0�0�0�00	00��0�0�0�0�0�0	0�0�0�000�000
0
0
0
0
0�0
0
00	0�00�0�0�00	00	00	0�0�0�0�0�0�0�0H1deeeefL1�0�0�0�0�01�0�0000��0�0�0�0�0
000�0�0�00	0�00
0
0�0
00
0
00
000�0	0�0�0�0000000�0�01�0�0�0�0��������	00	00	0�0�0�00	00��0�0�0�0�0
00	0�0�0�000�
0
0
0
0
0
0
0
0
0
0
0
0
0
000�0�0�00	00	00	0�0�0�0����0000hiiiiiij0�0�0�0000�������00�0�0�00	0�0
00
00
00
00
0
0
0
0�0	0�0�0�0000&%$%$'000�0�0�0hiiipqqqqqqr0�0�0�00	00	00	00	00	00	0�0�0�000�	0
0
0
0
0
0
0
0
00
0	00�00�0�0�00	00	00	00	00	00	0�0�0�0pqqqpqqqqqqr0�0�0�0000000000000�0�0�00	0
00
0
00
00
0
0�0
00
0	0�0	0�0�0�0000000000000�0�0�0pqqqpqqqqqqr0�0�01�0�0�0�0�0�0�0�0�0�0�0�01�0�000�
0
00
0
0
00
0
0
0
0
00�00�0�01�0�0�0�0�0�0�0�0�0�0�0�01�0�0pqqqpqqqqqqr
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00	0�0
00
0
00
0
00
0
0
00�0	0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0pqqqpqqqqqqr
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�000�0000	0
0
00	00
000�00�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0pqqqpqqqqqq�iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii�qqq
\ No newline at end of file
diff --git a/data/layouts/Route9/border.bin b/data/layouts/Route9/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route9/border.bin
diff --git a/data/layouts/Route9/map.bin b/data/layouts/Route9/map.bin
new file mode 100644
index 000000000..6ac9ccccd
--- /dev/null
+++ b/data/layouts/Route9/map.bin
@@ -0,0 +1 @@
+yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy�kllm�yyyyyyyyyyyyyyyyy�klllll000000�
0
0
0
0
0
0
0
0
0
0
00	00	00	00	00	00	0hiiiij
0
0
0
0
0
0psqqur	00	00	00	00	00	0�0�0�0�0�0�0�sqqqqq�
0
0
0
0
0
0
0
0
0
0
0000000000000pkllmr
0
0
0
0
0
0psqqur�00000000000�0�0�0�0�0�0�sqqqqq�
0
0
0
0
0
0
0
0
0
0
0hiiij
00	00	00	0psqqur0	00	00	0p{||}r	00	0000
0
0
0
0h����0�0�sqqqqq�
0
0
0
0
0
0
0
0
0
0
0pklm������00psqqu���
0
0���qqqq���
0
0�������klm����{|�qqq$%$%$'�
0
0
0
0
0
0
0
0
0
0
0psqu��0�0�0�0�0�0�0{||}��0�0�0�0�0�0�yyyy��0�0�0�0�0�0�0�0�0�0�squ��0�0�qqsqqq
0
0
0000�00000000000psqu��0�0�0�0�0�0�0�qqqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�squ��0�0�qq{|||����������������0	0psqu��0�0�0�0�0�0�yyyy�������0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�{|}��0�0�yyyyyy0	0
00	00	0�0�0�0�0�0�0�0�0hii�squ��0�0�0�0�0�0�0�0�0�0�0�0�0�klm��0�0�0�0������0�0�0������yyy��0�0�0�0�0�0�0�0�000�0000�0�0�0�0�0�0�0�0kll�qu��0�0�0�0�0�0�0�0�0�0�0�0�0�squ��0�0�0�0�klm��0�0�0�klm��0�0�0�0�0�0�0�0�0�0�0�0�0�0�����hi����0�0�0�0�sqqqqu������������0�0�squ��0�0�0�0�squ��0�0�0�squ��0�0�0�0�0�0�0�0�0�0�0�0�0�00000�pkllm������{||||}��0�0�0�0�0�0�0�0�0�0�00	0p{|}������{|}���
0psqu��0�0�0������0�0�0����psqqu��0�0�0�0�yyyyyy��0�0�0�0�0�0�0�0�01�000xyyyz0000xyyyz000psqu�����klm�����kl�psqqu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0	00	00	000	000	000	00	000	00p{|}��0�0�0�squ��0�0�0�sq�psqqu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0������0
00000000000000000000pqqqr0	00p{|}��0�0�0�sq�psqqu�����������0�0�����kllm���00�����������������xyyyz���xyyyz����sq�psqqu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�sqqur	000	00	000	00	00	00	00	0	00	00	00	00	00	00	00	00	00	00psq$'�psqqu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�sqqur0000000000000000000000000000000000000psqhii�{||}�����������������sqqu�iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii�{|pqqqqqqqqqqqqqqqqqqqqqqqq{||}qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
\ No newline at end of file
diff --git a/data/layouts/SSAnne_1F_Corridor/border.bin b/data/layouts/SSAnne_1F_Corridor/border.bin
new file mode 100644
index 000000000..b90547a3e
--- /dev/null
+++ b/data/layouts/SSAnne_1F_Corridor/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SSAnne_1F_Corridor/map.bin b/data/layouts/SSAnne_1F_Corridor/map.bin
new file mode 100644
index 000000000..b9fde8c26
--- /dev/null
+++ b/data/layouts/SSAnne_1F_Corridor/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������������������������������������2�2�2�����������������������������2�2�2�����������������������������2�2�2�����������������������������2�2�2�����������������������������2�2�2�����������������������������2�2�2��������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�3�2�2�3�2�2�3�2�2�3�2�2�3�2�2�3�2�2�3�2�2�2�2�2�2���2�2�2�����������������������2�2�2�2���2�2�2�����������������������2�2�2�2���2�2�2�����������������������2�2�2�2���2�2�2�����������������������2�2�2�2���2�2�2�����������������������2�2�2�2���2�2�2�����������������������6�6�2�2���2�2�2�������������������������3�2���2�3�2�������������������������2�2���������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/SSAnne_2F_Corridor/border.bin b/data/layouts/SSAnne_2F_Corridor/border.bin
new file mode 100644
index 000000000..b90547a3e
--- /dev/null
+++ b/data/layouts/SSAnne_2F_Corridor/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SSAnne_2F_Corridor/map.bin b/data/layouts/SSAnne_2F_Corridor/map.bin
new file mode 100644
index 000000000..9fa53735c
--- /dev/null
+++ b/data/layouts/SSAnne_2F_Corridor/map.bin
@@ -0,0 +1 @@
+�����������������������������������������������������������������6�����2�3����������������������������3�����2�3����������������������������2�����2�2�2�2��������������������������2�2�2���2�2�2�2��������������������������2�2�2���2�2�2�2��������������������������2�2�2���2�2�2�2��������������������������2�2�2���2�2�2�2������������������������2�2�2�2�2���2�2�2�2������������������������2�2�2�2�2���3�2�2�2������������������������2�2�2�2�2�����3�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����3�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����������������������������������
\ No newline at end of file
diff --git a/data/layouts/SSAnne_3F_Corridor/border.bin b/data/layouts/SSAnne_3F_Corridor/border.bin
new file mode 100644
index 000000000..b90547a3e
--- /dev/null
+++ b/data/layouts/SSAnne_3F_Corridor/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SSAnne_3F_Corridor/map.bin b/data/layouts/SSAnne_3F_Corridor/map.bin
new file mode 100644
index 000000000..336e034fa
--- /dev/null
+++ b/data/layouts/SSAnne_3F_Corridor/map.bin
@@ -0,0 +1 @@
+�����������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�3���VW3�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�3���^_3�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�fg3�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�����������������������
\ No newline at end of file
diff --git a/data/layouts/SSAnne_B1F_Corridor/border.bin b/data/layouts/SSAnne_B1F_Corridor/border.bin
new file mode 100644
index 000000000..b90547a3e
--- /dev/null
+++ b/data/layouts/SSAnne_B1F_Corridor/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SSAnne_B1F_Corridor/map.bin b/data/layouts/SSAnne_B1F_Corridor/map.bin
new file mode 100644
index 000000000..db24bfff4
--- /dev/null
+++ b/data/layouts/SSAnne_B1F_Corridor/map.bin
@@ -0,0 +1 @@
+�����������������������������������������������������������������T�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�3�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2U3�����2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�������������������������
\ No newline at end of file
diff --git a/data/layouts/SSAnne_CaptainsOffice/border.bin b/data/layouts/SSAnne_CaptainsOffice/border.bin
new file mode 100644
index 000000000..b90547a3e
--- /dev/null
+++ b/data/layouts/SSAnne_CaptainsOffice/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SSAnne_CaptainsOffice/map.bin b/data/layouts/SSAnne_CaptainsOffice/map.bin
new file mode 100644
index 000000000..75c9eb2d3
--- /dev/null
+++ b/data/layouts/SSAnne_CaptainsOffice/map.bin
@@ -0,0 +1 @@
+�������������������23�2�2�2�2���2��2�2��
�2�2�2�2���2�2�2�2�2�2�2�����2�2�2�23�����3�2�2�23�����2�2�2�2�2����������
\ No newline at end of file
diff --git a/data/layouts/SSAnne_Deck/border.bin b/data/layouts/SSAnne_Deck/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/SSAnne_Deck/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/SSAnne_Deck/map.bin b/data/layouts/SSAnne_Deck/map.bin
new file mode 100644
index 000000000..bf3fb5e80
--- /dev/null
+++ b/data/layouts/SSAnne_Deck/map.bin
@@ -0,0 +1 @@
++
+
+
+
+
+
+
+
+
+
+
,
����*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
,
����*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
,
����*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
,
����*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QR[\������v]eeeee+
+
+
+
+
QRYZc3d3d3d3d3��mn������+
+
+
QRYZS3P3�3P3P3P3P3P3�u�������+
QRYZS3P3P3w�3P3P3wP3P3P3}�������XYZS3P3P3P3P3P3P3P3P3P3P3P3P3�3�������`a3b3P3P3P3P3P3P3P3P3P3P3P3P3P3�3�������hijx3b3P3P3P3P3P3P3P3P3P3P3P3��������pqrijx3b3P3P3�3P3P3P3P3P3�3��������+
yzzrijx3b3�3wP3P3P3�3���������+
pqzzzrijk3l3l3l3l3��~+
+1yzzzzzrstttttttttttttt+
+1pqzzzzz{||||||||||||||+
+1+1yzzzzz{||||||||||||||+
+
+
pqzzzz{||||||||||||||+
+
+
+
yzzzz{||||||||||||||
\ No newline at end of file
diff --git a/data/layouts/SSAnne_Exterior/border.bin b/data/layouts/SSAnne_Exterior/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/SSAnne_Exterior/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/SSAnne_Exterior/map.bin b/data/layouts/SSAnne_Exterior/map.bin
new file mode 100644
index 000000000..a76275227
--- /dev/null
+++ b/data/layouts/SSAnne_Exterior/map.bin
@@ -0,0 +1 @@
+����������������������������,�*�������������������������������������������������������������,�*�������������++++++++++++++++++�����������������+++��������,�*������++++(%333333333���������������+++��������,
*+++++++++�1�1�1�1�1�1�1�1�1��������������+++++��++��+++��+,���*+++++�1�1�1�1�1�1�1�1�1�1�1�1������������++++��+++���2+++0##########!�1�1 #########���+��+++++++++++�1�1�1++��++++++++++++++,�1�1*+++++++++�+++��++++++++++++++++++++,�1�1�1*+++++��++++++++++++++,�1�1*+���������++��+++++++++++++++++++++++,�1�1�1*+++++++++++++++++++++,�1�1*+���������+++++++++++++++++++++++++,�1�1�1*+++++++++++++++++++++,�1�1*+�������+++++++++++++++++++++++++,�1*+++++++++++++++++++,�1�1*+���������++++++++++++++++++++���1++��++++++++++++,�1�1*+������+++++++++++++++++++++�����1����++++++++++++++,�1�1*+������++++++++++++++++++��+++��+++,�1*+��++++++++++++++++,�1�1*+��������++++++++++++++++����+++++�
��!�2"���
++++++++++++++++,�1�1*+��������+��+++++++++++++++��+++++�
����#   $�����
+++++��+++++++++,�1�1*+��������+��++++++++++++++++++�
�������������������
++��+++++++,�1�1*+��������++��++++++++++++++�
����������������������
++��+++++,�1�1*+���������+��+��+++++��+++�
�����������������������++��+++++,�1�1*+���������++��+��++++��+++��������������������������
+++++++,�1�1*+���������+++��+++++++�
����������������������������
++++��++,�1�1*+���������++++++++++�
�������������������������������
+++��++,�1�1*+������������++++++++++�
��������������������������������++��+++,�1�1*+����������������+++++�
������������������������������������
+��+,�1�1*�����������������������������������������������������������++++,�1�1*������������������������������������������������������������
+��++,�1�1*�������������������������������������������������������������
��++,�1�1*�������������������������������������������������������������++,�1�1*�������������������������������������������������������������+�1�1*��������������������������������������������������������������
++*��������������������������������������������������������������
+0###1�����������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/SSAnne_Kitchen/border.bin b/data/layouts/SSAnne_Kitchen/border.bin
new file mode 100644
index 000000000..b90547a3e
--- /dev/null
+++ b/data/layouts/SSAnne_Kitchen/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SSAnne_Kitchen/map.bin b/data/layouts/SSAnne_Kitchen/map.bin
new file mode 100644
index 000000000..f74655d33
--- /dev/null
+++ b/data/layouts/SSAnne_Kitchen/map.bin
@@ -0,0 +1 @@
+����������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2���2�2���2�2���2����2�2���2�2���2�2���2�2���2�2���2�2���2�2���2����2�2���2�2���2�2���2�2���2�2���2�2���2�2���2����2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/SSAnne_Room1/border.bin b/data/layouts/SSAnne_Room1/border.bin
new file mode 100644
index 000000000..b90547a3e
--- /dev/null
+++ b/data/layouts/SSAnne_Room1/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SSAnne_Room1/map.bin b/data/layouts/SSAnne_Room1/map.bin
new file mode 100644
index 000000000..b5cfa38c4
--- /dev/null
+++ b/data/layouts/SSAnne_Room1/map.bin
@@ -0,0 +1 @@
+���������:�+333333333333333333893(3)*3@A4303123HI3333
\ No newline at end of file
diff --git a/data/layouts/SSAnne_Room2/border.bin b/data/layouts/SSAnne_Room2/border.bin
new file mode 100644
index 000000000..b90547a3e
--- /dev/null
+++ b/data/layouts/SSAnne_Room2/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SSAnne_Room2/map.bin b/data/layouts/SSAnne_Room2/map.bin
new file mode 100644
index 000000000..e1509b523
--- /dev/null
+++ b/data/layouts/SSAnne_Room2/map.bin
@@ -0,0 +1,2 @@
+�������;��;�BCD3	
+3JKL33'3<3$3$3$3$3'3$3$3$3$3$33$3$3$3$3$3$3$3=3>3?3������
\ No newline at end of file
diff --git a/data/layouts/SafariZone_Building/border.bin b/data/layouts/SafariZone_Building/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SafariZone_Building/border.bin
diff --git a/data/layouts/SafariZone_Building/map.bin b/data/layouts/SafariZone_Building/map.bin
new file mode 100644
index 000000000..caec48cdc
--- /dev/null
+++ b/data/layouts/SafariZone_Building/map.bin
@@ -0,0 +1 @@
+�����������������������������2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������2�2�2�2�2�2�2�2��2�2���2�2�2�2�2�2�2�2��2����2�2�2�2�2�2�2�2��2���
\ No newline at end of file
diff --git a/data/layouts/SafariZone_Center/border.bin b/data/layouts/SafariZone_Center/border.bin
new file mode 100644
index 000000000..964b51edb
--- /dev/null
+++ b/data/layouts/SafariZone_Center/border.bin
@@ -0,0 +1 @@
+������
\ No newline at end of file
diff --git a/data/layouts/SafariZone_Center/map.bin b/data/layouts/SafariZone_Center/map.bin
new file mode 100644
index 000000000..f1fe437e9
--- /dev/null
+++ b/data/layouts/SafariZone_Center/map.bin
@@ -0,0 +1,6 @@
+���������������������� �������������������������������%&'%&'���������#��%&'��������������������������������������� �������������������������������������#7��������������������������������������������




��2�2�



��������������0	00	00	0000000	0�000000000	00	00	0	000	00	0 ����������%&'��00000
0
0
0
0
0
000�0	00	00000
0
0
0
0
00000�0�0�0#�������������0	0	0
0
0
0
0
0
0
0
00	0�00000
0
0
0
0
0
0
0
0
0
00�01�0�0 ���������00
0
0
0
0
0
0
0
0
000�000
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0�0#��%&'��������0	0
0
0
0
0
0
0
0
0
00	0�0	00
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0�0 ����%&'�����00
0
0
0
0
0
0
0
0
000�000
0
0
0
0
0
0
0
0
0
0
0
0�01�0�0�0#����������0	0	0
0
0
0
0
00
0
00	0�0	00	0
0
0
0
0	00	0
0
0
00�0�0�0�0�0��000
0
0
000
0"##############$0	00	0�0�0�0�0�0

0	00	0
000
0
0*++++++++++++++,�����������������


0000000
0
0*++(3131313131313131)++,0	00	000	00	0�2����������������0�0�0�0�0	0
0
0
0*++,0	0000	00	0*++,0000	00000�2����������������20�01�01�0
0
0
0*++0########1++,
0
00000	00	0	
+	
+	���������200�0�0�0�00
0
0*++++++++++++++,
0
0
0
0
00000	
+	
+	
+00�0�0�01�00
0313131313131313131313131��3131
0
0
0
0
0
0
0
0
0 !" !"00�0�0�0�0�0	0	0��������������00
0
0
0
0
0
0
0
0#�����%& !" !"���������0	00	0�0�0�0	00	00	00	0	00	0
0
0
0
0
0
0
0
0 ��������%&'��0	00	00	00000000�0�01�0�00�2�2�2�2�200
0
0
0
0
00	00#�����������00000
0
0
0
0
0
0
0
0�01�0�0�0	0�����
0
0
0
0
0
0
0
0
0
0 ���������0	00	0
0
0
0
0
0
0
0
0
0
0�0�0�0�00�����
0
0
0
0
0
0
0
0
0
0#��%&'�����������0000
0
0
0
0
0
0
0
0
0
0�0�0�0�0	0�����
0
0
0
0
0
00	00	0 ������������0	00	00
0
0
0
0
0
0
0
00	000000	0	00	0
0
0
0
0
00000#�������������00000
0
0
0
0
0
0
0
0
0
0
0	00	00	00	0
0
0
0
00	00	00	0 ���������������0	00	00
0
0
0
0
0
0
0
0
00	00	00	00	00
0
0
0
0
0000000#����������������3333333333330	0	0�0�0�0�0	00	0333333333333 ��������������2�2�2�2�22��#��%&'�������� �" !" �"���������� !" !" � ����������%&'������%&'�����������������%&'����������������������"���������� ��������������������������������������������������������������������������������"���������� �������������������
\ No newline at end of file
diff --git a/data/layouts/SafariZone_East/border.bin b/data/layouts/SafariZone_East/border.bin
new file mode 100644
index 000000000..964b51edb
--- /dev/null
+++ b/data/layouts/SafariZone_East/border.bin
@@ -0,0 +1 @@
+������
\ No newline at end of file
diff --git a/data/layouts/SafariZone_East/map.bin b/data/layouts/SafariZone_East/map.bin
new file mode 100644
index 000000000..28a9cafb7
--- /dev/null
+++ b/data/layouts/SafariZone_East/map.bin
diff --git a/data/layouts/SafariZone_North/border.bin b/data/layouts/SafariZone_North/border.bin
new file mode 100644
index 000000000..964b51edb
--- /dev/null
+++ b/data/layouts/SafariZone_North/border.bin
@@ -0,0 +1 @@
+������
\ No newline at end of file
diff --git a/data/layouts/SafariZone_North/map.bin b/data/layouts/SafariZone_North/map.bin
new file mode 100644
index 000000000..03319e72c
--- /dev/null
+++ b/data/layouts/SafariZone_North/map.bin
diff --git a/data/layouts/SafariZone_SecretHouse/border.bin b/data/layouts/SafariZone_SecretHouse/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SafariZone_SecretHouse/border.bin
diff --git a/data/layouts/SafariZone_SecretHouse/map.bin b/data/layouts/SafariZone_SecretHouse/map.bin
new file mode 100644
index 000000000..8acbf7b90
--- /dev/null
+++ b/data/layouts/SafariZone_SecretHouse/map.bin
@@ -0,0 +1 @@
+����������������������������2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2���2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�����2�2�2�2�2�2�2�2�2��
\ No newline at end of file
diff --git a/data/layouts/SafariZone_West/border.bin b/data/layouts/SafariZone_West/border.bin
new file mode 100644
index 000000000..964b51edb
--- /dev/null
+++ b/data/layouts/SafariZone_West/border.bin
@@ -0,0 +1 @@
+������
\ No newline at end of file
diff --git a/data/layouts/SafariZone_West/map.bin b/data/layouts/SafariZone_West/map.bin
new file mode 100644
index 000000000..f2f943b69
--- /dev/null
+++ b/data/layouts/SafariZone_West/map.bin
diff --git a/data/layouts/SaffronCity/border.bin b/data/layouts/SaffronCity/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/SaffronCity/border.bin
diff --git a/data/layouts/SaffronCity/map.bin b/data/layouts/SaffronCity/map.bin
new file mode 100644
index 000000000..dd7aea1cf
--- /dev/null
+++ b/data/layouts/SaffronCity/map.bin
diff --git a/data/layouts/SaffronCity_Dojo/border.bin b/data/layouts/SaffronCity_Dojo/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SaffronCity_Dojo/border.bin
diff --git a/data/layouts/SaffronCity_Dojo/map.bin b/data/layouts/SaffronCity_Dojo/map.bin
new file mode 100644
index 000000000..55b1548aa
--- /dev/null
+++ b/data/layouts/SaffronCity_Dojo/map.bin
@@ -0,0 +1 @@
+�����������������������2�2�2��2�2�2��2�2�2�2�2�2��2�2�2��2�2�2�2�2�2��2�2�2��2�2�2�2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/SaffronCity_Duplicate/border.bin b/data/layouts/SaffronCity_Duplicate/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/SaffronCity_Duplicate/border.bin
diff --git a/data/layouts/SaffronCity_Duplicate/map.bin b/data/layouts/SaffronCity_Duplicate/map.bin
new file mode 100644
index 000000000..001fb4e2f
--- /dev/null
+++ b/data/layouts/SaffronCity_Duplicate/map.bin
diff --git a/data/layouts/SaffronCity_EastWestEntrance/border.bin b/data/layouts/SaffronCity_EastWestEntrance/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SaffronCity_EastWestEntrance/border.bin
diff --git a/data/layouts/SaffronCity_EastWestEntrance/map.bin b/data/layouts/SaffronCity_EastWestEntrance/map.bin
new file mode 100644
index 000000000..8b9683b99
--- /dev/null
+++ b/data/layouts/SaffronCity_EastWestEntrance/map.bin
@@ -0,0 +1 @@
+������������������������2�2�2�2�2�2�2�2�2��2����������2��2�2(3'3'3'3'3'3)3�2�2���2�2,3�2�2�2�2�2-3�2�2���2�2*3&3&3&3&3&3+3�2�2��2����������2��2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/SaffronCity_Gym/border.bin b/data/layouts/SaffronCity_Gym/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SaffronCity_Gym/border.bin
diff --git a/data/layouts/SaffronCity_Gym/map.bin b/data/layouts/SaffronCity_Gym/map.bin
new file mode 100644
index 000000000..2eee32447
--- /dev/null
+++ b/data/layouts/SaffronCity_Gym/map.bin
@@ -0,0 +1 @@
+�����������������������������������������������������������2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�����������������������������������������������������������2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�����������������������������������������������������������2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2��2�2�2��2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2���
\ No newline at end of file
diff --git a/data/layouts/SaffronCity_House1_1F/border.bin b/data/layouts/SaffronCity_House1_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SaffronCity_House1_1F/border.bin
diff --git a/data/layouts/SaffronCity_House1_1F/map.bin b/data/layouts/SaffronCity_House1_1F/map.bin
new file mode 100644
index 000000000..6db070ab7
--- /dev/null
+++ b/data/layouts/SaffronCity_House1_1F/map.bin
@@ -0,0 +1 @@
+������������������5������0�0�0�0�0�0�0�0�0�0���0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0���0�0�0�0�0��0�0�0�0���0�0�0�0��0�0�0�0�0�0�0�0�0�0�0�0��0�0�0�0�0�0�0�0�0�0��0�0�0�0�0�0�0�0�0�0�0�0
\ No newline at end of file
diff --git a/data/layouts/SaffronCity_House1_2F/border.bin b/data/layouts/SaffronCity_House1_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SaffronCity_House1_2F/border.bin
diff --git a/data/layouts/SaffronCity_House1_2F/map.bin b/data/layouts/SaffronCity_House1_2F/map.bin
new file mode 100644
index 000000000..c3090f485
--- /dev/null
+++ b/data/layouts/SaffronCity_House1_2F/map.bin
diff --git a/data/layouts/SaffronCity_NorthSouthEntrance/border.bin b/data/layouts/SaffronCity_NorthSouthEntrance/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SaffronCity_NorthSouthEntrance/border.bin
diff --git a/data/layouts/SaffronCity_NorthSouthEntrance/map.bin b/data/layouts/SaffronCity_NorthSouthEntrance/map.bin
new file mode 100644
index 000000000..138b62d0f
--- /dev/null
+++ b/data/layouts/SaffronCity_NorthSouthEntrance/map.bin
@@ -0,0 +1 @@
+��������������2�����2�2��2�2�2��2�2��2�3�2�2��2��2�2�3�2�2��2�2�2�2�3�2�2��2�2��2�3�2�2��2��2�2�#3�2�2��2�2�2�2��2�2�2��2�2��2��2�2�2��2����
\ No newline at end of file
diff --git a/data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin b/data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin
diff --git a/data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin b/data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin
new file mode 100644
index 000000000..1f0a70d65
--- /dev/null
+++ b/data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin
@@ -0,0 +1,2 @@
+���������������������5�2�2�2�2
+3�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2��2�2�2����2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�����2�2�2�2�2������3�2�2�2�2����2�2�23�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2�2�2��2�2�2����2�2�2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/SeafoamIslands_1F/border.bin b/data/layouts/SeafoamIslands_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SeafoamIslands_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SeafoamIslands_1F/map.bin b/data/layouts/SeafoamIslands_1F/map.bin
new file mode 100644
index 000000000..00e113364
--- /dev/null
+++ b/data/layouts/SeafoamIslands_1F/map.bin
diff --git a/data/layouts/SeafoamIslands_B1F/border.bin b/data/layouts/SeafoamIslands_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SeafoamIslands_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SeafoamIslands_B1F/map.bin b/data/layouts/SeafoamIslands_B1F/map.bin
new file mode 100644
index 000000000..8735540c7
--- /dev/null
+++ b/data/layouts/SeafoamIslands_B1F/map.bin
@@ -0,0 +1 @@
+������������������������������������������������������B�B�B�B�B�B�B�B�B�B�����������������������������B�B�B�B�B�B�B�B�B�B�����������������2�2�2�2�2�2�2�2�2�2�2��B�B�B�B�B�B�B�B�B�B��2�2�2�2�2��2�2�2�������2�2�2�2�2�2�2�2�2�2�2��B�B�B�B�B�B�B�B�B�B��2�2�2�2�2�2�2�2�2�������2�2��B�B�B�F��B�B���B�B�B�B�B�������2�2�2�2�2�2�2�2�2�������2�2��B�B�B�B�B��B���B�B�B�B�B��2�2�2�2�2��2�2�2�2�2�2�2�2�������2�2��B�B�B�B�B�B�B���B�B�B�B�B��2�2�2�2�2��2�2�2�2�2�2�2�2�������2�2��B�B�B�B������B�B�B�B�B��2�2�2�2�2��2�2�2�2�2�2�2�2�������2�2��B�B�B�B���B�BXC�B�B�B�B�B��2�2�2�2�2��2�2�2�2�2�2�2�2�������2�2��B�B�B�B���B�B�B�B�B�B�B�B��2�2�2�2�2��2�2�2�2�2�2�2�2�������2�2��������B�B�B�B�B�B�B�B��2�2�2�2�2����������������2�2�2�2�2�2�2�2��B�B�B�B�B�B�B�BWC�B�B�B�B��2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2��B�B�B�B�B�B�B�B�B�B�B�B�B��2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2��B�B�B�B�B�B�B�B�B�B�B�B�B��2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2��B�B�B�B�B�B�B�B�B�B�B�B�B��2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2����������������2�2�2�2�2�2�2�2�2���U���2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2��2��2�2�2�2�2�2����U��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�����U����������������������������������V�����U������������������������������V�������������U�������V���������U���V���
\ No newline at end of file
diff --git a/data/layouts/SeafoamIslands_B2F/border.bin b/data/layouts/SeafoamIslands_B2F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SeafoamIslands_B2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SeafoamIslands_B2F/map.bin b/data/layouts/SeafoamIslands_B2F/map.bin
new file mode 100644
index 000000000..968163399
--- /dev/null
+++ b/data/layouts/SeafoamIslands_B2F/map.bin
diff --git a/data/layouts/SeafoamIslands_B3F/border.bin b/data/layouts/SeafoamIslands_B3F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SeafoamIslands_B3F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SeafoamIslands_B3F/map.bin b/data/layouts/SeafoamIslands_B3F/map.bin
new file mode 100644
index 000000000..f6803677d
--- /dev/null
+++ b/data/layouts/SeafoamIslands_B3F/map.bin
@@ -0,0 +1,3 @@
+��������������������������������������������������������'''�����������������������������������///����������������������B�B�B�B�B�B�B�B�B�����///������2�2�2�2�2��2�2���������B�B�B�B�B�B�B�B�B�����777������2�2�2�2�2�2��2���������B�B�B�B�B�B�B�B�B�� !!&
%"��2�2�2�2�2�2�2�2���������B�B�B�B�B�B�B�B�B��#




$��2�2�2�2�2�2�2�2���������B�B�B�B�B�B�B�B�B��C	C	C	C	C	C
+C
$������������������B�B�B�B�B�������B�B�B�B�B�B�B�;<��B�B�B�B�B�B�B�B���������B�B�B�B�B��2�2�2�2��B�B�B�B�B���#$��B�B�B�B�B�B�B�B���������B�B�B�B�B��2�2�2�2��B�B�B���2�2�#$��B���B�B�B�B�B���������B�B�B�B�BW�B�B�B�BX�B�B�B� PP!&$���2�2��B�B�B�B���������B��B�B�B�B�B�B�B�B�B�B�B�B�#



%PQ��B�B�B�B���������B���B��B�B�����B�B�B�#




$��B�B�B�B���������B�B�B�B�B�B�B��2�2��B�B�BWC	C	C	C	C
+C

CXC�B�B�B�B�����������������2�2��B�B�B�B�B�B�B�B�B�#$��B�B�B��B�B��������2�2�2�2�2�2�2�2��2�2��B�B�B�B�B�B�B�B�B�#$��B�B�B�B�B�B�����U��2�2�2�2��2�2�2�2�2�2�����������#$���������������2�2�2�2��2�2�2�2�2��2�2�2�2�2�2�2�2�������2�2�2�2�2���U���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�������2�2�2�2�2�����U�������������������V����U������V��U�U������������V������������������V�B�FU���U����V�����V��B�BU��������V������B��B�BU��������V���B�B�B���B�BU����V�����B��B�B�
\ No newline at end of file
diff --git a/data/layouts/SeafoamIslands_B4F/border.bin b/data/layouts/SeafoamIslands_B4F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SeafoamIslands_B4F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SeafoamIslands_B4F/map.bin b/data/layouts/SeafoamIslands_B4F/map.bin
new file mode 100644
index 000000000..668ac2580
--- /dev/null
+++ b/data/layouts/SeafoamIslands_B4F/map.bin
@@ -0,0 +1,3 @@
+�������������������������������������������B�B�B�B�B�B�B�B���B�B�B�B�B�B�B�B�B�B�B�B�B���������B�B�B�B�B�B�B�B���B�B�B�B�B�B�B�B�B��B�B�B���������B�B�B���B�B�B���B�B�B�B�B�B�B�B�B�B���B�������6�����2�2������B�B�B�B�B�B�B�B�B�B�B��B���������B�B�B�B�B�B�B�B���B�B�B���������B�B�������2�2����������C	C	C	C	C	C	C	C	CXC�B�B� #########!�����6���B�B����B�B�B�B�B�B�B�*+++++++++,��������B�B�B�B�B�B�B�B�B�B�B�B�*+++++++++,��������B�B�B�B�B�B�B�B�B�B�B�B�*+++++++++,��V�����B���B�B�B�B�B�B����*+++++++++,���U�����2�2�����B�B� ##1+++++++++,�����������B�B�*++++++++++++,��������B�B�*++++++++++++,�V��U���B�B�*++++++++++++,��������B�B�*++++++++++++,�����UC	C	C	C	C	CXC�B�BWC	C
+C�++++++++++,�����������89��B�B�B��B�B�B�B�B�B�B�BWC
+C�++++++++,�������������B�B�B�B�B�B�B�B�B�B�B�B�B�B�V������������B�B�B�B�B�B�B�B�B�B�B�B�B�B��������������������������������������������������U���V����������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland/border.bin b/data/layouts/SevenIsland/border.bin
new file mode 100644
index 000000000..75f2c916c
--- /dev/null
+++ b/data/layouts/SevenIsland/border.bin
@@ -0,0 +1 @@
+vvvv
\ No newline at end of file
diff --git a/data/layouts/SevenIsland/map.bin b/data/layouts/SevenIsland/map.bin
new file mode 100644
index 000000000..05be06e76
--- /dev/null
+++ b/data/layouts/SevenIsland/map.bin
@@ -0,0 +1 @@
+qqqqqur�0�0�0HIJK�p{|||}qqq|||�qur�0�0�0PQRS�pqqqqqq�|||�squr�0�0�0XYZ[�xy�q�||}q|�s{|}r�0�0�0`ab��0	0pqu�|||issqqqr�0�0�0�0�0�0�0�000pquuhkkts{�qqr�0�0�0�0�0�0�0�0	0	0pquursmt{��0�0�0�2�2�2�2�200pquursvxis0123�0�0�0�����0	0pquursvots89:;�0�0�0�����00x�uursvvts@Abc�0�0�0����0	0puursvvts�0�0�0�0�0�0�0�0�0�0�0�0	00	0puursvvts�0�0�0�0�0�0�0�0�0�0�0�0000x}ursvvt{|||��0�0�0�||||�0�0�0||}rsvvxkkkis0	00uhkkk�2�2�2kkkysvvossst{�0�0�0}rs�2������2ssmvvvossxk�1�1�1kys�������ssvvvvvvoss�1�1�1sss�������smDEvvDEvos�1�1�1sss�������svLMvvLMvvs�1�1�1sss�������svvvvvvvvvs�1�1�1sssssmvvvvvvvv
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_House_Room1/border.bin b/data/layouts/SevenIsland_House_Room1/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_House_Room1/border.bin
diff --git a/data/layouts/SevenIsland_House_Room1/map.bin b/data/layouts/SevenIsland_House_Room1/map.bin
new file mode 100644
index 000000000..e439b6d6f
--- /dev/null
+++ b/data/layouts/SevenIsland_House_Room1/map.bin
@@ -0,0 +1 @@
+=>{
|
}
PQ=>EF���XYEFM1N11�1�1�1111M1N1V1	1	1	1	1	1	1	1	1	1	1^	1	1	1o1efg1	1	1	11	1	1	1o1mng1	1	1	1V1	1	1	1	1	1	1	1	1	1	1^	1	1?1G1O1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_House_Room2/border.bin b/data/layouts/SevenIsland_House_Room2/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_House_Room2/border.bin
diff --git a/data/layouts/SevenIsland_House_Room2/map.bin b/data/layouts/SevenIsland_House_Room2/map.bin
new file mode 100644
index 000000000..7ed3a8c8a
--- /dev/null
+++ b/data/layouts/SevenIsland_House_Room2/map.bin
@@ -0,0 +1 @@
+{|}PQPQ!~1w!XYXY!111111111111	1	1	1	1	1	1	1	1	1	161	1	1#1$1$1$1$1%1	1	1	11	1	1+1,1,1,1,1-1	1	1	11	1	1314141414151	1	1.1	1	1	1	1	1	1	1	1	1	161	1	1	1	1	1	1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin b/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin
new file mode 100644
index 000000000..56b76feec
--- /dev/null
+++ b/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin b/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin
new file mode 100644
index 000000000..77ec431c8
--- /dev/null
+++ b/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin
diff --git a/data/layouts/SevenIsland_SevaultCanyon/border.bin b/data/layouts/SevenIsland_SevaultCanyon/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/SevenIsland_SevaultCanyon/border.bin
diff --git a/data/layouts/SevenIsland_SevaultCanyon/map.bin b/data/layouts/SevenIsland_SevaultCanyon/map.bin
new file mode 100644
index 000000000..d2414a683
--- /dev/null
+++ b/data/layouts/SevenIsland_SevaultCanyon/map.bin
diff --git a/data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin b/data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin
new file mode 100644
index 000000000..75f2c916c
--- /dev/null
+++ b/data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin
@@ -0,0 +1 @@
+vvvv
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin b/data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin
new file mode 100644
index 000000000..080fac6fb
--- /dev/null
+++ b/data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin
diff --git a/data/layouts/SevenIsland_TanobyRuins/border.bin b/data/layouts/SevenIsland_TanobyRuins/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TanobyRuins/map.bin b/data/layouts/SevenIsland_TanobyRuins/map.bin
new file mode 100644
index 000000000..0bf51a581
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins/map.bin
@@ -0,0 +1 @@
+�����++����++��������+++++��������������+ssqu�z0	0pqu�������������++������+��++++++�������������������������������++������++��++++��+++��++������+s{|}r000xy}+������++�����������++������+++�����+++����������������+++11++��++++++++����+����+����+��,{|�qr00	00	0"1+�����++++������++��+++++��++++++��+++����++�������������+��+++1�����&11+++��+1
1
1
1
11+��+++��++��0#!{|z00000*+��+++++1
1
1
1
1
1
11+��+++++++++��+������++���������������+��+++1�����11+++��++++++1%11�11&11+++++++++++++0#$
000	00	0*+++��+++11�����1+��+++++++++++��+��+1
1
1
1
1
1
1
11+��++��������������++++++1�����11+++++++++1�����11+++++1
1
1
1
11+++��+++0######1++++++++++11�����1+++++��+1
1
1
1
1
1
11+++++++1%1��&11��+�������������+��+++++1���2�111+++++++1�����11++++1%1�111&11++��+++++++++++++++++++��++++++11�����1+++++��+1�����11++++++1%1�������&11++�������������+��+++++11-1111.11+++++++++++1�����11++++1�����11++++++++++++++��+++++++��++++++11�����1++++++++1������1++++++1�s�������u�1++��������������+++++++11111++++++++++++1�����11++++1�����11++++++++++++��+++++++++++++++111��2��1++++++++1�����11++++++1�s�������u�1++��������������++++++++++++++++++++++1���2�1.11++++1�����11+++++++++++++++++++++++++++++++++1-11111.11++++++++1�����11++++++1�s�������u�1++��������������++++++++++++++++++++++++1-1111.11+++++1�����11++++++++++++++++++++++++++++++++++++111111+++++++++11��2��11++++++1�{�I3<=3>I3�}�1+++��������������+++++11++++++++++++++11111++++++1���2�1.11+++++++++++++++++++++++++++++++++++++++++++++++++++1-11111.11++++++1��{�I3I3I3�}��1+++������������+++++1�����&11++++++++++++++++++++++++1111111+++++++++++++++++++++++++++++++++++++++++++++++++++111111+++++++1-1��{�0�0�0}��.11+++������������+++++1�����11+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++��++++++++++++++��+++1-1�y�0�0�0y�11+++��+��������������++��+++1�����11+++++++++++++++++++++++++++++++++++��++++++++++++++++++++++++++++����++++++++++��++++1-11111.1111+++��+������������������+++1���2�111+++++++++++++++++++++����++��+++++++++++++++++++��+��++++++��+++++++++111111+++++��+�����������������+++++11111111++++++++++++++��+����+++++++++++++++++��++++��+����+++++++++��+++++++++++��+���������������++++++++++++++��++++��++��+++++++++��+++++++��+++++++��++++�����++����+++++��++++++++++����+++���������������+����+���������++++++++����++���+������++++���������+����+����������������������+++�����������������+��+������+��+++����+++����++��������++++++��++++��+++�����������++��++���������������������������+++����������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin b/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin
diff --git a/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin b/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin
new file mode 100644
index 000000000..50d04c4d3
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin
@@ -0,0 +1 @@
+������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2���������2���������2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�������2�������2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�������2�������2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2���������2���������2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin b/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin
diff --git a/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin b/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin
new file mode 100644
index 000000000..0dd265d65
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin
@@ -0,0 +1 @@
+������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2���������2���������2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�����2���������2��2�2���2�2��2��2�2�2�2�2�2�2�2�2�2�2��2��2�2���2�2��2��2�2�2�2�2�2�2�2�2�2�2��2��2�2���2�2��2����������2����2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2���������2���������2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin b/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin
diff --git a/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin b/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin
new file mode 100644
index 000000000..38f818e71
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin
@@ -0,0 +1 @@
+������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2���������2���������2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�������2�������2��2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2��2�������2�������2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2���������2���������2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin b/data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin
diff --git a/data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin b/data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin
new file mode 100644
index 000000000..e98187c67
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin
@@ -0,0 +1 @@
+������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2���������2���������2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2����2������2����2��2�2���2�2��2��2�2�2�2�2�2�2�2�2�2�2��2��2�2���2�2��2��2�2�2�2�2�2�2�2�2�2�2��2��2�2���2�2��2����2������2����2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2���������2���������2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin b/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin
diff --git a/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin b/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin
new file mode 100644
index 000000000..bdd65c306
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin
@@ -0,0 +1 @@
+������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2������2������2������2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�������2�������2��2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2��2�������2�������2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2������2������2������2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin b/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin
diff --git a/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin b/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin
new file mode 100644
index 000000000..4d4d0e886
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin
@@ -0,0 +1 @@
+������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2���������2���������2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2��������������2��2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2��2�������2�������2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2������������������2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin b/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin
diff --git a/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin b/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin
new file mode 100644
index 000000000..acb0469fc
--- /dev/null
+++ b/data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin
@@ -0,0 +1 @@
+������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2������������������2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�������2�������2��2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2��2�2�2�2���2�2��2�������2�������2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2���2�2������������������2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2������������������������
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TrainerTower/border.bin b/data/layouts/SevenIsland_TrainerTower/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TrainerTower/map.bin b/data/layouts/SevenIsland_TrainerTower/map.bin
new file mode 100644
index 000000000..c6a77c452
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower/map.bin
@@ -0,0 +1 @@
+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++squq�yy�������yy�qsqu++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+ssqu�zhq�������qjx�squu+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
(
sssqurh���������q�jpsquuu)
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,sssqurpq���������qrpsquuu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,sssqurpq���������qrpsquuu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,sssqurpq���������qrpsquuu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,sssqurx����������2�zpsquuu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,sssq��jxyyy��2�yyyzh��quuu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,ss{�qq�j	00�2�2�200	0h�qq�}uu*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,s{�sqqq�ij	00	00	0hi�qqqu�}u*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,{�ssqqqqquj000hsqqqqquu�}*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
0$ss{|||�quu333ssq�|||}uu 1�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+,s{|||�{|z31	0	0	031x|}�|||}u*+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+,{|||�{|�	00	00	00	0�|}�|||}*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+0#	!sqq{||�0�0�0||}qqu 	#1��
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+��,{||||y�0�0�0y||||}*+���
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++��++0	##$0	00	00"#	#1+�����
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�+++++++0#####1++++�����
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++++++++++++++++++++���
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++++++++++++++++++++���
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++++++++++++++++��+++���
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++++++++++++++++++��++����
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++��+��++++++++++++++++++����
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++��+��++++++++++++++++++����
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++++++++++++++++++++������
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++++++++++++++++��������
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
��+++1
1
1
1
1
1
1
1
1
1
11��++��+++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
��+++111111111111��+++++++++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
++1%1111��������++++��++++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++11111��0�0�0�0�0�00��+��++++++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++��1111��0�0�0�0�0�00�+++++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++��11111��0�0��0�0�00�����pqqqqq�++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++11111111��0�0�00�00hii�kllllllm�++�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+++11111111��0�0�00	0h�qkl�qqqqqququ+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+G���1�����0�0�000pqk�qqqqqqqququu)
+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+�qqqqqqq���iij�0�0�00	0pqsqqqqqqqqququu*
+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
+sqkllllllmqqqqr�0�0�000pqsqqqqqqqqquq��O+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
(
ssqsqqqqqq�llmqr�0�0�00	0pqsqqqqqqqqquqqqqu�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,
ssqsqqqqqqqqq�mr�0�0�000pq{|�qqqqqqquqqqquu)
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,
ssqsqqqqqqqqqqur�0�0�0{1|1�sqqq�|||}qqqquu*
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TrainerTower_1F/border.bin b/data/layouts/SevenIsland_TrainerTower_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_1F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_1F/map.bin b/data/layouts/SevenIsland_TrainerTower_1F/map.bin
new file mode 100644
index 000000000..812cea451
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_1F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_2F/border.bin b/data/layouts/SevenIsland_TrainerTower_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_2F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_2F/map.bin b/data/layouts/SevenIsland_TrainerTower_2F/map.bin
new file mode 100644
index 000000000..7ae889af1
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_2F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_3F/border.bin b/data/layouts/SevenIsland_TrainerTower_3F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_3F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_3F/map.bin b/data/layouts/SevenIsland_TrainerTower_3F/map.bin
new file mode 100644
index 000000000..c01e70c2f
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_3F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_4F/border.bin b/data/layouts/SevenIsland_TrainerTower_4F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_4F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_4F/map.bin b/data/layouts/SevenIsland_TrainerTower_4F/map.bin
new file mode 100644
index 000000000..057d7f955
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_4F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_5F/border.bin b/data/layouts/SevenIsland_TrainerTower_5F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_5F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_5F/map.bin b/data/layouts/SevenIsland_TrainerTower_5F/map.bin
new file mode 100644
index 000000000..d580e7d2d
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_5F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_6F/border.bin b/data/layouts/SevenIsland_TrainerTower_6F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_6F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_6F/map.bin b/data/layouts/SevenIsland_TrainerTower_6F/map.bin
new file mode 100644
index 000000000..3c2c3165c
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_6F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_7F/border.bin b/data/layouts/SevenIsland_TrainerTower_7F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_7F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_7F/map.bin b/data/layouts/SevenIsland_TrainerTower_7F/map.bin
new file mode 100644
index 000000000..d9bb110cf
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_7F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_8F/border.bin b/data/layouts/SevenIsland_TrainerTower_8F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_8F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_8F/map.bin b/data/layouts/SevenIsland_TrainerTower_8F/map.bin
new file mode 100644
index 000000000..6ba6588be
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_8F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin b/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin b/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin
new file mode 100644
index 000000000..42e08c38d
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin
@@ -0,0 +1 @@
+����������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin b/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin b/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin
new file mode 100644
index 000000000..b98077279
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin
@@ -0,0 +1 @@
+����������������2�2�2�����2�2�2�����2�2�2�2�2�����2�����2��2��2���������2��2��2�����������������2��������������2�2�w��2�v�2�2�2��2�2�2b���������2�2���������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2��2��2�2�2�2�2�2�2�2�2��2��2�
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin b/data/layouts/SevenIsland_TrainerTower_Roof/border.bin
new file mode 100644
index 000000000..f94adee61
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_Roof/border.bin
@@ -0,0 +1 @@
+////
\ No newline at end of file
diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin b/data/layouts/SevenIsland_TrainerTower_Roof/map.bin
new file mode 100644
index 000000000..37d57f3fe
--- /dev/null
+++ b/data/layouts/SevenIsland_TrainerTower_Roof/map.bin
@@ -0,0 +1 @@
+pT[[[[[[[[[[[[PzEpT[[[[[[[[[[[[PzEpT[[[[[[[[[[[[PzEpT[[[h[[[[h[[[PzEpJIIIi[[[[jMNOKzEp`abQJIIIIKUVWSzEpcde33RQQQQS3333mEpfg_33Z3333333333tEp33333333333333tExq333333333333s|Cyrrrrrrrrrrrr{@A;!"((((((((((((%&<;)*080808080808-.<;12#$+,#$#$+,#$56<;9:#$34#$#$34#$=><;)F#$kl#$#$kl#$G.<
\ No newline at end of file
diff --git a/data/layouts/SilphCo_10F/border.bin b/data/layouts/SilphCo_10F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_10F/border.bin
diff --git a/data/layouts/SilphCo_10F/map.bin b/data/layouts/SilphCo_10F/map.bin
new file mode 100644
index 000000000..1ca95017c
--- /dev/null
+++ b/data/layouts/SilphCo_10F/map.bin
@@ -0,0 +1 @@
+�000i000��jk8q88o�0]0>rst253u2vw?@BA008e8Fz{|243}2~GH�I885353535353;3<3434353535353535353535343434343434393232323234343232323534343434343M3��0^_534300534343434343U��8fg53438�8534343434343M3��N353535343535353534343434343U��V43434343�3434313232343432323��132323434323232300534300��00053430008�8534388��888534388|53535353435353��53535353435353�3N343��43��53�34343moW343V43434343��5343mo#%63435343���43��5343#%u3w36343N343�43��43��5343u3w363�34343V434343434343��5343434343434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_11F/border.bin b/data/layouts/SilphCo_11F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_11F/border.bin
diff --git a/data/layouts/SilphCo_11F/map.bin b/data/layouts/SilphCo_11F/map.bin
new file mode 100644
index 000000000..027e0a7db
--- /dev/null
+++ b/data/layouts/SilphCo_11F/map.bin
@@ -0,0 +1 @@
+�000i0��T88q8�00��RS�35353?0@BA008�8��Z[\34343G8H�I88535353��53;3<34343535353535353535343�3��132323232323232323:34343534343���0]^_00��5343534343��b�OefgO8��5343534343���353V���V53��5343534343��534343(3)3*36343��5343534343��5343�3�3�3�3�343��5343534343��5343�����43��5343534343��5343�����63��5343534343��5343�����63��5343534343��5343=3;3;3;3;3<3��5343534343��5343232323232323��5343534343?>5343000000��5343534343GF534388OOO8��5343534343535353435353VVV53��534353434343434343434343434343��5343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_1F/border.bin b/data/layouts/SilphCo_1F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_1F/border.bin
diff --git a/data/layouts/SilphCo_1F/map.bin b/data/layouts/SilphCo_1F/map.bin
new file mode 100644
index 000000000..fb7be168b
--- /dev/null
+++ b/data/layouts/SilphCo_1F/map.bin
@@ -0,0 +1 @@
+�i000��q8PQ�00]000000000]00^_0000@BA00000>53�3XY?0O8e888dOOO88e88fg8888H�I88888F53�3`aG8V5353535353lVVV535353535353535353535353535353535353535353435353535353434343433l634343434343434343434343434343434343434343434343434343434353434343433t63434343434343434343434343434343434343434343434343434343M3h3i3i3i3i3i3s6343434343434343434343434343434343434343434343E3J3434343Upqqqqqr634343434343���43434343���43434343434343CDW3E3434353;3;3;3;3;3;3<343434343�����4343�����434343434343KL63J343M35343434343434343434343��������������4343434343=3;3<34343U53434343434343434343����������������43434343E3J34343434353b3c3W343b3c3W34343����������������43434343CDW3E343M353j3k36343j3k363434343��������������4343434343KL63J343U53=3;3<343=3;3<343434343�����4343�����434343434343=3;3<343434353b3c3W343b3c3W34343434343���43434343���43434343434343E3J3434343M353j3k36343j3k36343434343434343434343434343434343434343434343CDW3E343U53=3;3<343=3;3<343434343434343434343434343434343434343434343KL63J34343534343434343434343434343434343434343434343434343434343434343=3;3<34343M35343434343434343434343434343434343434343434343M34343M34343M34343M34343U53434343434343�3�3�343434343434343434343434343U4343U4343U4343U434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_2F/border.bin b/data/layouts/SilphCo_2F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_2F/border.bin
diff --git a/data/layouts/SilphCo_2F/map.bin b/data/layouts/SilphCo_2F/map.bin
new file mode 100644
index 000000000..97ada04d8
--- /dev/null
+++ b/data/layouts/SilphCo_2F/map.bin
@@ -0,0 +1 @@
+�000i000��jk8q88o�000]000000��00000^_0@BA0>rst253u2vw?00OOO�e888888��8OO88fg8H�I8Fz{|243}2~G88VVV5353535353��53��53VV53535353535353535353;3;3<3434353535353535343434343434343434343��53434343434343434343434343434343434343434343435343�34343434343434343��5343�343434343434343434343434343434343434343431323232323434323232323��132323232323232323232323232323234343232323232300000534300000000000000000000005343000008888853438888888888OOOOOO8888885343888885353535353534353535353535353535353VVVVVV535353535353534353535353535343434343434343434343434343434343434343434343434343434343434343434343435343434343434343434343434343434343434343434343434343932323232323232323235343434343434343434343434343434343434343434343434343��0^_000013232323234343232323232323:34343mnoW343mnoW343��8�fg88{|000053430]00}��5343#���343#���343?>535353535353�3�3|{88�53438e88���5343u3v3w36343u3v3w36343GF5343434343434343�3�3535353534353535353~3��534343434343434343434343535353x3y3z3434343435343x3y3z3434343434343M3��5343mnoW343mnoW34393:343����34343M35343����343�3434343U��5343#���343#���343��53���63�343U5343�3�3�3634343434343M3��5343u3v3w36343u3v3w36343��53�3�3�3634343M35343434343434343434343U��534343434343434343434343��53434343434343U
\ No newline at end of file
diff --git a/data/layouts/SilphCo_3F/border.bin b/data/layouts/SilphCo_3F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_3F/border.bin
diff --git a/data/layouts/SilphCo_3F/map.bin b/data/layouts/SilphCo_3F/map.bin
new file mode 100644
index 000000000..e0a18ff16
--- /dev/null
+++ b/data/layouts/SilphCo_3F/map.bin
@@ -0,0 +1 @@
+�000i000��T88q8PQ�000000000^_000^_00000@BA0>RS�353�3XY?00OOO888888fg888fg88888H�I8FZ[\343�3`aG88VVV5353535353535353535353535353535353535353535353;3;3<343435353535353534343434343434343434343434343434343434343434343434343434343434343�3434353434343�343434343434343434343434343434343434343434343434343434343434343132323232323232323232323232323232323232323:34343434393232323232323232323}0000000��000000}0��53434343��000�����|8888�88��88�8888�|��53434343��8�88����~3�353535353535353?>N3535353535353~3�3?>53434343?>53535353�3�3�3�3�43434343mnoW3GFV434343mnoW343GF53434343GF53434343x3y3z343�43434343�63535353434343�6343535353434343535353434343���W3534343433#��6393:3N343433#��634393:34343434393:34343433���635343�34343u3v3w363��V43�343u3v3w36343��53434343��53�34343�3�3�363132323232323232323��132323232323232323��53434343��132323232323232300]00000000000000]000>53434343?00000000088e88888OOOOOO888e888F53434343G888888OOO5353535353535353VVVVVV53535353535353535343434353535353535353VVV534343434343434343434343434343434343434343434343434343434343434343434343534343�343434343434343434343434343434343434343434343434343434343�3434343534343434343434343434343434343434343434343434343434343434343434343434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_4F/border.bin b/data/layouts/SilphCo_4F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_4F/border.bin
diff --git a/data/layouts/SilphCo_4F/map.bin b/data/layouts/SilphCo_4F/map.bin
new file mode 100644
index 000000000..b6a91deb8
--- /dev/null
+++ b/data/layouts/SilphCo_4F/map.bin
@@ -0,0 +1 @@
+�000i000��jk8q88o�000000000��00^_000��@BA0>rst253u2vw?00888888888��8�8fg888��H�I8Fz{|243}2~G88535353535353535353��5353535353535353��5353535353;3;3<343435353535353537777W343�W3��5343mnnoW343��5343434343434343434343434343435377�63��5343�63�3��53434343434343434343434343434353�63��533#$���343��53434343434343434343434343434353�63��5343u3v3v3w36343��53434393232323234343232323232353���63��53�3434343434343��534343��0053430��}}53���63��1323234343232323��534343��88�53438����5373��63��0005343000��534343��535353534353�3�3~3~353�6343���63��{|85343888��534343��534343x3y3z34343434353�73<343��73<3���3�3535343535353��534343��534343���W34343M353=3<34343=3;3<343��53434343434343�3��534343��53433����34343U132323434323232323��1323234343232323��534343��534343�3�3�363434343000534300000000053430000>534343��534343x3y3z3434343M3O88534388OOOO88853438888F534343��534343���W34343UV535353435353VVVV53535353435353535353534343��53433����3434343534343434343434343434343434343434343434343434343���4343�3�3�3634343M35343�3434343434343434343434343434343434343434343���4343434343434343U534343434343434343434343434343434343434343434343���434343434343434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_5F/border.bin b/data/layouts/SilphCo_5F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_5F/border.bin
diff --git a/data/layouts/SilphCo_5F/map.bin b/data/layouts/SilphCo_5F/map.bin
new file mode 100644
index 000000000..0a4f53ad7
--- /dev/null
+++ b/data/layouts/SilphCo_5F/map.bin
@@ -0,0 +1 @@
+�000i000��T88q8PQ�00}}}00��0000]0000000@BA0>RS�353�3XY?0088���88��8888e888OOO8H�I8FZ[\343�3`aG885353~3~3~35353��5353535353535353VVV535353535353;3;3<34343535353535353M343M343M343��534343434343434343434343434343434343434343434343�3434353U43U43U43��53434343434343434393232323232323232323434323232323:34353434343434343?>534343434343�34343��}}0^_005343000��5353434343434343GF534393232323232323����8fg8�8534388O��535343434343434353535343��00000��~3~353535353535353435353V��5353M343M343M34393:34343��8{{|8��5343434343x3y3z3�3y3z34343��5353U43U43U43��5343��53�3�3�353?>534343433������W343��5313232323232323��5343��N343434343GF5343434343�3�3�3���6343��53000000��5343��V434343435353534343434343433���6343��53888�888��5343��534343434393:34343434343�3y3z3���6343��5353535353535353��5343��N343434343��534343433������6343��53534343774343?>5343��V43434343��5343434343�3�3�3�3�3�36343��5353���W3GF5343��1323232323��13232323232323232323232323��5353=3��6353535343?00000000^_00000000000>535343=3���6393:34343G8O88O88OfgO�8O88O88O88F535343�3���63��43�35353V5353V5353V5353V5353V5353V5353V53535353534343=3;3;3<3��434343434343434343434343434343434343434343434343434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_6F/border.bin b/data/layouts/SilphCo_6F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_6F/border.bin
diff --git a/data/layouts/SilphCo_6F/map.bin b/data/layouts/SilphCo_6F/map.bin
new file mode 100644
index 000000000..cf0b384e7
--- /dev/null
+++ b/data/layouts/SilphCo_6F/map.bin
@@ -0,0 +1 @@
+�0000��i000��jk88��q88o�0}}00��00]0>rst253?00@BA00>53u2vw?0{��88��88e8Fz{|243G88H�I88F53}2~G8�3~3~35353��5353535353;3;3<3435353535353535353535343535353535343434343?>534343439323232323232323232323434323232323:3�3435343�34343GF53434343��}000000053430^_��534353M343M3435353534343M3���{|8888�853438fg��534353U43U4393:3434343U��~3�3�35353535353535343535353��53431323232323��53434343��53434343x3y3y3y3y3y3y3z34343��53430000��534343M3��N3434343���������343��5343888�8��534343U��V434343��������4343��53435353535353��53434343��N343433���������343��534353��4343?>534343M3��V434343�3�3�3�3�3�3�3�34343��534353�434343GF534343U��1323234343232323232323232323��53435374343535353434343?000053430000000000>534353�434393:343434343G888853438888888888F53435343�4343��5343434353535353535343535353535353535353535353435343434343��534343434343434343434343434343434343434343434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_7F/border.bin b/data/layouts/SilphCo_7F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_7F/border.bin
diff --git a/data/layouts/SilphCo_7F/map.bin b/data/layouts/SilphCo_7F/map.bin
new file mode 100644
index 000000000..373fa1f17
--- /dev/null
+++ b/data/layouts/SilphCo_7F/map.bin
@@ -0,0 +1 @@
+�000i��0000��T88q��88PQ���^_00��000000��RS�353?@BA>53�3XY?��fg88��OO�8d88��Z[\343GH�IF53�3`aG�3�3535353�3��VV5353t5353?>53;3<34353535353535343535353534343x3y3z3��h3i3i3i3s4343GF5343434343434343434343434343534343�����pqqqr434353535343439323232343432323232323534343�3�3�3��1323234343232323:3434343��00534300005343434343�3��005343^_��534343��O853438�888132323232323��88�5343fg��534343��V5353435353�3�353000}}}��53535353435353��534343��N34343434343���38{|�����53moW3moW3��534343��V4343434343�3�36353�3�3~3~3~3��53#%63#%63��534343��132323434323232323534343434343��53u3w363u3w363��534343��00053430]��53M34343M343��534334343343��534343��88853438e��53U4343U43��13232323232323��534343��53535353435353�3�3534343434343?00]000]00>534343��5343434343434343b3534343434343G88e888e88F534343��534343�343434343j35343434343435353535353535353535353534343��534343434343434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_8F/border.bin b/data/layouts/SilphCo_8F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_8F/border.bin
diff --git a/data/layouts/SilphCo_8F/map.bin b/data/layouts/SilphCo_8F/map.bin
new file mode 100644
index 000000000..73efec7e1
--- /dev/null
+++ b/data/layouts/SilphCo_8F/map.bin
@@ -0,0 +1 @@
+�0000��i000�jk88��q88o00^_0��0}00}��rst253?00@BA00>53u2vw88fg8��8�{|���z{|243G88H�I88F53}2~5353535353��53~3�3�3~3��53;3<3435353535353535353535343535353x3y3z343��5343434343��534343932323232323232323232323232353���43��534343�343��534343��000000^_����3���43��5343232323��534343��888888fg����53���3?>534300��534343����3��3�535353�3�3�3�33���43GF53438�8��534343���C��C��C443434343M34353���43535353435353�3��534343��54344344343434343U4353�3�3�34393:3534343CD��534343��53CD43J34343434343M3435343�34343��534343KL��534343��53KL43E34343434343U431323232323��5343232323��534343��132323232343432323232323000000>534300]0>534343?00^_0053430000O88888F534388e8F534343G88fg8853438�888V535353535353534353535353535343435353535353535353435353535353N343�343434343434343434343434343434343434343434343434343434343V434343434343434343434343434343434343434343434343434343434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_9F/border.bin b/data/layouts/SilphCo_9F/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_9F/border.bin
diff --git a/data/layouts/SilphCo_9F/map.bin b/data/layouts/SilphCo_9F/map.bin
new file mode 100644
index 000000000..95d58dafb
--- /dev/null
+++ b/data/layouts/SilphCo_9F/map.bin
@@ -0,0 +1 @@
+�000i000��T88q8PQ�000]000]0000��RS�353�3XY?0@BA00000888e888e8888��Z[\343�3`aG8H�I88888535353535353535353�35353��53;3<34343535353535353535353535353534393232323232323232323��5343932323232343432323232323:343435343��000^_00��5343��0053430^_0��53435343��OO8fg8�8��N343��8�853438fg8��N3435343?>VV535353535353��V43��535353534353535353��V435343GF534343CD43J343��5343��5343434343CD43J3��N34353435353534343KL43E343��N343��5343434343KL43E3��V43534393:34343439323232323��V43��132323434323232323���3535343��534343��000��5343��}}053430000��531323��534343����8��N343����853438�888��530^_>534343?>��53?>V43��~3~35353435353535353��538fgF534343GF534343GF5343��5343437777434343?>53��3��3�4343535353434353535343��534343434343GF53�C��C��C44393:343434393:34343��53434343434353535354344344343��534343��5343��53434343�3434343434343
\ No newline at end of file
diff --git a/data/layouts/SilphCo_Elevator/border.bin b/data/layouts/SilphCo_Elevator/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/SilphCo_Elevator/border.bin
diff --git a/data/layouts/SilphCo_Elevator/map.bin b/data/layouts/SilphCo_Elevator/map.bin
new file mode 100644
index 000000000..42e08c38d
--- /dev/null
+++ b/data/layouts/SilphCo_Elevator/map.bin
@@ -0,0 +1 @@
+����������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/SixIsland/border.bin b/data/layouts/SixIsland/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/SixIsland/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/SixIsland/map.bin b/data/layouts/SixIsland/map.bin
new file mode 100644
index 000000000..a82f268bd
--- /dev/null
+++ b/data/layouts/SixIsland/map.bin
@@ -0,0 +1 @@
+vvvvvvvvvvvvvvtssqqqqqqvvvvvvvvvvvvsstssqqqqqqvvvvvvvvvssssstssqqqqqq]U]U]U]U]sssssstssqqqqqq���������|ssssstssqqqqqquqsssstsxyy�qqq�����������xyyy^3|1}1~1100000�����HIJK�(0)0*0+000$'PQRS�&%$'0123��XYZ[�����89:;&%00`ab��00	00@Abc��000�0�0�0�0�0�0�0�0�0�0�0�0�0�00�0�0�0�0�0�0�0�0�0�0�0�0�0�0	0�0�0�000�2�2�2�2�2�0�0�0	00�0�0�0������0�0�000&'�0�0�0&'������0�0�0	000�0�0�000�����0�0�00000�0�0�0�0�0�0�0�0�0�0�0�0�0	0$%$'000�0�0�0�0�0�0�0�0�0�0�0�0�00�����yy�0�0�0yyy�0	00000�'&'r0	0�0�0�00	00p�������|||z&%$'���0�0�0���phiiiiiikkkkkkkkkk�2�2�2kklpsqqqqqqssssssss�2������2tssqqqqqqvvvossss�������tssqkllllvvvvosss�������tssqsqqqqvvvvvvos�������tssqsqqqqvvvvvvvo�������tssqsqqqqvvvvvvvvvvvvvvotssqsqqqq
\ No newline at end of file
diff --git a/data/layouts/SixIsland_AlteringCave/border.bin b/data/layouts/SixIsland_AlteringCave/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SixIsland_AlteringCave/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SixIsland_AlteringCave/map.bin b/data/layouts/SixIsland_AlteringCave/map.bin
new file mode 100644
index 000000000..7dde0cb15
--- /dev/null
+++ b/data/layouts/SixIsland_AlteringCave/map.bin
diff --git a/data/layouts/SixIsland_DottedHole_1F/border.bin b/data/layouts/SixIsland_DottedHole_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_1F/map.bin b/data/layouts/SixIsland_DottedHole_1F/map.bin
new file mode 100644
index 000000000..ea33c9ead
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_1F/map.bin
@@ -0,0 +1 @@
+��������������������2�2��2�2�2�2����������2��2�2�2������������2�2�2�2�2�2�2���������2�2�2�2�2�2�2�2�2��2�2�2����2�2�2�2�2�2�2�2�2��2�2�2���2�2�2�2�2�2�2�2�2�2��2�2�2���2��2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2��2�2�2�2�2�2�2�2��2������������������
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_B1F/border.bin b/data/layouts/SixIsland_DottedHole_B1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_B1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_B1F/map.bin b/data/layouts/SixIsland_DottedHole_B1F/map.bin
new file mode 100644
index 000000000..a610cdd58
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_B1F/map.bin
@@ -0,0 +1 @@
+���������������2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2��2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2��2�2�2�2�2���2�2�2�2333�2�2�2�2���2�2�2��2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2��������������
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_B2F/border.bin b/data/layouts/SixIsland_DottedHole_B2F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_B2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_B2F/map.bin b/data/layouts/SixIsland_DottedHole_B2F/map.bin
new file mode 100644
index 000000000..3abe860dd
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_B2F/map.bin
@@ -0,0 +1 @@
+���������������2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2��2�2�2���2�2�2�2�2�2�2��2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2��2�2�2�2�2���2�2�2�2333�2�2�2�2���2��2�2�2�2�2�2�2��2���2�2�2�2�2�2�2�2��2�2���2�2�2�2�2�2�2�2�2�2�2��������������
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_B3F/border.bin b/data/layouts/SixIsland_DottedHole_B3F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_B3F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_B3F/map.bin b/data/layouts/SixIsland_DottedHole_B3F/map.bin
new file mode 100644
index 000000000..c72c26c5c
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_B3F/map.bin
@@ -0,0 +1 @@
+���������������2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2��2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2��2�2�2�2�2���2�2�2�2333�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2��������������
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_B4F/border.bin b/data/layouts/SixIsland_DottedHole_B4F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_B4F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_B4F/map.bin b/data/layouts/SixIsland_DottedHole_B4F/map.bin
new file mode 100644
index 000000000..a0c7e44e3
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_B4F/map.bin
@@ -0,0 +1 @@
+���������������2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2��2�2�2���2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2��2�2�2�2�2���2�2�2�2333�2�2�2�2���2�2�2��2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2�2����2�2�2�2�2�2�2�2�2�2��������������
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin b/data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin b/data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin
new file mode 100644
index 000000000..67a89d25e
--- /dev/null
+++ b/data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin
@@ -0,0 +1 @@
+���������������������������������������S��������������2�2[3�2�2������������2�2�2�2�2�����������2A3M33L3C3�2���������2�2F3�2�2�2E3�2���������2�2�2�2G�2�2�2�2��������23I3�2�2�2H33�2���������2N3K3�2J3O3�2�����������2333�2�������������2�2�2�������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/SixIsland_GreenPath/border.bin b/data/layouts/SixIsland_GreenPath/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/SixIsland_GreenPath/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/SixIsland_GreenPath/map.bin b/data/layouts/SixIsland_GreenPath/map.bin
new file mode 100644
index 000000000..647978c02
--- /dev/null
+++ b/data/layouts/SixIsland_GreenPath/map.bin
diff --git a/data/layouts/SixIsland_OutcastIsland/border.bin b/data/layouts/SixIsland_OutcastIsland/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/SixIsland_OutcastIsland/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/SixIsland_OutcastIsland/map.bin b/data/layouts/SixIsland_OutcastIsland/map.bin
new file mode 100644
index 000000000..53e933378
--- /dev/null
+++ b/data/layouts/SixIsland_OutcastIsland/map.bin
@@ -0,0 +1,15 @@
+����������������������������������������������������������������������������������������������������������++++++������������++++++��������+��++��+��++���++++��++��+��
+++����+++++��
++++++����+��++++++++����+�+�qqq�+++��+�����klllm��++�y�+����sqqqu�++++���
+++�sqqqu�V+++++++++++�sqqq�llm�
1
1�++++�{|�qqqqu�11�qq�++++�y�sqqq�}����qq�++++���sqqqu���qqqq�+++��+�sqqqu���qqqq�++��+��+�{|||}��qqqqq�++��+��
�q�y�0y��yyyyy�+��+	�y�111111����1+�y�����
2111111�qq�1+���
+��+++1111111�yy�1++��+��++1121111����1++++��+��++++�����qq��+++++++++�qq��y�q�++++++++TU�qq����q�+++++��++��qqq���y�++++���++�yyy�1���
++�����++������
+++++++�y����++++++++++++++++���
+�++++++++++++++++��++++++++++++++++��++��+++��+++��+�������+++��+++��+++��+��+++++��
+++++++��++++++��++++++++��++++++��+++++��++��++����
++++++�y�++��++��+++++++++���
+++��+++++++++++++++++�+++++��++++++++++���++��+++++++++++++�y�++++++++��++�����
+++++++++��++�y��++++++++��
+++���
+�+++++++++��++�+++++++++++��++++��++��++++++++��
+++++��++��++++++++��+��+++++++++++��+++��++��+++++++++��++������+��+++++++++��+���++��+++++++��++����+��+++++��++������+++++++++��+++����++++��+++++��+�������+++��+++++++++���������++++++++��+���������++++++++��+�����++++++++++�������+++++++++���������++++++++����������++++++������������+++++++�������������++++��+�������������++++��+++�����������+��+++++����������+��++���������������+++++����������������++++++���������+++++++���������++++��+�����������++++++��+��������++++++��++����������++++++��++������������++��++++++�������+++��++++�����
\ No newline at end of file
diff --git a/data/layouts/SixIsland_PatternBush/border.bin b/data/layouts/SixIsland_PatternBush/border.bin
new file mode 100644
index 000000000..c1fe47df7
--- /dev/null
+++ b/data/layouts/SixIsland_PatternBush/border.bin
@@ -0,0 +1 @@
+������
\ No newline at end of file
diff --git a/data/layouts/SixIsland_PatternBush/map.bin b/data/layouts/SixIsland_PatternBush/map.bin
new file mode 100644
index 000000000..7cd07c6c8
--- /dev/null
+++ b/data/layouts/SixIsland_PatternBush/map.bin
@@ -0,0 +1 @@
+������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0������������
0
0
0
0	00	0
0
0
0
000	000	000	000
0
0
0
000	000	0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0���������0	00
0
0
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
00	000	000	0
0
0	0
0
00	00������000
0
0
0
00
0
0
000	000	000	000	0	000	0000	000
0
0
0
0
0
0
0
0
0
0
0
0	0
0
00
0
0000������0	00
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0	0
0
00
0
00
0
00	00������000
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
00
0
00
0
0	000	000	000	000	0
0
00
0
00
0
0
0
0
0000������0	00
0
0	00	0
000	000	000	00
0
0	0
0
00
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
00
0
0	0
0
0
0
0
00	00������000
0
00
0
0
0
0
0
0
0
0
0
0
00
0
0
00
0
0	000	0
0
00	0
0
00	000	0
0
0
0	0
0
00
0
0
0
0
0000������0	00
0
00
0
0
0
0
0
0
0
0
0
0
0	0
0
0
00
0
00
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
00
0
00
0
0
0
0
00	00������000
0
0	000
0
0
000	000	00	0
0
0
0
0
00
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
00
0
0	0
0
0	0
0
0000������0	00
0
00
0
0
0
0
0
0
0
0
0
0
0
0000	000	0
0
00	000	000	000	00	0
0
0
0
0
00
0
00
0
00	00������000
0
00
0
0
0
0
0
0
0
0
0
0
0
00
0
0
0
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
00	00	0
0
0000������0	00
0
0	000	000	0	00	0
0
0
0	0
0
0
0
0
00
0
00	0
0
000	00	0
0
0
0	000	00
00
0
0	0
0
00	00������000
0
00
0
0
0
0
0
0
0
0
0
0
0
00
0
0
0
0
0	0
0
0
0
0
0
0
0
0
0
0
0
0
0
00
0
0
0	0
0	0
0
00
0
0000������0	00
0
00
0
000	000	000	000
0
000	0000	000	0
0
0
0
0
0
0
0
00
0
0
00
00
0
0
0
0
00	00������000
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
00
0
0
0
0
000	000	000	00
0
0
0
0
0000������0	00
0
0
0
0
0
0
0
0
0
0
0
0
0
0
000	00
0
0
0
0
0
0
0
00
0
0
0
0
0	0
0
0
0
0
0	0
0
0
0
0
0
0
0
00	00������000
0
0	0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0	0
0
0
0
0
00
0
0
0
0
00
0
0
0
0
0
0
0
0000������0	00
0
0000	000	000
0
000	000	000	0	000	000
0
0
0
0
00
0
0
0
0
000	00
0
0
0
0
00	00������000
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0000������0	00
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
0
0�2
00	00������000������������������������������������������������000�������2�2�2�������������������������������������������������2�2�2���������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/SixIsland_RuinValley/border.bin b/data/layouts/SixIsland_RuinValley/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/SixIsland_RuinValley/border.bin
diff --git a/data/layouts/SixIsland_RuinValley/map.bin b/data/layouts/SixIsland_RuinValley/map.bin
new file mode 100644
index 000000000..848cbec26
--- /dev/null
+++ b/data/layouts/SixIsland_RuinValley/map.bin
diff --git a/data/layouts/SixIsland_WaterPath/border.bin b/data/layouts/SixIsland_WaterPath/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/SixIsland_WaterPath/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/SixIsland_WaterPath/map.bin b/data/layouts/SixIsland_WaterPath/map.bin
new file mode 100644
index 000000000..42f48165b
--- /dev/null
+++ b/data/layouts/SixIsland_WaterPath/map.bin
diff --git a/data/layouts/ThreeIsland/border.bin b/data/layouts/ThreeIsland/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/ThreeIsland/border.bin
diff --git a/data/layouts/ThreeIsland/map.bin b/data/layouts/ThreeIsland/map.bin
new file mode 100644
index 000000000..523f3e70c
--- /dev/null
+++ b/data/layouts/ThreeIsland/map.bin
@@ -0,0 +1 @@
+$33333$33333�2�2�2�2�2�2�2�2�2�2$'�����&'�����&%$%$%�������������������00	0�0�3�0�3�0�0�0�0�0�3�0�3�0�000000000�0�0�0�0�01�01�0�0�0�0�0�00	000�00	00	00	00�0�0�0033333(0)0*0+0�00000000�0�0�00�����0123�	00	00	00	00�0�0�00�����89:;�0��������0�0�00�����@Abc�	0000000��0�01�0�3�0�3�0�0�0�3�0�3�0��0�01�0�0�0�0�0�0�0�0�0�0�	0��0�0�00	00	00	00000�0��0�0�00033333����	0��0�0�00	0������0000��0�0�000��������0�0�00	0��������0�01�0�0�3�0�3�00���0�01�0�0�0�0�0�00���0�0�00	00	00	00���0�0�000{1|1}1~11�&%$%$%��0�0�00	0HIJK��hiiiii��0�0�000PQRS��pqklll��0�0�00	0XYZ[��pqsqqq$%$'��0�0�000`ab���pqsqqq�0�01�0�0�0�3�0�3�0�pqsqqq������0�01�0�0�0�01�0�0�pqsqqq������0�0�00	00	0�0�0�0�pqsqqq������0�0�0000�0�0�0�pqsqqq�3�0�3�0�01�01�0�0�0�01�0�0�pqsqqq�0�0�0�0�0�0�0�01�01�0�0�0�0�pqsqqq���������0�0�0�����pqsqqqhiiiiij��0�0�0�hiii�qsqqqpklllmr��0�0�0�pqklll�qqqpsqqqur��0�0�0�pqsqqqqqqqpsqqqur��0�0�0�pqsqqqqqqq$'psqqqur��0�0�0�pqsqqqqqqq
\ No newline at end of file
diff --git a/data/layouts/ThreeIsland_BerryForest/border.bin b/data/layouts/ThreeIsland_BerryForest/border.bin
new file mode 100644
index 000000000..7797e033b
--- /dev/null
+++ b/data/layouts/ThreeIsland_BerryForest/border.bin
@@ -0,0 +1 @@
+������
\ No newline at end of file
diff --git a/data/layouts/ThreeIsland_BerryForest/map.bin b/data/layouts/ThreeIsland_BerryForest/map.bin
new file mode 100644
index 000000000..e98d91119
--- /dev/null
+++ b/data/layouts/ThreeIsland_BerryForest/map.bin
@@ -0,0 +1 @@
+������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������0�2�2�2	0�0���0	00	0�0	0���	00	00	00	0�2	0	0�200	00	00	00	00	0	0
0	00�0�������������2
0
0
0�2	0���00
0�2	0	0���000	0�0	0������	0�2	0	0�2	00000
0	0
0
00�������������2
0
0
0�2�2���0
0���
0	00�2	0	0
0	0�2	0������������0	00
0�2
0
0
0
0������������	0�2
0
0
0	0���
00���	0
0���
00���������������������
0
0
0�������������20�2	0�2	0���0
0���
0
0���
0
0������
0
0
0������	00	0���
0
0
0������������0	00������	00
0
0
0
0
0���
0
0������
0
0
0
0
00000000���
0
0
0������������000������00�2
0
0
0
0
0
0
0
0
0���0	0
0
0
0
0
0
0
00	00	00	0���	0
0
0������������0	00������0���
00
0
0
0
0�2
0������������	0�2	0000���
0	0
0������������000���0	0	00���0
00
0
0������������������������	0
0	0�������������200���0
000���
00
000������$%%%%%%%&���0	00���
00	0������������	00	0���
00
0	00	0�00	00	00������000000	0�2	0���	0�200	00	000������������0�2	0���0
00
0	000000000	00���	00	00	00���������0�0000	0�������������20�2���
0
0
0
0
00	0
0
0
00	0�20	0���000000���������0�2000�2������������0�20���
0
0
0�2
0
0
0
0
0�2
0���	0������������	0�0	0������	0�20�������������2�2�2���
0
0���
0�2
0������0
0
0
0
00	0	0�2	0���000�2	0	0���	00�2�������������2�2�2���
0
0������������0	0
0
0
0
00������00���0���0�20�������������2�2�2���0
0���������
00
0	0
0
0
0
0�2	0����20�2	00���	0���	00�2�������������2�2�2���
00
00	0���
0
0
0
0
0000
0
0������0�2000���0���0	00�������������2�2�2���	0
0000�00
00
0
0�2	0
0	0	00
0�������200	0�20	00	00	00�200000���������	0�20���0	0�00	00	0	0
00���0	00�00������000���00000���0000����������2	0�2���	00000000	00���00	0�2	0���	0�0	00	00���	0�20	00���0000���������0�20����������������00������000�200������00���0000����������2	000	0����������
0	0
0	00������	00���
0������00���000�2���������0	00	000$%%%%%%%%&
0
0000������00���
0������	00���	00�20���������	0�2	0000	0	00	0
0	0
0
0
0
0
0
0
0�2	0������	00���
0���0
0	0	0�2000000�2������������	0�0	00
00
0	0
0	0
0
0
0
0
0���������00���
0���
00
0���0000�20������������00	0
0	0
00�2
0
0�2
0
0�2
0���������
0	0���
0���0
0
0���000�2�2�2������������������������������������	0
0	0
0
0
0���
0
0
0���0�00���������������������������������������
0	0
0
0
0
0���
0
0
0
0	000�20���������������������������������������
0
0
0
0
0	0���
0
0
0	000������������������������������������������
0
0
0
0	0
0��������������������������������������������������
0
0
0	0
0	0���0�2	0�20�2������������������$%%%%&������������������0
0	00	00	00	00	0�2	0�20������������������	00000	0������������������
0	0000000000000�2������������������0�2	00�2	0
0�2	0
0�2	0
0
0	0���������0�200�200�200�20	00	0������������������������������
0
0
0���������������������000������������������������������
0
0
0����������������������2�2�2������������������������������
0
0
0������������������������������������������������	0�2
0
0�2
0
0�2	0���������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/ThreeIsland_BondBridge/border.bin b/data/layouts/ThreeIsland_BondBridge/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/ThreeIsland_BondBridge/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/ThreeIsland_BondBridge/map.bin b/data/layouts/ThreeIsland_BondBridge/map.bin
new file mode 100644
index 000000000..c554c03e3
--- /dev/null
+++ b/data/layouts/ThreeIsland_BondBridge/map.bin
diff --git a/data/layouts/ThreeIsland_DunsparceTunnel/border.bin b/data/layouts/ThreeIsland_DunsparceTunnel/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/ThreeIsland_DunsparceTunnel/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/ThreeIsland_DunsparceTunnel/map.bin b/data/layouts/ThreeIsland_DunsparceTunnel/map.bin
new file mode 100644
index 000000000..4623ea1b3
--- /dev/null
+++ b/data/layouts/ThreeIsland_DunsparceTunnel/map.bin
@@ -0,0 +1 @@
+�����������������������������������������������������������������2����������������������������2�2�2�2�2��������������������������2�2�2�������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/ThreeIsland_House1/border.bin b/data/layouts/ThreeIsland_House1/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/ThreeIsland_House1/border.bin
diff --git a/data/layouts/ThreeIsland_House1/map.bin b/data/layouts/ThreeIsland_House1/map.bin
new file mode 100644
index 000000000..871205cfa
--- /dev/null
+++ b/data/layouts/ThreeIsland_House1/map.bin
@@ -0,0 +1 @@
+=>`89EF& h@AM1N1.311111H1I111	1	1	1	1	1	1	1	1	1	1V1	1	1	1o1ef	1	1	1	1^	1	1	1o1mn	1	1	1	1V1	1	1	1	1	1	1	1	1	1	1^	1	1?1G1O1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/ThreeIsland_Port/border.bin b/data/layouts/ThreeIsland_Port/border.bin
new file mode 100644
index 000000000..75f2c916c
--- /dev/null
+++ b/data/layouts/ThreeIsland_Port/border.bin
@@ -0,0 +1 @@
+vvvv
\ No newline at end of file
diff --git a/data/layouts/ThreeIsland_Port/map.bin b/data/layouts/ThreeIsland_Port/map.bin
new file mode 100644
index 000000000..44f29053c
--- /dev/null
+++ b/data/layouts/ThreeIsland_Port/map.bin
diff --git a/data/layouts/TwoIsland/border.bin b/data/layouts/TwoIsland/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/TwoIsland/border.bin
diff --git a/data/layouts/TwoIsland/map.bin b/data/layouts/TwoIsland/map.bin
new file mode 100644
index 000000000..60e9c0bc9
--- /dev/null
+++ b/data/layouts/TwoIsland/map.bin
diff --git a/data/layouts/TwoIsland_CapeBrink/border.bin b/data/layouts/TwoIsland_CapeBrink/border.bin
new file mode 100644
index 000000000..75f2c916c
--- /dev/null
+++ b/data/layouts/TwoIsland_CapeBrink/border.bin
@@ -0,0 +1 @@
+vvvv
\ No newline at end of file
diff --git a/data/layouts/TwoIsland_CapeBrink/map.bin b/data/layouts/TwoIsland_CapeBrink/map.bin
new file mode 100644
index 000000000..d48f75cd4
--- /dev/null
+++ b/data/layouts/TwoIsland_CapeBrink/map.bin
@@ -0,0 +1 @@
+vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvDEvvvvvvvvvvvDEvvvvvvvvvLMvvvvvvvvvvvLMvvvvvvvvvvvvvDEvvvDEvvv//////////s}vLMvvvLMssz2131313131 3!3!3"3#3|ss}vvvvvvsszs00	00	0�6�6�6�6�6u|ssvDEvszss	00000�����uqu|s}LMvszsss
00	00	0�����41m��|s}vzssss
0
0	00	00	00	00	0uqqu|svpsssss
0
0
000000000uqquu|}tssssx�0�0�	0�����0	0uqqu��|tssss
000p0�����00uqq�lmutssss
0
0
0p0�����0	0uqqqquutssss
0
0
0p031{�z3100uqqqquutssss
0
0
0x||'''|||}qqqquutsss{|�0�0y||///|||�qqqq��tss{|�00
0�|777||�sqqqqqqtssqqs
0
0
0u������s{�qqqqqts{|�s
0
0
0u������{�sqqqqqtsqqss
0
0
0u�������0�sqqqqqtsqqs{�
0
0u�������ssqqqqqtsqqsqs
0
0u�������ssqqqqqtsqq{�s
0
0u�������ssqqqqqtsqqqs{�0�0}�������ssqqqqqtsqqq{��3�3��������ssqqqqq��qqqqs�3�3��������ssqqqqqqqqqqqs�3�33131313131313131psqqqqqqqqqqqs�3�3}3~3000|3}3}3�sqqqqqqqqqqqs�3�3�3�3}3}3}3�3�3�3��qqqqqqqqqqqs�3�3�3�3�3�3�3�3�3�3�{||�qqqqqqqq{||||��3�3�3�3�3�qqq{||
\ No newline at end of file
diff --git a/data/layouts/TwoIsland_JoyfulGameCorner/border.bin b/data/layouts/TwoIsland_JoyfulGameCorner/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/TwoIsland_JoyfulGameCorner/border.bin
diff --git a/data/layouts/TwoIsland_JoyfulGameCorner/map.bin b/data/layouts/TwoIsland_JoyfulGameCorner/map.bin
new file mode 100644
index 000000000..c445c5cb3
--- /dev/null
+++ b/data/layouts/TwoIsland_JoyfulGameCorner/map.bin
diff --git a/data/layouts/UndergroundPath_EastWestTunnel/border.bin b/data/layouts/UndergroundPath_EastWestTunnel/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UndergroundPath_EastWestTunnel/border.bin
diff --git a/data/layouts/UndergroundPath_EastWestTunnel/map.bin b/data/layouts/UndergroundPath_EastWestTunnel/map.bin
new file mode 100644
index 000000000..b6890bacd
--- /dev/null
+++ b/data/layouts/UndergroundPath_EastWestTunnel/map.bin
@@ -0,0 +1 @@
+������������������������������������������������������������������������������������������������������������������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/UndergroundPath_Entrance/border.bin b/data/layouts/UndergroundPath_Entrance/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UndergroundPath_Entrance/border.bin
diff --git a/data/layouts/UndergroundPath_Entrance/map.bin b/data/layouts/UndergroundPath_Entrance/map.bin
new file mode 100644
index 000000000..58cc0f850
--- /dev/null
+++ b/data/layouts/UndergroundPath_Entrance/map.bin
@@ -0,0 +1 @@
+����������������������������2�2�2�2�2�2�2�2�2�2�2��2�2���2�6�6�2�2���2�2�2�2��2�2���2�2�2��2�2�2�2��2�2���2�2�2��2�2�2�2���2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2����
\ No newline at end of file
diff --git a/data/layouts/UndergroundPath_NorthSouthTunnel/border.bin b/data/layouts/UndergroundPath_NorthSouthTunnel/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UndergroundPath_NorthSouthTunnel/border.bin
diff --git a/data/layouts/UndergroundPath_NorthSouthTunnel/map.bin b/data/layouts/UndergroundPath_NorthSouthTunnel/map.bin
new file mode 100644
index 000000000..4772a43cd
--- /dev/null
+++ b/data/layouts/UndergroundPath_NorthSouthTunnel/map.bin
@@ -0,0 +1 @@
+������������������2�2�2�2�����2�2�2�2�����2�2�2�2�����2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2���2�2�2�2�2�2�����2�2�2�2�����2�2�2�2�����2�2�2�2���������
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_00_00/border.bin b/data/layouts/UnknownMap_00_00/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/UnknownMap_00_00/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_00_00/map.bin b/data/layouts/UnknownMap_00_00/map.bin
new file mode 100644
index 000000000..8616a5f1b
--- /dev/null
+++ b/data/layouts/UnknownMap_00_00/map.bin
diff --git a/data/layouts/UnknownMap_00_01/border.bin b/data/layouts/UnknownMap_00_01/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/UnknownMap_00_01/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_00_01/map.bin b/data/layouts/UnknownMap_00_01/map.bin
new file mode 100644
index 000000000..93050f0f5
--- /dev/null
+++ b/data/layouts/UnknownMap_00_01/map.bin
@@ -0,0 +1 @@
+��������������������������������������2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2���2�2�2�2���2�2�2�2���2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�������2�2�����
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_00_02/border.bin b/data/layouts/UnknownMap_00_02/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/UnknownMap_00_02/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_00_02/map.bin b/data/layouts/UnknownMap_00_02/map.bin
new file mode 100644
index 000000000..08209eaca
--- /dev/null
+++ b/data/layouts/UnknownMap_00_02/map.bin
@@ -0,0 +1 @@
+��������������� !3'3'3'3$3%3%3&3'3'3'3"3#������()3D3D343D3D3D3D363D3D3*3+������()3D3,3<89:;>.3D3*3+������()3D3D353@ABC73D3D3*3+������()3D3-3=HIJK?/3D3*3+������()3D3D3F3F3F3F3F3F3D3D3*3+������013D3D3D3D3D3D3D3D3D3D3233������������2�2�2�2��������
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_00_03/border.bin b/data/layouts/UnknownMap_00_03/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/UnknownMap_00_03/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_00_03/map.bin b/data/layouts/UnknownMap_00_03/map.bin
new file mode 100644
index 000000000..c68e13ec3
--- /dev/null
+++ b/data/layouts/UnknownMap_00_03/map.bin
diff --git a/data/layouts/UnknownMap_00_04/border.bin b/data/layouts/UnknownMap_00_04/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnknownMap_00_04/border.bin
diff --git a/data/layouts/UnknownMap_00_04/map.bin b/data/layouts/UnknownMap_00_04/map.bin
new file mode 100644
index 000000000..829e21554
--- /dev/null
+++ b/data/layouts/UnknownMap_00_04/map.bin
@@ -0,0 +1 @@
+�������������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_03_50/border.bin b/data/layouts/UnknownMap_03_50/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/UnknownMap_03_50/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/UnknownMap_03_50/map.bin b/data/layouts/UnknownMap_03_50/map.bin
new file mode 100644
index 000000000..cbd97e361
--- /dev/null
+++ b/data/layouts/UnknownMap_03_50/map.bin
@@ -0,0 +1 @@
++
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_03_51/border.bin b/data/layouts/UnknownMap_03_51/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/UnknownMap_03_51/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/UnknownMap_03_51/map.bin b/data/layouts/UnknownMap_03_51/map.bin
new file mode 100644
index 000000000..e6859e745
--- /dev/null
+++ b/data/layouts/UnknownMap_03_51/map.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_03_52/border.bin b/data/layouts/UnknownMap_03_52/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/UnknownMap_03_52/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/UnknownMap_03_52/map.bin b/data/layouts/UnknownMap_03_52/map.bin
new file mode 100644
index 000000000..7f730c596
--- /dev/null
+++ b/data/layouts/UnknownMap_03_52/map.bin
diff --git a/data/layouts/UnknownMap_03_53/border.bin b/data/layouts/UnknownMap_03_53/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/UnknownMap_03_53/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/UnknownMap_03_53/map.bin b/data/layouts/UnknownMap_03_53/map.bin
new file mode 100644
index 000000000..616f50967
--- /dev/null
+++ b/data/layouts/UnknownMap_03_53/map.bin
@@ -0,0 +1 @@
+qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++||||||�+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D54D8/border.bin b/data/layouts/UnusedLayout_82D54D8/border.bin
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D54D8/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D54D8/map.bin b/data/layouts/UnusedLayout_82D54D8/map.bin
new file mode 100644
index 000000000..b51210332
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D54D8/map.bin
@@ -0,0 +1,2 @@
+
+'VTPTQ/eUXYE2222]2g22`2a22�2�2�2�2
2�2�2�22�2�2�2�2
2��2�2�2�2�2�2
�B��B2�2�2�2�2
2

2
2
2
2
2
2
2
2
2
2
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D6144/border.bin b/data/layouts/UnusedLayout_82D6144/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D6144/border.bin
diff --git a/data/layouts/UnusedLayout_82D6144/map.bin b/data/layouts/UnusedLayout_82D6144/map.bin
new file mode 100644
index 000000000..cc0294a80
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D6144/map.bin
@@ -0,0 +1 @@
+�����������������3�2�2�2�2�x2p2p2p2p2�������2h2h2h2x2p2p2p2p2p2y2h2h2h23�2h2h2h2h2h2h2h2h2h2�2g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D6490/border.bin b/data/layouts/UnusedLayout_82D6490/border.bin
new file mode 100644
index 000000000..efef023e6
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D6490/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D6490/map.bin b/data/layouts/UnusedLayout_82D6490/map.bin
new file mode 100644
index 000000000..f84061f08
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D6490/map.bin
@@ -0,0 +1 @@
+����������������������������2�2�2�2����2���2�2�2�2�2�2�2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2	3	3�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D6654/border.bin b/data/layouts/UnusedLayout_82D6654/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D6654/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D6654/map.bin b/data/layouts/UnusedLayout_82D6654/map.bin
new file mode 100644
index 000000000..7865fdc7c
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D6654/map.bin
@@ -0,0 +1 @@
+���������������������3�3�3�3�3�7�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3���3�3�3�3�7�3�3�3���3�3�3�3�3�3�3�3�3�3�3�3�3�3�7�3�3�3�3�3�3�3�3�3�7�3�3�3���3�3�3�7
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D672C/border.bin b/data/layouts/UnusedLayout_82D672C/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D672C/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D672C/map.bin b/data/layouts/UnusedLayout_82D672C/map.bin
new file mode 100644
index 000000000..617346322
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D672C/map.bin
@@ -0,0 +1 @@
+��������������������3�3�3�3�3�3�3�3�3�3�7�3�3�3�3�3�3�3�3�3�7�3�3�3���3�3�3�3�3�3�3�3���3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�7�3�3�3���3�3�3�7
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D6C34/border.bin b/data/layouts/UnusedLayout_82D6C34/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D6C34/border.bin
diff --git a/data/layouts/UnusedLayout_82D6C34/map.bin b/data/layouts/UnusedLayout_82D6C34/map.bin
new file mode 100644
index 000000000..35968a7fd
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D6C34/map.bin
diff --git a/data/layouts/UnusedLayout_82D75F0/border.bin b/data/layouts/UnusedLayout_82D75F0/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D75F0/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D75F0/map.bin b/data/layouts/UnusedLayout_82D75F0/map.bin
new file mode 100644
index 000000000..5515d00cf
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D75F0/map.bin
@@ -0,0 +1 @@
+yzfg8898x88��no@@A@�VW�3�3v3w3+3+3+3+3�3^3_3+3{3|3|3}3,3,3,3,3,3,3+3�3>2>2�3,3,3,3j7k7E3+3�3>2>2�3,3,3D3r7s7E3+3�3�3�3�3,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D7674/border.bin b/data/layouts/UnusedLayout_82D7674/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D7674/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D7674/map.bin b/data/layouts/UnusedLayout_82D7674/map.bin
new file mode 100644
index 000000000..5a3ac8cb6
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D7674/map.bin
@@ -0,0 +1 @@
+�����������������3�3�3���3�3�3�3�3�3���3�3�3�3�3�3�3�3�3�3�3�7�3�3���3�3�7
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D7CC8/border.bin b/data/layouts/UnusedLayout_82D7CC8/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D7CC8/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D7CC8/map.bin b/data/layouts/UnusedLayout_82D7CC8/map.bin
new file mode 100644
index 000000000..3fbcd6043
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D7CC8/map.bin
@@ -0,0 +1 @@
+����������������3�7�7���3�3�3�3�3�3���3�3�3�3�3�3�3�3�3�3�3�7�3�3���3�3�7
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D88C8/border.bin b/data/layouts/UnusedLayout_82D88C8/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D88C8/border.bin
diff --git a/data/layouts/UnusedLayout_82D88C8/map.bin b/data/layouts/UnusedLayout_82D88C8/map.bin
new file mode 100644
index 000000000..35c1badac
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D88C8/map.bin
@@ -0,0 +1 @@
+������������]����������������������x2p2p2p2p2p2��2�2�2�2�e2x2p2p2p2p2�2h2h2h2h2h2�������2h2�2h2h2�2\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h2�2d6h2h2h2h2ababh2h2h2h2h2h2h2











�2h2h2h2�2�2











\2h2h2h2��











dh2h2h2�x2











�2h2h2h2��2











�2h2h2h2��2











�2h2h2h2��











\2h2h2h2q2�2











d6h2h2t6
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D9B24/border.bin b/data/layouts/UnusedLayout_82D9B24/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D9B24/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82D9B24/map.bin b/data/layouts/UnusedLayout_82D9B24/map.bin
new file mode 100644
index 000000000..d5e7fd825
--- /dev/null
+++ b/data/layouts/UnusedLayout_82D9B24/map.bin
diff --git a/data/layouts/UnusedLayout_82DA7C8/border.bin b/data/layouts/UnusedLayout_82DA7C8/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DA7C8/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DA7C8/map.bin b/data/layouts/UnusedLayout_82DA7C8/map.bin
new file mode 100644
index 000000000..0074b6e55
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DA7C8/map.bin
diff --git a/data/layouts/UnusedLayout_82DB46C/border.bin b/data/layouts/UnusedLayout_82DB46C/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DB46C/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DB46C/map.bin b/data/layouts/UnusedLayout_82DB46C/map.bin
new file mode 100644
index 000000000..540798144
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DB46C/map.bin
diff --git a/data/layouts/UnusedLayout_82DB4F0/border.bin b/data/layouts/UnusedLayout_82DB4F0/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DB4F0/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DB4F0/map.bin b/data/layouts/UnusedLayout_82DB4F0/map.bin
new file mode 100644
index 000000000..6ca8b4e61
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DB4F0/map.bin
@@ -0,0 +1 @@
+������������������3�3���3�3����������3�3�3�3�3�3�3�3�7�3�3���3�3�7
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DBBE0/border.bin b/data/layouts/UnusedLayout_82DBBE0/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DBBE0/border.bin
@@ -0,0 +1 @@
+p
p
p
p

\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DBBE0/map.bin b/data/layouts/UnusedLayout_82DBBE0/map.bin
new file mode 100644
index 000000000..6e9f6adb6
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DBBE0/map.bin
@@ -0,0 +1 @@
+pppppppr�IJJxyz{bJJ`�tp1pppppppppppr���IJJxyz{bJJ`���tppppppppr��k�0rIJJxyz{bJJ`s�0m�tpppppr��k�s
0jIJJxyz{bJJ`k
0�0m�tpppxsq�sk�0
0HIJJxyz{bJJ`a
2
2um�tpp�sk�ssHIJJxyz{bJJ`auuqutp�ssqss
0HIJJKLMNOJJ`a
2uuquuy�ssqss
0
0PQRRSTUVWRRhi
2
2uuquuy�ssk�s
0X2Y2Z2Z2[\]^_Z2Z2p2q2
2uuquu��sssqs
0
0
0w2o2
2c2d2e2f2g2
2
2
2
2
2
2uuquu��sssqs
0
0w2o2l2m2n2
2
2
2
2uut}u��sssqs
0
0
0
0
0
0
0t2u2v2
0
0
0
0
0
0t}uuqu��sssq{�
0
0
0
0
0|2}2~2
0
0
0
0
0ut}ut}��ss{�qs
0
0
0
0
0
0
0
0
0
0
0
0
0t}uquu���s{�sq{�
0
0
0
0
0
0
0
0
0ut}t}u�p�{�s{|�{�
0
0
0
0
0t}uququ�p��s{�qsq{||||�0�0�0||||}t}ququ�pp�{�{�{||�����0�0�0�����}qququ�pp��sqsqqqqt���0�0�0���qqqt|}t}�ppp�sq{||||}q]^0^0^0_q{|||}qqu��ppp�{|������|]^0^0^0_|�����||}�pppp����������]^0^0^0_����������pppppppppppppp]^0^0^0^0V0V0V0V0V0V0Wppppppppppppppppp]^0^0^0^0^0^0^0^0^0^0_�pppppppppppppppp��������2�2����pppppppppppppppp�������������pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DBDD8/border.bin b/data/layouts/UnusedLayout_82DBDD8/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DBDD8/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DBDD8/map.bin b/data/layouts/UnusedLayout_82DBDD8/map.bin
new file mode 100644
index 000000000..f8cf1725d
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DBDD8/map.bin
@@ -0,0 +1 @@
+
�����������������
�����������������
�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�26
�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
�2�2011111111112�2�2�2
�2�2011111111112�2�2�2
�2�2011111111112�2�2�2
�2�2011111111112�2�2�2
�2�2%#$"#$"#$"#&�2�2�2
�2�2-+6{*+6{*+6{*+6��2�2�2
�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2

















\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DBFB8/border.bin b/data/layouts/UnusedLayout_82DBFB8/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DBFB8/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DBFB8/map.bin b/data/layouts/UnusedLayout_82DBFB8/map.bin
new file mode 100644
index 000000000..059ce30fe
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DBFB8/map.bin
@@ -0,0 +1 @@
+�������������������������������2��22��2���2222
2���2
2���2
2����2
2
2
22
2�2�2�2
2�2�2�2
2�2�2�2�2
2
2
22�2�2�2�2�2�2
2�2�2
2�2�2�2
2
2
22�������2���2����2
2
22�������2���2����2
2
22�2�2�2�2�2�2�2�2�2�2�2�2�2�2
2
22
2
2
2
2
2
2
2
2
2
2
2
2
2
2�2�22�2�2�2�2�2�2
2�2�2
2�2�2
2
2��2�������2���2���2
2�6�6�������2�2�2�2�2�2�2
2��
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DC4EC/border.bin b/data/layouts/UnusedLayout_82DC4EC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DC4EC/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DC4EC/map.bin b/data/layouts/UnusedLayout_82DC4EC/map.bin
new file mode 100644
index 000000000..6103ad0c2
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DC4EC/map.bin
@@ -0,0 +1 @@
+6@k�c�mE

@k�c�mE

@k�c�''

@k�c�mE7>Hs���uM

Hs���uM

Hs���//

//���uM?>PQ:2;2;2TU

PQ:2;2;2TU

PQ:2;2;2;2;2

��;2;2;2TU?>XY=28282\]

XY=28282\]

XY=282828282

��828282\]?>:;2<28282;2;2

:;2<28282;2;2

:2;2<282828282

w682828282;2;2?>=2828282828282

w68282VW8282

=282`2VWa282

=28282828282a2?>=2828282VW82

=282`2^_a282

=282`2^_a282

=282828282VW?>=28282`2^_b

=2828282828282

=2828282b8282

=2828282`2^_?



































6@klvlmE

lvllCDE

@lvlvmE

@kv'vmE7>Hst~tuM

t~ttKij

/t~t~uM

Hs~/~//?>PQ:2;2;2TU

:2;2;2;2;2qr

�6�6;2;2;2TU

PQ:2;2;2;2|2?>XY=28282\]

=2VW8282yz

��828282\]

XY=2VppW?>:;2<28282;2|2

=2^_a282;256

=282828282;2;2

h;2<2^xx_?>=2828282828282

=2828282828282

=2828282828282

=28282`2828282?>=2828282828282

=2828282828282

=2828282828282

=2828282828282?>=28282de8282

=28282de8282

=28282de8282

=28282de8282?




































\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DC60C/border.bin b/data/layouts/UnusedLayout_82DC60C/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DC60C/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DC60C/map.bin b/data/layouts/UnusedLayout_82DC60C/map.bin
new file mode 100644
index 000000000..0f6829f9c
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DC60C/map.bin
diff --git a/data/layouts/UnusedLayout_82DC72C/border.bin b/data/layouts/UnusedLayout_82DC72C/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DC72C/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DC72C/map.bin b/data/layouts/UnusedLayout_82DC72C/map.bin
new file mode 100644
index 000000000..9f3750fb4
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DC72C/map.bin
diff --git a/data/layouts/UnusedLayout_82DC84C/border.bin b/data/layouts/UnusedLayout_82DC84C/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DC84C/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DC84C/map.bin b/data/layouts/UnusedLayout_82DC84C/map.bin
new file mode 100644
index 000000000..2112fe799
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DC84C/map.bin
diff --git a/data/layouts/UnusedLayout_82DCA70/border.bin b/data/layouts/UnusedLayout_82DCA70/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCA70/border.bin
diff --git a/data/layouts/UnusedLayout_82DCA70/map.bin b/data/layouts/UnusedLayout_82DCA70/map.bin
new file mode 100644
index 000000000..1df9e4804
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCA70/map.bin
@@ -0,0 +1 @@
+���������������������������������2�2�2������2�2�2����2�2�2�2������2�2�2�2���2�2�2�2�2����2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�




�6�2�2�2�6





\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCB44/border.bin b/data/layouts/UnusedLayout_82DCB44/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCB44/border.bin
diff --git a/data/layouts/UnusedLayout_82DCB44/map.bin b/data/layouts/UnusedLayout_82DCB44/map.bin
new file mode 100644
index 000000000..bad63f412
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCB44/map.bin
@@ -0,0 +1,2 @@
+��0no��
+2
hvw�2�2$2$2$2$2$282p2~2292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#292#2#2#2#2#2#2#2#2"2"292#2#2	#2#2#2#2**
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCC40/border.bin b/data/layouts/UnusedLayout_82DCC40/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCC40/border.bin
diff --git a/data/layouts/UnusedLayout_82DCC40/map.bin b/data/layouts/UnusedLayout_82DCC40/map.bin
new file mode 100644
index 000000000..399d05705
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCC40/map.bin
@@ -0,0 +1,2 @@
+�

+





��6$2$2$2$2$2$2$2$2$2$2�692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#2#2#2#2�2#2#2#2#2#2#2#2#2#2#2"2�#2#2#2#2#2#2#2#2#2#2*
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCCD4/border.bin b/data/layouts/UnusedLayout_82DCCD4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCCD4/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCCD4/map.bin b/data/layouts/UnusedLayout_82DCCD4/map.bin
new file mode 100644
index 000000000..43f11b194
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCCD4/map.bin
@@ -0,0 +1 @@
+�������0��������2�3�3�3�3�3�3�2�3�3�2�7�7�2�3�3�3�3�2�7�7�2�3�3�3�3�3�3�3�3�3�3�3�3�3	�3�3�3
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCD68/border.bin b/data/layouts/UnusedLayout_82DCD68/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCD68/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCD68/map.bin b/data/layouts/UnusedLayout_82DCD68/map.bin
new file mode 100644
index 000000000..632e1e36a
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCD68/map.bin
@@ -0,0 +1 @@
+���������vw������6�2�2�2�3�3�3�6�3�3�3�2�7�7�2�3�3�3�3�3�7�7�2�3�3�3�3�3�3�3�3�3�3�3�3	�3�3�3
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCDFC/border.bin b/data/layouts/UnusedLayout_82DCDFC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCDFC/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCDFC/map.bin b/data/layouts/UnusedLayout_82DCDFC/map.bin
new file mode 100644
index 000000000..8bbd6c517
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCDFC/map.bin
@@ -0,0 +1 @@
+�����������������6�2�2�3�3�3�2�2�3�3�3�3�3�3�3�3�7�7�2�3�3�3�3�3�7�7�3�3�3�3�3�3�3�3�3	�3�3�3
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCF00/border.bin b/data/layouts/UnusedLayout_82DCF00/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCF00/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DCF00/map.bin b/data/layouts/UnusedLayout_82DCF00/map.bin
new file mode 100644
index 000000000..017298e71
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DCF00/map.bin
@@ -0,0 +1 @@
+8()*:888:8x88:H02B@@@B@�VWBP3+3+3+3+3+3+3+3+3+3�3^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,3�3�2H6I6�2�3+3p7q7E3,3,3,3,3�3>2P6Q6�2�3F3G3,3,3,3,3,3,3�3�3�3�3�3�3N7O7,3,3,3,3LM,3,3,3,3,3,3
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DD004/border.bin b/data/layouts/UnusedLayout_82DD004/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DD004/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DD004/map.bin b/data/layouts/UnusedLayout_82DD004/map.bin
new file mode 100644
index 000000000..17a611343
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DD004/map.bin
@@ -0,0 +1 @@
+8()*:888:8888:@02B@@@BT7UIB+3+3+3+3+3+3+3+3+3\3?3]3Q3+3+3,3,3,3,3,3,3,3{3|3|3|3}3,3+3D3~77�7E3,3,3�3>2>2>2�3,3+3,3�7�7�7E3,3,3�3>2>2>2�3,3+3G3G3,3,3,3,3,3�3�3�3�3�3,3+3O7O7,3,3,3,3,3,3,3,3,3,3,3
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_82DD0DC/border.bin b/data/layouts/UnusedLayout_82DD0DC/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DD0DC/border.bin
diff --git a/data/layouts/UnusedLayout_82DD0DC/map.bin b/data/layouts/UnusedLayout_82DD0DC/map.bin
new file mode 100644
index 000000000..c57c99c7b
--- /dev/null
+++ b/data/layouts/UnusedLayout_82DD0DC/map.bin
@@ -0,0 +1 @@
+



























$2$2$2$2$2$2$2$2$2$292#242�6�6<2#2#2#2#292#242�6�6<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2	#2#2#2#2#2
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_833614C/border.bin b/data/layouts/UnusedLayout_833614C/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/UnusedLayout_833614C/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_833614C/map.bin b/data/layouts/UnusedLayout_833614C/map.bin
new file mode 100644
index 000000000..a4b5b8b85
--- /dev/null
+++ b/data/layouts/UnusedLayout_833614C/map.bin
@@ -0,0 +1 @@
++++++
+++++++++++++++


.1-

++++++++++++11111111++++++++++++11111111-


+++++++
.111111111111+++++++11111111111111-


+++111111111111111111+++111111111111111111+++111111111111111111-
+&1111111111111111111+&1111111111111++++

.1111111111111+

.111111111111111%+11111111111111%++11111111111%++++++&111111111+++++++++11111111%+++++++++111111%++++++++++&1111++++++++++++++1111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_83377F0/border.bin b/data/layouts/UnusedLayout_83377F0/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/UnusedLayout_83377F0/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_83377F0/map.bin b/data/layouts/UnusedLayout_83377F0/map.bin
new file mode 100644
index 000000000..5bc807eea
--- /dev/null
+++ b/data/layouts/UnusedLayout_83377F0/map.bin
@@ -0,0 +1 @@
++++++++++++++++++++++++++++









+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++












++++++++++++++++++++++++++++++++++++1111111111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111111111111+++++++++++++++++++++++++++++++++

.1111111111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

.1111111111111+++++++++++++++++++++++++++++++++1111111111111-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111111111111111-
+++++++++++++++++++++++++++++++111111111111111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++111111111111111111++++++++++++++++++++++++++++++.111�����1111111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.111�����1111111111++++++++++++++++++++++++++++++11���qqq����1111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++11���qqq�������1111++++++++++++++++++++++++++++++���qqqqqqqq��111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++���qqqqqqqqqqq��111++++++++++++++++++++++++++++++�qqqqqqqqqqq�111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++�qqqqqqqqqqqqqq�111++++++++++++++++++++++++++++++�qqqqqqqqqq��11%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++�qqqqqqqqqqqqq��11%++++++++++++++++++++++++++++++��qqqqqqq�y�111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++��qqqqqqqqqq�y�111+++++++++++++++++++++++++++++++&�qqqqq�y�1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++&�qqqqq�yyyy�1111%++++++++++++++++++++++++++++++++�yy�q��1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++�yy�q��1111111%+++++++++++++++++++++++++++++++++&�y�111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++&�y�111111%++++++++++++++++++++++++++++++++++++++1111%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_8338354/border.bin b/data/layouts/UnusedLayout_8338354/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/UnusedLayout_8338354/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_8338354/map.bin b/data/layouts/UnusedLayout_8338354/map.bin
new file mode 100644
index 000000000..667f4a779
--- /dev/null
+++ b/data/layouts/UnusedLayout_8338354/map.bin
@@ -0,0 +1 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++



++++++++++++


.1111++++++++++++11111111-
++++++++++1111111111+++++++

.1111111111+++++++1111111111111-
+++++111111111111111++++.111�����1111111++++11���qqq����1111++++���qqqqqqqq��111++++�qqqqqqqqqqq�111++++�qqqqqqqqqqq�111++++�qqqqqqqqqqq�111++++�qqqqqqqqqq��1%++++��qqqqqqq�y�11++++&�qqqqq�y�1111+++++�yy�q��1111%+++++&�y�111%++++++++++1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_8338738/border.bin b/data/layouts/UnusedLayout_8338738/border.bin
new file mode 100644
index 000000000..d9994d6cd
--- /dev/null
+++ b/data/layouts/UnusedLayout_8338738/border.bin
@@ -0,0 +1 @@
++
+
+
+

\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_8338738/map.bin b/data/layouts/UnusedLayout_8338738/map.bin
new file mode 100644
index 000000000..ce93426c5
--- /dev/null
+++ b/data/layouts/UnusedLayout_8338738/map.bin
@@ -0,0 +1 @@
++++++++++++++++++++++++++,21313131313141)++++++++,213131hiiiiij313141)+++++,hiiqqqqqqqiij)++++,21pqqq�yyy�qqqr3131)++,hqq�yz	000xy�qij	0*++,pq�z	0	0	00000pqqr	0*++,pqr00	0hij00x�qqj*++,pqr000pqr000pqqr*++,pqr00	0xyz0	00pqqr*++,pqqj0	0	00	00	00pq�z*++,x�qr0	0	00	0	00hqqr"1++0$x�qij0	0000pq�z*++++0$xy�r00	0	0hq�z"1+++++0#$xz	0	000xyz"1++++++++0#########1++++
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_8338B4C/border.bin b/data/layouts/UnusedLayout_8338B4C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_8338B4C/border.bin
diff --git a/data/layouts/UnusedLayout_8338B4C/map.bin b/data/layouts/UnusedLayout_8338B4C/map.bin
new file mode 100644
index 000000000..b9381326f
--- /dev/null
+++ b/data/layouts/UnusedLayout_8338B4C/map.bin
@@ -0,0 +1 @@
+=>9{|}PQ9=>EF�~1wX��EFM1N1�11111�1�1M1N1V1	1	1	1	1	1	1	1	1	1	1^	1	1	1o1efg1	1	1	11	1	1	1o1mng1	1	1	1V1	1	1	1	1	1	1	1	1	1	1^	1	1?1G1O1	1	1	1	1	1
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_8338E90/border.bin b/data/layouts/UnusedLayout_8338E90/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_8338E90/border.bin
diff --git a/data/layouts/UnusedLayout_8338E90/map.bin b/data/layouts/UnusedLayout_8338E90/map.bin
new file mode 100644
index 000000000..a5391187c
--- /dev/null
+++ b/data/layouts/UnusedLayout_8338E90/map.bin
@@ -0,0 +1 @@
+�������������������������������2�2�2�2�2�2�2�2�2�2������2���2�2�2�2�2�2�2��2�2�2�2�2���2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2���2�2�2�2�2�2�2��2�2�2�2�2���2�2�2�2�2�2�2������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_833902C/border.bin b/data/layouts/UnusedLayout_833902C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_833902C/border.bin
diff --git a/data/layouts/UnusedLayout_833902C/map.bin b/data/layouts/UnusedLayout_833902C/map.bin
new file mode 100644
index 000000000..4573c1444
--- /dev/null
+++ b/data/layouts/UnusedLayout_833902C/map.bin
@@ -0,0 +1 @@
+�������������������������������������2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2���2�2�2�2�2�2�2�2�2�2�2��2�2�2���2�2�����������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2��2�2�2�2�2���2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_833B6EC/border.bin b/data/layouts/UnusedLayout_833B6EC/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/UnusedLayout_833B6EC/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_833B6EC/map.bin b/data/layouts/UnusedLayout_833B6EC/map.bin
new file mode 100644
index 000000000..d1385e8cb
--- /dev/null
+++ b/data/layouts/UnusedLayout_833B6EC/map.bin
@@ -0,0 +1,3 @@
+��������������������������������������������������������'''�����������������������������������///����������������������B�B�B�B�B�B�B�B�B�����///������2�2�2�2�2��2�2���������B�B�B�B�B�B�B�B�B�����777������2�2�2�2�2�2��2���������B�B�B�B�B�B�B�B�B�� !!&
%"��2�2�2�2�2�2�2�2���������B�B�B�B�B�B�B�B�B��#




$��2�2�2�2�2�2�2�2���������B�B�B�B�B�B�B�B�B��C	C	C	C	C	C
+C
$������������������B�B�B�B�B�������B�B�B�B�B�B�B�()��B�B�B�B�B�B�B�B���������B�B�B�B�B��2�2�2�2��B�B�B�B�B���*,��B�B�B�B�B�B�B�B���������B�B�B�B�B��2�2�2�2��B�B�B���2�2�*,��B���B�B�B�B�B���������B�B�B�B�BWC�B�B�B�BXC�B�B�B� ###1,���2�2��B�B�B�B���������B��B�B�B�B�B�B�B�B�B�B�B�B�*++++0###!��B�B�B�B���������B���B��B�B�����B�B�B�*::::::::,��B�B�B�B���������B�B�B�B�B�B�B��2�2��B�B�BWC	C	C	C	C
+C�::�CXC�B�B�B�B�����������������2�2��B�B�B�B�B�B�B�B�B3,3,32�B�B�B��B�B��������2�2�2�2�2�2�2�2��2�2��B�B�B�B�B�B�B�B�B3-3-32�B�B�B�B�B�B�����U��2�2�2�2��2�2�2�2�2�2����������5-3'4��������������2�2�2�2��2�2�2�2�2��2�2�2�2�2�2�2�2��7'-6���2�2�2�2�2���U���2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��3./���2�2�2�2�2�����U�������������������V�3012�U������V��U�U������������V�������3./���������V�B�FU���U����V�����V��B�BU��3012����V������B��B�BU��������V���B�B�B���B�BU����V�����B��B�B�
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_833BE30/border.bin b/data/layouts/UnusedLayout_833BE30/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/UnusedLayout_833BE30/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_833BE30/map.bin b/data/layouts/UnusedLayout_833BE30/map.bin
new file mode 100644
index 000000000..13a635e49
--- /dev/null
+++ b/data/layouts/UnusedLayout_833BE30/map.bin
@@ -0,0 +1,3 @@
+����������������������������������������� #!��B�B�B�B�B�B�B�B� ##!��B�B�B�B�B�B�B�B�B�B�B�B�B�������*+,��B�B�B�B�B�B�B�B�*++,��B�B�B�B�B�B�B�B�B��B�B�B�������*+,��B�B�B���B�B�B�*++,��B�B�B�B�B�B�B�B�B�B���B�������*+,�����2�2����*++,��B�B�B�B�B�B�B�B�B�B�B��B�������*+0##########1++,��B�B�B�B�B�B�B�B���B�B�B�������*+++++++++++++++,��B�B�������2�2����������*++++++�C	C	C	C	C	C	C	C	CXC�B�B� #########!������*+++++,��B�B����B�B�B�B�B�B�B�*+++++++++,������*+++++,��B�B�B�B�B�B�B�B�B�B�B�B�*+++++++++,������*+++++,��B�B�B�B�B�B�B�B�B�B�B�B�*+++++++++,��V���*+++++,��B���B�B�B�B�B�B����*+++++++++,���U��*+++++,���2�2�����B�B� ##1+++++++++,������*+++++0######!��B�B�*++++++++++++,������*++++++++++++,��B�B�*++++++++++++,�V��U�*++++++++++++,��B�B�*++++++++++++,������*++++++++++++,��B�B�*++++++++++++,�����U�++�C	C	C	C	C	CXC�B�BWC	C
+C�++++++++++,�����������*+��B�B�B��B�B�B�B�B�B�B�BWC
+C�++++++++,�������������B�B�B�B�B�B�B�B�B�B�B�B�B�B�V������������B�B�B�B�B�B�B�B�B�B�B�B�B�B��������������������������������������������������U���V����������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_83453C0/border.bin b/data/layouts/UnusedLayout_83453C0/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/UnusedLayout_83453C0/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_83453C0/map.bin b/data/layouts/UnusedLayout_83453C0/map.bin
new file mode 100644
index 000000000..ffc668ba5
--- /dev/null
+++ b/data/layouts/UnusedLayout_83453C0/map.bin
@@ -0,0 +1 @@
+�������������������������������������������������2�2�2�2�2�2�2 ��������2����������������2���2��2�2�������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2 ������2�2�2������������2������2��2 ��������������������������2��2�2�2���������������������������������
\ No newline at end of file
diff --git a/data/layouts/UnusedLayout_834BC2C/border.bin b/data/layouts/UnusedLayout_834BC2C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834BC2C/border.bin
diff --git a/data/layouts/UnusedLayout_834BC2C/map.bin b/data/layouts/UnusedLayout_834BC2C/map.bin
new file mode 100644
index 000000000..891ae066e
--- /dev/null
+++ b/data/layouts/UnusedLayout_834BC2C/map.bin
diff --git a/data/layouts/UnusedLayout_834BEB4/border.bin b/data/layouts/UnusedLayout_834BEB4/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834BEB4/border.bin
diff --git a/data/layouts/UnusedLayout_834BEB4/map.bin b/data/layouts/UnusedLayout_834BEB4/map.bin
new file mode 100644
index 000000000..ab44abb18
--- /dev/null
+++ b/data/layouts/UnusedLayout_834BEB4/map.bin
diff --git a/data/layouts/UnusedLayout_834C13C/border.bin b/data/layouts/UnusedLayout_834C13C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834C13C/border.bin
diff --git a/data/layouts/UnusedLayout_834C13C/map.bin b/data/layouts/UnusedLayout_834C13C/map.bin
new file mode 100644
index 000000000..514cb7239
--- /dev/null
+++ b/data/layouts/UnusedLayout_834C13C/map.bin
diff --git a/data/layouts/UnusedLayout_834C3C4/border.bin b/data/layouts/UnusedLayout_834C3C4/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834C3C4/border.bin
diff --git a/data/layouts/UnusedLayout_834C3C4/map.bin b/data/layouts/UnusedLayout_834C3C4/map.bin
new file mode 100644
index 000000000..d9a50b7a1
--- /dev/null
+++ b/data/layouts/UnusedLayout_834C3C4/map.bin
diff --git a/data/layouts/UnusedLayout_834C64C/border.bin b/data/layouts/UnusedLayout_834C64C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834C64C/border.bin
diff --git a/data/layouts/UnusedLayout_834C64C/map.bin b/data/layouts/UnusedLayout_834C64C/map.bin
new file mode 100644
index 000000000..37b4aba85
--- /dev/null
+++ b/data/layouts/UnusedLayout_834C64C/map.bin
diff --git a/data/layouts/UnusedLayout_834C8D4/border.bin b/data/layouts/UnusedLayout_834C8D4/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834C8D4/border.bin
diff --git a/data/layouts/UnusedLayout_834C8D4/map.bin b/data/layouts/UnusedLayout_834C8D4/map.bin
new file mode 100644
index 000000000..2df5cd891
--- /dev/null
+++ b/data/layouts/UnusedLayout_834C8D4/map.bin
diff --git a/data/layouts/UnusedLayout_834CB5C/border.bin b/data/layouts/UnusedLayout_834CB5C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834CB5C/border.bin
diff --git a/data/layouts/UnusedLayout_834CB5C/map.bin b/data/layouts/UnusedLayout_834CB5C/map.bin
new file mode 100644
index 000000000..e977b7e26
--- /dev/null
+++ b/data/layouts/UnusedLayout_834CB5C/map.bin
diff --git a/data/layouts/UnusedLayout_834CDE4/border.bin b/data/layouts/UnusedLayout_834CDE4/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834CDE4/border.bin
diff --git a/data/layouts/UnusedLayout_834CDE4/map.bin b/data/layouts/UnusedLayout_834CDE4/map.bin
new file mode 100644
index 000000000..e358d2f3d
--- /dev/null
+++ b/data/layouts/UnusedLayout_834CDE4/map.bin
diff --git a/data/layouts/UnusedLayout_834D06C/border.bin b/data/layouts/UnusedLayout_834D06C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834D06C/border.bin
diff --git a/data/layouts/UnusedLayout_834D06C/map.bin b/data/layouts/UnusedLayout_834D06C/map.bin
new file mode 100644
index 000000000..3e3ebcc94
--- /dev/null
+++ b/data/layouts/UnusedLayout_834D06C/map.bin
diff --git a/data/layouts/UnusedLayout_834D2F4/border.bin b/data/layouts/UnusedLayout_834D2F4/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834D2F4/border.bin
diff --git a/data/layouts/UnusedLayout_834D2F4/map.bin b/data/layouts/UnusedLayout_834D2F4/map.bin
new file mode 100644
index 000000000..cfc96995c
--- /dev/null
+++ b/data/layouts/UnusedLayout_834D2F4/map.bin
diff --git a/data/layouts/UnusedLayout_834D57C/border.bin b/data/layouts/UnusedLayout_834D57C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834D57C/border.bin
diff --git a/data/layouts/UnusedLayout_834D57C/map.bin b/data/layouts/UnusedLayout_834D57C/map.bin
new file mode 100644
index 000000000..da9cc3f75
--- /dev/null
+++ b/data/layouts/UnusedLayout_834D57C/map.bin
diff --git a/data/layouts/UnusedLayout_834D804/border.bin b/data/layouts/UnusedLayout_834D804/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834D804/border.bin
diff --git a/data/layouts/UnusedLayout_834D804/map.bin b/data/layouts/UnusedLayout_834D804/map.bin
new file mode 100644
index 000000000..cf5e1e94e
--- /dev/null
+++ b/data/layouts/UnusedLayout_834D804/map.bin
diff --git a/data/layouts/UnusedLayout_834DA8C/border.bin b/data/layouts/UnusedLayout_834DA8C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834DA8C/border.bin
diff --git a/data/layouts/UnusedLayout_834DA8C/map.bin b/data/layouts/UnusedLayout_834DA8C/map.bin
new file mode 100644
index 000000000..1f10bfff1
--- /dev/null
+++ b/data/layouts/UnusedLayout_834DA8C/map.bin
diff --git a/data/layouts/UnusedLayout_834DD14/border.bin b/data/layouts/UnusedLayout_834DD14/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834DD14/border.bin
diff --git a/data/layouts/UnusedLayout_834DD14/map.bin b/data/layouts/UnusedLayout_834DD14/map.bin
new file mode 100644
index 000000000..fe3d6f908
--- /dev/null
+++ b/data/layouts/UnusedLayout_834DD14/map.bin
diff --git a/data/layouts/UnusedLayout_834DF9C/border.bin b/data/layouts/UnusedLayout_834DF9C/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834DF9C/border.bin
diff --git a/data/layouts/UnusedLayout_834DF9C/map.bin b/data/layouts/UnusedLayout_834DF9C/map.bin
new file mode 100644
index 000000000..241077797
--- /dev/null
+++ b/data/layouts/UnusedLayout_834DF9C/map.bin
diff --git a/data/layouts/UnusedLayout_834E224/border.bin b/data/layouts/UnusedLayout_834E224/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/UnusedLayout_834E224/border.bin
diff --git a/data/layouts/UnusedLayout_834E224/map.bin b/data/layouts/UnusedLayout_834E224/map.bin
new file mode 100644
index 000000000..bb5ccf05c
--- /dev/null
+++ b/data/layouts/UnusedLayout_834E224/map.bin
diff --git a/data/layouts/VermilionCity/border.bin b/data/layouts/VermilionCity/border.bin
new file mode 100644
index 000000000..730aab996
--- /dev/null
+++ b/data/layouts/VermilionCity/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/VermilionCity/map.bin b/data/layouts/VermilionCity/map.bin
new file mode 100644
index 000000000..1c90e0240
--- /dev/null
+++ b/data/layouts/VermilionCity/map.bin
@@ -0,0 +1,2 @@
+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,�0	00��
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,�000��
�
�
�
�
+��+++�����++,�0	00��
�
�
+�������HIJK�����000������
�
�
++(�����PQRS�����0	00������
++��++,�����XYZ[�����0	00�����&%$%$%$%$%$%�
++��++,�����`ab������000�����������������
++++,�10�2�2�20
00
00
00
000	000
00
00
0
00
00
00
0
00
0��
++++,�1�1�1�1�1�1�10
00
00
000000
00
00
0
0�0�0�0�0�0�0�00
0��
��++++,111111�1�1�1�1�1�1
000	00�0�0�0�00
00�0�0�0�0�0�0�00
0��
��++++0#####!11111�1�10
00
0�0�0�0�00
00�0�01�01�0�00
0��
++++++++++,111111�1�1�10
0�0�0�0�00
00�0�0�00�0�0�00
0��
++++++++++0#####!11�10
0�0�0�0�00
00�0�0�0�0�0�0�00
0��
++++++++++++++++,11�10
00
00
00
00�0�0�0�0�0�0�00
0��
++++++++�����++���2�2�10
00
0(0)0*0+0
0�0�0�0�0�0�0�00
0��
+��+++(�2�2�2������2�2�����10
00
00123
00
00
000
00
0�&%$%$%�
+��+++,111�����11�����10
00
089:;
00
00
00
0
00
0
00
00
0�
�
+��++,11������11�����10
00
0@Abc=>>>>>>>>?�����
�
+��++,111�10�2�2�2�1�1�10�2�2
00
00
00
00
00
00
00
00
00
00
00
00
0�
�
+++,1�1�1�10
000
00
00
00
00
00
00
00
00
000
00
00
00
00
00
00
0�
�
+++,1�100
00
00
00
00
00
00
00
00
00
0
0000�1�1�10
00
00
00
00
0�
�
+++,1�1091:1:1:1:1:1;1
00�1�1�1�1�10
0�2�2�2�2"#$0�2�2�20"########�
�
+++,1�10ABBBBBC
0�1�1111�1�1
0����*+,0�2�2�20*++++++++�
�
+��++,1�1`1IJJJJJK
0�1 ##!1�1
0����*+,&3�2�2�2'3*++++++++�
�
+��++,��hPQRSTUV��1*++,1�1�1����*+,0�1�1�1
0*(��������
�
+��++,1�10X1Y1Z[\]1^10�1*++,111�1�1�2�2*+0#�1�1�1#1,pqqqqqr�
++��++,1�1�1�1�1�10	00	00�1*++0#######1+++�1�1�1++,pqqqqqr�
++++,11111�1�1�1�1�1�1�1*++++++++++++++�1�1�1++,pqqqqqr�
++++,111111111111*+�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1++,x|||||z�
++++0############1+�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1++0	#####�
+++++++++++++++++++�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1+++++�
�
�
�
+++++++++++++++++++�1�1�1�������������++++�
�
�
�
�
�
++++++++++++++++���1�1�1��+++++++++++++++�
�
�
�
�
�
+++��+++++++++++++��3	3
+3��+++++++++++++�
�
�
�
�
�
�
++��+++++++++�����2�2�2����+++++++�
�
�
�
�
�
�
�
++��++++++���������++��+++++��++�
�
�
�
�
�
�
�
�
+����+++++++++,���*++++++++++++��+�
�
�
�
�
�
�
�
�
�
+++��+++�
�
�
+,�*+�
�
�
�
�
+��++�
�
�
�
�
�
�
�
�
�
�
�
�
+++�
�
�
�
�
�
,�*�
�
�
�
�
�
�
�
+��+�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
,�*�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/VermilionCity_Gym/border.bin b/data/layouts/VermilionCity_Gym/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/VermilionCity_Gym/border.bin
diff --git a/data/layouts/VermilionCity_Gym/map.bin b/data/layouts/VermilionCity_Gym/map.bin
new file mode 100644
index 000000000..6389bf603
--- /dev/null
+++ b/data/layouts/VermilionCity_Gym/map.bin
@@ -0,0 +1 @@
+������������������������2�2��2�2�2��2�2���2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2������������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2��2��2��2��2�2�2�2�2�2�2�2�2�2�2�2�2��2��2��2��2��2�2�2�2�2�2�2�2�2�2�2�2�2��2��2��2��2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2tuv
\ No newline at end of file
diff --git a/data/layouts/VermilionCity_PokemonFanClub/border.bin b/data/layouts/VermilionCity_PokemonFanClub/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/VermilionCity_PokemonFanClub/border.bin
diff --git a/data/layouts/VermilionCity_PokemonFanClub/map.bin b/data/layouts/VermilionCity_PokemonFanClub/map.bin
new file mode 100644
index 000000000..9e7443ba6
--- /dev/null
+++ b/data/layouts/VermilionCity_PokemonFanClub/map.bin
@@ -0,0 +1 @@
+���������������������2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2��B�B��2�2�2��2�2�2�2���2�2�2�2��2�2�2�2���2�2�2�2��2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/VictoryRoad_1F/map.bin b/data/layouts/VictoryRoad_1F/map.bin
new file mode 100644
index 000000000..fe99f6f05
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������������������2���2�2���������������������������������2�2�2���������2����2�2���������������������������������2�2�������2�2�2�2�2�2�2�2�2��������������������������������2�2�2��������2�2��2�2�2�2�2������������������������������2�2�2��B�B�B�B�B�B�B�B�B�B�B�B�B��2�2�����������������������������2�2�2��B�B�B�B�B�B�B�B�B�B�B�B�B��2�2�����������������������������2�2�2��B�B�B�B�B�B�B�B�B�B�B�B�B��2�2������������������������������2�2��B�B�B�B�B�B�B�B�B�B�B�B�B��2�2������������������������������2�2���������B�B������2�2�������������������������������2�2�2�2�2�2�2�2��B�B���2�2�2�2�2������������������������������2�2��B�B�B�B��2��B�B����2�2�2�������������������������������2���B�B�B�B����B�B�������������������������������������2�2��B�B�B�B����B�B�������������������������������������2�2��B�B�B�B�B�B�B�B�B���2�2�2�������������������������������2�2�2��B�B�B�B�B�B�B�B�B��2�2�2�2������������������������������2�2�2�������������2��2�2������������������������������2�2���2�2����2�2�2�2�2�2�2�2�2��������������������������������2�2�2�2�2���2�2�2���2�2�2�2�2���������������������������������2�2�2�2�2�2�2�2�2���2�2����������������������������������������2�2�2�2�2�������������������������������������6��6�6�6�6�6��6����6�6��6�6�6�6����������������������������
\ No newline at end of file
diff --git a/data/layouts/VictoryRoad_2F/border.bin b/data/layouts/VictoryRoad_2F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/VictoryRoad_2F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/VictoryRoad_2F/map.bin b/data/layouts/VictoryRoad_2F/map.bin
new file mode 100644
index 000000000..fa39935e6
--- /dev/null
+++ b/data/layouts/VictoryRoad_2F/map.bin
diff --git a/data/layouts/VictoryRoad_3F/border.bin b/data/layouts/VictoryRoad_3F/border.bin
new file mode 100644
index 000000000..a021ddd4e
--- /dev/null
+++ b/data/layouts/VictoryRoad_3F/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/VictoryRoad_3F/map.bin b/data/layouts/VictoryRoad_3F/map.bin
new file mode 100644
index 000000000..3ca93972e
--- /dev/null
+++ b/data/layouts/VictoryRoad_3F/map.bin
@@ -0,0 +1 @@
+������������������������2�2�����������2�2�2��2�2�2�2�2�2����������������6��6�����������6�6�6������������2�2�2�����6�2�2���6���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2������2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2����2������2�2�2�2�2�2�2�2�6�B�B�B�B�B�B�B�B�B�B�B�B�B�B�6�2�2�2�2�2�2�2�2�2��2�2���2�2�����2�2�2��2��2�2�2�6�B�B�B�B�B�B�B�B�B�B�B�B�B�B�6�2�2�2�2�2�2�6�6�6��2�2���2�2�����2�2�2�2�2��2�2�2�6�B�B�B�B�B�B�B�B�B�B�B�B�B�B�6�2�2�2�2�2�2�6�6�6��2�2���2�2�����2�2�2�2�6��2�2�2�6�B�B�B��6�6�6�6�6�6����6�6�2�2�2�2�2�2�6�6�6�2�2�2���2�2����2�2�2��6���2�2�2�6�B�B�B�6�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�6���6�6�6����2����B�B�B�B�B�B�B�B�6�2�6�B�B�B�6�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�6���2����B�B�B�B�B�B�B�B�6�6�6�B�B�B�6�2�2�2�2�2�2�2�2���6�2�2�2�2�2�2�6�2�2�2�2�2�6�������B�B�B�B�B�B�B�B�6�6�6�B�B�B�6�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2��2�2�2�2�2��6��2���6�6��6�6�6��B�B�B�B�B�B�B�B�6�2�2�2�2�2�2�2�2�2�2�2�2�2�6��6�6��2�2�2�2�2��6��2���6��2�2�2�2�6�B�B�B�B�B�B�B�B�6�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�6�2�2�2����2�6�6���2�2�2�2�6�6�6�6�6�6�6�6�6�6�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�2����2�6�6�6��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2��6�6��6�6�6�6�����2�2�2��2�2�2�2�2����2��6�6�6�2�2�2�2�2�2�2�2�2�2�2�2�2�2�6�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2����2�6�6�6�6�2�2�2�2�2�2�2�2�2�2�2�2�2�2�6�6�6�2�2�2�2�2�2�2�2�2�2�2�2�2�2�6�2�2�2�2�2����2�6�6�6��6�2�2�2�2�2�2�2�2�2�2�2�2�2�6�6�6�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2����2�6�6�6�6�6�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2����2�6�6�6�6�6�6�6��6�6�6���6�6�6���6�6�6�6��6�6�6�6�6���6�6�6�6�6��6�6�����2�2�2�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6�6��6�6�6�6�6�6�6�6�6�6�6�6�6��6�6�6�6�6��6�6�6�6��2�2
\ No newline at end of file
diff --git a/data/layouts/ViridianCity/border.bin b/data/layouts/ViridianCity/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/ViridianCity/border.bin
diff --git a/data/layouts/ViridianCity/map.bin b/data/layouts/ViridianCity/map.bin
new file mode 100644
index 000000000..d633641ca
--- /dev/null
+++ b/data/layouts/ViridianCity/map.bin
@@ -0,0 +1 @@
+qq�lmqqr�0	00	0
0qqqq�mqr�0000kllmquqr�	0e1f1g10sqq�m�mr&%$%$%$%$'�0m1n1o1	0$%$%$%$%$%$%$%sqqququr�����������0m1n1o10&%$'
0e1f1f1f1f1f1f1f1f1f1f1f1g1sqqququr0
000000000
00m1n1o100	00	00m1n1n1n1n1n1n1n1n1n1n1n1o1sqqququr
0��	0m1n1�1f1f1f1f1f1f1�1n1�1v1�2�2�2�2�2�2�1n1o1sqqququr	0��m1n1n1n1n1n1n1n1n1n1n1o1
0ABBBBCm1n1o1sqqququr	0��0m1n1�1v1�2�2�2�2�2v1v1w1
0IJJJJKm1n1o1sqq�}qur0��m1n1o1������0	00`1PQRSTVm1n1o1sqquqqur	0��	0m1n1o1�0�����000hX1Y1Z[\^1m1n1o1{||}q�}r0��m1n1o1������0	000	00	00	0
0u1v1w1qqqq�}qr0��0m1n1o1�0�0�0�0���������������||||}qqr	0��m1n1o100	00	00000000	00	00000qqqqq�yz0��	0m1n1o1	000000000	000	0	000	00	0yyyyyz0	0	0�&%$%$%$'�m1n1o10�2�2�2�2�2�������������0	00	00	00	00����������0n1o1������00	000(0)0*0+000	00�0�0�0�0�0�0�0�0�00000e1f1f1f1f1f1f1�1n1o1�0�����0e1f1g1001230e1f1g1�0�0�0�0�0�0�0�0�0	00	00m1n1n1n1n1n1n1n1n1o1������	0m1n1o1	089:;	0m1n1o1�0�0�0�0�0�0�0�0�00000u1v1v1v1v1v1v1�1n1o1�0�2�0�2�2�20m1n1o10@Abc0m1n1o1iiiiiij0
0	00	0000	00	00	0m1n1�1f1f1f1f1f1f1f1�1n1�1f1f1f1n1f1f1�1n1o1qkllmqr00000	00�0�0�0�0	00m1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1o1k�qquqr0000000�0�0�0�00	0m1n1�1v1�2�2�2�2�2v1�1n1�1v1v1v1v1v1v1�1n1o1sqqq�mr0000�0�0�0�00m1n1o10HIJK�0m1n1o100	00	0	0m1n1o1sqqqqur&%$'	00�0�0�0�00m1n1o1
0PQRS�
0m1n1o1	0	00000m1n1o1sqqqqur�0�0�0�00&'	00	00	00m1n1o10XYZ[�0m1n1o100	00	0	0m1n1o1sqqqqur�0�0�0�0������000m1n1o1
0`ab��
0m1n1o1000000m1n1o1sqqqqur�01�0�0������0	00m1n1�1f1f1f1n1f1f1f1�1n1�1f1f1f1f1f1f1�1n1o1�qqqqur
0�0�0�0������000m1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1n1o1qqqqqur0
00	0������0	00u1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1w1qqqqqu��������������000�������������������qqqq�}r0	00	03131313131310	00000	000	00	00	000	00000000qqqquqr0000000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�00
0qqqqu��0000000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�000qqqqrr�0�0�0�0�0�0�0�01�0�01�0�0�0�0�0�0�0�0�0�0�0�0�0�00
0qqqqrr00000000�0�0�0�00000000000000000qqqqrr�0�0�0�0qqqqrr�0�0�0�0qqqqrr�0�0�0�0qqqqrr�0�0�0�0
\ No newline at end of file
diff --git a/data/layouts/ViridianCity_Gym/border.bin b/data/layouts/ViridianCity_Gym/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/ViridianCity_Gym/border.bin
diff --git a/data/layouts/ViridianCity_Gym/map.bin b/data/layouts/ViridianCity_Gym/map.bin
new file mode 100644
index 000000000..ea13b0280
--- /dev/null
+++ b/data/layouts/ViridianCity_Gym/map.bin
@@ -0,0 +1 @@
+������������������������������������������2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2����2���2��������2�2��2�2�2����2���2��������2�2��2�2�2�2�2�2�2��2�2��2�2�2�2�2��2�2��2�2�2�2�2�2����2�2�2�2�2�2�2��2�2�������2���������2�2��2�2�������2��2�������2�2��2�2�2�2�2�2�2��2��2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2��2��2�2�2�2�2�2���2��2�2�2�2���2��2��2�2�2�2�2�2���2��2�2�2�2���2��2��2�2�2�2�2�2�2��2��2�2�2�2���2�2�2��2�2�2�2�2�2�2��2��2�2�2�2���2����������2�2�2�2�2�2�2�2���2����������2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�������������2�2�2�2�2�2�2�2�������������2��2�2�2��2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2���
\ No newline at end of file
diff --git a/data/layouts/ViridianCity_House1/border.bin b/data/layouts/ViridianCity_House1/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/ViridianCity_House1/border.bin
diff --git a/data/layouts/ViridianCity_House1/map.bin b/data/layouts/ViridianCity_House1/map.bin
new file mode 100644
index 000000000..888436add
--- /dev/null
+++ b/data/layouts/ViridianCity_House1/map.bin
@@ -0,0 +1 @@
+  ./ - � !"1267(5(�()*90:0>0?0	0=0	0	0	0	0	0	0
0
0C0D0D0D0D0F0
0
0	0
0
0S0K0LMN0V0
0
0	0
0
0S0K0TUN0V0
0
0W0
0
0[0\0\0\0\0^0
0G0_
0
0000
0
0
0
0O44444444
\ No newline at end of file
diff --git a/data/layouts/ViridianCity_House2/border.bin b/data/layouts/ViridianCity_House2/border.bin
new file mode 100644
index 000000000..a886cd764
--- /dev/null
+++ b/data/layouts/ViridianCity_House2/border.bin
diff --git a/data/layouts/ViridianCity_House2/map.bin b/data/layouts/ViridianCity_House2/map.bin
new file mode 100644
index 000000000..b6e23003b
--- /dev/null
+++ b/data/layouts/ViridianCity_House2/map.bin
@@ -0,0 +1 @@
+���������������������2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2�2�2�2�2�2�
\ No newline at end of file
diff --git a/data/layouts/ViridianForest/border.bin b/data/layouts/ViridianForest/border.bin
new file mode 100644
index 000000000..7797e033b
--- /dev/null
+++ b/data/layouts/ViridianForest/border.bin
@@ -0,0 +1 @@
+������
\ No newline at end of file
diff --git a/data/layouts/ViridianForest/map.bin b/data/layouts/ViridianForest/map.bin
new file mode 100644
index 000000000..74a9e6f5d
--- /dev/null
+++ b/data/layouts/ViridianForest/map.bin
@@ -0,0 +1 @@
+LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN00	00	00	00	00	00	0���0	00	0	00	00	00	00�2	0�2
0�2
0�2
0�2	0�20��������������0�0�0�0�0�0�0�0�0�0�0�00���000000000000
0�2
0�2	0�2	0�2	0�2
0	0��������������	0�0�0�0�0�0�0�0�0�0�0�00���	000	0
0
0�2	0
0�2
0	0�2	0
0�2
0
0�2	0
00	00���\]0]0�����]0]0^0�0�01�0�0�0�0�01�0�0	0���0	000	0���������������0000���d�e��1�1�1�e�f0�0�0�0	00	00	0�0�0�00���00	000���������������0	00	0��������2�1�2����0�0�0�00	0�20	0�0�0�00���	00000���������������	00	00��������0�0�0����	00	00	0���0	00	00���00	000���������������0000�������0	0����
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���������������0	00	0������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���������������	00	00������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���������������0000������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0
0
0
0
0
0
00	0
0
0
0	0	00	00	0	0	0������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0
0
0
0
0
0
000�0�0�000000000������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0
0
0
0
0
0
00	0�0�0�0	0
0
0�2
0
0�20������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0
0
0
0
0
0
000�0�0�00	0������������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0
0
0�2
0
0�20	0�0�0�0	00������������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0
0������0�0�0�000������������
0
0
0
0
0���
0
0
0
0
0���
0
0
0
0
0���000
0
0
0������	0�0�0�0	00������������
0
0
0
0
0���
0
0
0
0
0���0	0000���
00
00
0	0������0�0�0�00	0������������
0
0
0
0
0���
0
0
0
0
0����20�0�0�0�0�0�0�0�0�0�0�00������0�0�0�0	00������������
0
0
0
0
0���
0
0
0
0
0������0�0�0�0�0�0�0�0�0�0�00������	0�0�0�000������������
0
0
0
0
0���
0
0
0
0
0������0�2�0�0�2�0�0�2�0�0�20������0�0�0�0	0
0�2	0�2
0�2	0������
0
0
0
0
0���
0
0
0
0
0
0
0���������������������0�0�0�0	0
0�2
0�2	0�2������
0
0
0
0
0	00	0
0
0
0
0
0
0
0���������������������	0�0�0�0�0�00	00	0�2	0������00	00	00	00	00	00	00	0���������������������0�0�0�0�0�00000	00������0�0�0�00	00	00�0�0�0
00���������������������
0
0
0
00
0�2	00	00	0������	0�0�0�0�0�0�0�0�0�0�0�0�0
00���������������������
0
0
0
0
0���0	00	0������0�0�0�0�0�0�0�0�0�0�0�0�00	00	00	00	0���������������
0
0
0
0
0���0000������0�0�0�0�0�0�0�0�0�0�0�0�000	00000	0���������������
0
0
0
0
0���0	00	0������0�20	0�20	0�20	0�20	0�2000�2
0�20���������������
0
0
0
0
0���0000���������������������0�20�2
00���������������
0
0
0
0
0���0	00	0���������������������0�2�2
0�20���������������
0
0
0
0
0���0000������������������������������������������
0
0
0
0
0���0	00	0������������������������������������������
0
0
0
0
0���0000������������������������������������������
0
0
0
0
0���0	00	0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0���������������������
0
0
0
0
0���0000������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0���������������������
0
0
0
0
0���0	00	0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0���������������������
0
0
0
0
0���0000������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0���������������������
0
0
0
0
0���0	0�2	0������
0�2
0
0�2
0
0�2
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0������
0
0
0
0	0000
0�2
0�2���������������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
00
0
0������
0
0
0000	00�2
0�2	0���������������
0
0
0
0
0
0�2
0
0�2
0
0�2
0
0
00	0	0
0
0������
0
0
00	000�2
0�2�2�2���������������0	0
0
0
0���������
0
0000
0
0������
0
0
0	00	0���������������������00
0
0
0���������
0
00	00
0
0������
0
0
0000���������������������0	0
0
0
0���������
0
0000
0
0������
0
0
0	00	0���������������������00
0
0
0���������
0
00	00
0
0������
0
0
0000���������������������0	0
0
0
0���������
0
0000
0
0������
0
0
0	00	0���������������������00
0
0
0���������
0
00	00
0
0������
0
0
0000���������������������0	0
0
0
0���������
0
0000
0
0������
0
0
0	00	0���������������������00
0
0
0���������
0
00	00
0
0������
0
0
0	00	0���������������������0	0
0
0
0���������
0
0	0�2
0
0
0������
0
0
0000������������
0
0
0
0
0
0
0
0
00	0
0
0
0
0
0
0
0
0
0
0
0
0
0
0���
0
0
0
0
0
0
0
0
0
0
00	0
0
0
0
0
0
0
0������
0
0
0
0
0
0
0
0
000
0
0
0
0
0
0
0
0
0
0
0
0
0
0���
0
0
0
0
0
0
0
0
0
0
000
0
0
0
0
0
0
0������
0
0
0
0
0
0
0
0
00	00
0
0
0
0
0
0
0
0
0
0
0
0	0���
0
0
0
0
0
0
0
0
0
000	0
0
0
0
0
0
0
0������
0
0
0
0
0
0
0
0
0000
0
0
0
0
0
0
0
0
0
0
0
00	00	00	0
0
0
0
0
0
0
000	00
0
0
0
0
0
0
0������
0
0
0
0
0
0
0
0	00	00�0�0�0�0�0�0�0�0�0�0�0�0	000000	00	00	00000	0
0
0
0
0
0
0
0������
0
0
0
0
0
0
0
00000�0�0�0�0�0�0�0�0�0�0�0�00
0
0
00000000
0
0	00
0
0
0
0
0
0
0
0������
0�2
0
0�2
0
0�2	0
0�2
0�0�2�0�0�2�0�0�2�0�0�2�0	0�0�0�0
00	0�2
0
0�2	0
0�20
0�2
0
0�2
0
0�2
0�������������������������������2�2y1�2�2
0���������������������������������������������DEEEEEEEEEF�������������������������������������������LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN�������������������������������������������LMMMMMMMMMN�������������������
\ No newline at end of file
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
new file mode 100644
index 000000000..3675b33c0
--- /dev/null
+++ b/data/layouts/layouts.json
@@ -0,0 +1,4403 @@
+{
+  "layouts_table_label": "gMapLayouts",
+  "layouts": [
+    {
+      "id": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F",
+      "name": "PalletTown_PlayersHouse_1F_Layout",
+      "width": 13,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C74",
+      "border_filepath": "data/layouts/PalletTown_PlayersHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F",
+      "name": "PalletTown_PlayersHouse_2F_Layout",
+      "width": 12,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C74",
+      "border_filepath": "data/layouts/PalletTown_PlayersHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_PALLET_TOWN_GARYS_HOUSE",
+      "name": "PalletTown_GarysHouse_Layout",
+      "width": 13,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin",
+      "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D54D8",
+      "name": "UnusedLayout_82D54D8_Layout",
+      "width": 9,
+      "height": 8,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C74",
+      "border_filepath": "data/layouts/UnusedLayout_82D54D8/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D54D8/map.bin"
+    },
+    {
+      "id": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+      "name": "PalletTown_ProfessorOaksLab_Layout",
+      "width": 13,
+      "height": 14,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C8C",
+      "border_filepath": "data/layouts/PalletTown_ProfessorOaksLab/border.bin",
+      "blockdata_filepath": "data/layouts/PalletTown_ProfessorOaksLab/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE1",
+      "name": "House1_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C74",
+      "border_filepath": "data/layouts/House1/border.bin",
+      "blockdata_filepath": "data/layouts/House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE2",
+      "name": "House2_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/House2/border.bin",
+      "blockdata_filepath": "data/layouts/House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_CENTER_1F",
+      "name": "PokemonCenter_1F_Layout",
+      "width": 15,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BE4",
+      "border_filepath": "data/layouts/PokemonCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_CENTER_2F",
+      "name": "PokemonCenter_2F_Layout",
+      "width": 15,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BE4",
+      "border_filepath": "data/layouts/PokemonCenter_2F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MART",
+      "name": "Mart_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BCC",
+      "border_filepath": "data/layouts/Mart/border.bin",
+      "blockdata_filepath": "data/layouts/Mart/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE3",
+      "name": "House3_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/House3/border.bin",
+      "blockdata_filepath": "data/layouts/House3/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CITY_GYM",
+      "name": "CeruleanCity_Gym_Layout",
+      "width": 17,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4D1C",
+      "border_filepath": "data/layouts/CeruleanCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE4",
+      "name": "House4_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/House4/border.bin",
+      "blockdata_filepath": "data/layouts/House4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D6144",
+      "name": "UnusedLayout_82D6144_Layout",
+      "width": 11,
+      "height": 8,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BCC",
+      "border_filepath": "data/layouts/UnusedLayout_82D6144/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D6144/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_GYM",
+      "name": "CeladonCity_Gym_Layout",
+      "width": 13,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4D4C",
+      "border_filepath": "data/layouts/CeladonCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D6490",
+      "name": "UnusedLayout_82D6490_Layout",
+      "width": 14,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BE4",
+      "border_filepath": "data/layouts/UnusedLayout_82D6490/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D6490/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
+      "name": "FiveIsland_ResortGorgeous_House_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C2C",
+      "border_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D6654",
+      "name": "UnusedLayout_82D6654_Layout",
+      "width": 10,
+      "height": 9,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82D6654/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D6654/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D672C",
+      "name": "UnusedLayout_82D672C_Layout",
+      "width": 10,
+      "height": 9,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82D672C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D672C/map.bin"
+    },
+    {
+      "id": "LAYOUT_FUCHSIA_CITY_GYM",
+      "name": "FuchsiaCity_Gym_Layout",
+      "width": 15,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CA4",
+      "border_filepath": "data/layouts/FuchsiaCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/FuchsiaCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE5",
+      "name": "House5_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C74",
+      "border_filepath": "data/layouts/House5/border.bin",
+      "blockdata_filepath": "data/layouts/House5/map.bin"
+    },
+    {},
+    {},
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D6C34",
+      "name": "UnusedLayout_82D6C34_Layout",
+      "width": 12,
+      "height": 12,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "NULL",
+      "secondary_tileset": "gTileset_82D4C14",
+      "border_filepath": "data/layouts/UnusedLayout_82D6C34/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D6C34/map.bin"
+    },
+    {
+      "id": "LAYOUT_VERMILION_CITY_GYM",
+      "name": "VermilionCity_Gym_Layout",
+      "width": 11,
+      "height": 21,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4D34",
+      "border_filepath": "data/layouts/VermilionCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/VermilionCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CITY_BIKE_SHOP",
+      "name": "CeruleanCity_BikeShop_Layout",
+      "width": 11,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C5C",
+      "border_filepath": "data/layouts/CeruleanCity_BikeShop/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCity_BikeShop/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_GAME_CORNER",
+      "name": "CeladonCity_GameCorner_Layout",
+      "width": 18,
+      "height": 15,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CEC",
+      "border_filepath": "data/layouts/CeladonCity_GameCorner/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_GameCorner/map.bin"
+    },
+    {
+      "id": "LAYOUT_PEWTER_CITY_GYM",
+      "name": "PewterCity_Gym_Layout",
+      "width": 13,
+      "height": 16,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4D04",
+      "border_filepath": "data/layouts/PewterCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/PewterCity_Gym/map.bin"
+    },
+    {},
+    {
+      "id": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE",
+      "name": "FourIsland_LoreleisHouse_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F14",
+      "border_filepath": "data/layouts/FourIsland_LoreleisHouse/border.bin",
+      "blockdata_filepath": "data/layouts/FourIsland_LoreleisHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_THREE_ISLAND_HOUSE1",
+      "name": "ThreeIsland_House1_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C8C",
+      "border_filepath": "data/layouts/ThreeIsland_House1/border.bin",
+      "blockdata_filepath": "data/layouts/ThreeIsland_House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D75F0",
+      "name": "UnusedLayout_82D75F0_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82D75F0/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D75F0/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D7674",
+      "name": "UnusedLayout_82D7674_Layout",
+      "width": 8,
+      "height": 6,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82D7674/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D7674/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY_GYM",
+      "name": "SaffronCity_Gym_Layout",
+      "width": 29,
+      "height": 25,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4D64",
+      "border_filepath": "data/layouts/SaffronCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D7CC8",
+      "name": "UnusedLayout_82D7CC8_Layout",
+      "width": 8,
+      "height": 6,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82D7CC8/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D7CC8/map.bin"
+    },
+    {
+      "id": "LAYOUT_CINNABAR_ISLAND_GYM",
+      "name": "CinnabarIsland_Gym_Layout",
+      "width": 30,
+      "height": 25,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4D7C",
+      "border_filepath": "data/layouts/CinnabarIsland_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/CinnabarIsland_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_VIRIDIAN_CITY_GYM",
+      "name": "ViridianCity_Gym_Layout",
+      "width": 20,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CBC",
+      "border_filepath": "data/layouts/ViridianCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/ViridianCity_Gym/map.bin"
+    },
+    {},
+    {},
+    {},
+    {},
+    {},
+    {},
+    {},
+    {},
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D88C8",
+      "name": "UnusedLayout_82D88C8_Layout",
+      "width": 18,
+      "height": 14,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BCC",
+      "border_filepath": "data/layouts/UnusedLayout_82D88C8/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_00_00",
+      "name": "UnknownMap_00_00_Layout",
+      "width": 14,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C44",
+      "border_filepath": "data/layouts/UnknownMap_00_00/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_00_00/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_00_01",
+      "name": "UnknownMap_00_01_Layout",
+      "width": 12,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C44",
+      "border_filepath": "data/layouts/UnknownMap_00_01/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_00_01/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_00_02",
+      "name": "UnknownMap_00_02_Layout",
+      "width": 20,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C44",
+      "border_filepath": "data/layouts/UnknownMap_00_02/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_00_02/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_00_03",
+      "name": "UnknownMap_00_03_Layout",
+      "width": 14,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C44",
+      "border_filepath": "data/layouts/UnknownMap_00_03/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_00_03/map.bin"
+    },
+    {
+      "id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
+      "name": "FuchsiaCity_SafariZone_Entrance_Layout",
+      "width": 9,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F14",
+      "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82D9B24",
+      "name": "UnusedLayout_82D9B24_Layout",
+      "width": 40,
+      "height": 40,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B6C",
+      "border_filepath": "data/layouts/UnusedLayout_82D9B24/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82D9B24/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DA7C8",
+      "name": "UnusedLayout_82DA7C8_Layout",
+      "width": 40,
+      "height": 40,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B6C",
+      "border_filepath": "data/layouts/UnusedLayout_82DA7C8/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DA7C8/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DB46C",
+      "name": "UnusedLayout_82DB46C_Layout",
+      "width": 40,
+      "height": 40,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B6C",
+      "border_filepath": "data/layouts/UnusedLayout_82DB46C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DB46C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DB4F0",
+      "name": "UnusedLayout_82DB4F0_Layout",
+      "width": 8,
+      "height": 6,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DB4F0/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DB4F0/map.bin"
+    },
+    {},
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DBBE0",
+      "name": "UnusedLayout_82DBBE0_Layout",
+      "width": 29,
+      "height": 30,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4ADC",
+      "border_filepath": "data/layouts/UnusedLayout_82DBBE0/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DBBE0/map.bin"
+    },
+    {},
+    {},
+    {},
+    {},
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DBDD8",
+      "name": "UnusedLayout_82DBDD8_Layout",
+      "width": 18,
+      "height": 13,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/UnusedLayout_82DBDD8/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DBDD8/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DBFB8",
+      "name": "UnusedLayout_82DBFB8_Layout",
+      "width": 17,
+      "height": 13,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/UnusedLayout_82DBFB8/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DBFB8/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DC4EC",
+      "name": "UnusedLayout_82DC4EC_Layout",
+      "width": 36,
+      "height": 18,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/UnusedLayout_82DC4EC/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DC4EC/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DC60C",
+      "name": "UnusedLayout_82DC60C_Layout",
+      "width": 14,
+      "height": 9,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DC60C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DC60C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DC72C",
+      "name": "UnusedLayout_82DC72C_Layout",
+      "width": 14,
+      "height": 9,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DC72C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DC72C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DC84C",
+      "name": "UnusedLayout_82DC84C_Layout",
+      "width": 14,
+      "height": 9,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DC84C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DC84C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DCA70",
+      "name": "UnusedLayout_82DCA70_Layout",
+      "width": 15,
+      "height": 17,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C44",
+      "border_filepath": "data/layouts/UnusedLayout_82DCA70/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DCA70/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DCB44",
+      "name": "UnusedLayout_82DCB44_Layout",
+      "width": 11,
+      "height": 8,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DCB44/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DCB44/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DCC40",
+      "name": "UnusedLayout_82DCC40_Layout",
+      "width": 12,
+      "height": 9,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DCC40/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DCC40/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DCCD4",
+      "name": "UnusedLayout_82DCCD4_Layout",
+      "width": 8,
+      "height": 7,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DCCD4/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DCCD4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DCD68",
+      "name": "UnusedLayout_82DCD68_Layout",
+      "width": 8,
+      "height": 7,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DCD68/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DCD68/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DCDFC",
+      "name": "UnusedLayout_82DCDFC_Layout",
+      "width": 8,
+      "height": 7,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DCDFC/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DCDFC/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DCF00",
+      "name": "UnusedLayout_82DCF00_Layout",
+      "width": 14,
+      "height": 8,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DCF00/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DCF00/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DD004",
+      "name": "UnusedLayout_82DD004_Layout",
+      "width": 14,
+      "height": 8,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DD004/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DD004/map.bin"
+    },
+    {},
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_82DD0DC",
+      "name": "UnusedLayout_82DD0DC_Layout",
+      "width": 10,
+      "height": 9,
+      "border_width": 0,
+      "border_height": 0,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CD4",
+      "border_filepath": "data/layouts/UnusedLayout_82DD0DC/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_82DD0DC/map.bin"
+    },
+    {
+      "id": "LAYOUT_PALLET_TOWN",
+      "name": "PalletTown_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AAC",
+      "border_filepath": "data/layouts/PalletTown/border.bin",
+      "blockdata_filepath": "data/layouts/PalletTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_VIRIDIAN_CITY",
+      "name": "ViridianCity_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AC4",
+      "border_filepath": "data/layouts/ViridianCity/border.bin",
+      "blockdata_filepath": "data/layouts/ViridianCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_PEWTER_CITY",
+      "name": "PewterCity_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4ADC",
+      "border_filepath": "data/layouts/PewterCity/border.bin",
+      "blockdata_filepath": "data/layouts/PewterCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CITY",
+      "name": "CeruleanCity_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AF4",
+      "border_filepath": "data/layouts/CeruleanCity/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_LAVENDER_TOWN",
+      "name": "LavenderTown_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B0C",
+      "border_filepath": "data/layouts/LavenderTown/border.bin",
+      "blockdata_filepath": "data/layouts/LavenderTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_VERMILION_CITY",
+      "name": "VermilionCity_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B24",
+      "border_filepath": "data/layouts/VermilionCity/border.bin",
+      "blockdata_filepath": "data/layouts/VermilionCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY",
+      "name": "CeladonCity_Layout",
+      "width": 60,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/CeladonCity/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_FUCHSIA_CITY",
+      "name": "FuchsiaCity_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B54",
+      "border_filepath": "data/layouts/FuchsiaCity/border.bin",
+      "blockdata_filepath": "data/layouts/FuchsiaCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_CINNABAR_ISLAND",
+      "name": "CinnabarIsland_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B6C",
+      "border_filepath": "data/layouts/CinnabarIsland/border.bin",
+      "blockdata_filepath": "data/layouts/CinnabarIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_INDIGO_PLATEAU_EXTERIOR",
+      "name": "IndigoPlateau_Exterior_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B84",
+      "border_filepath": "data/layouts/IndigoPlateau_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY",
+      "name": "SaffronCity_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B9C",
+      "border_filepath": "data/layouts/SaffronCity/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE1",
+      "name": "Route1_Layout",
+      "width": 24,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AAC",
+      "border_filepath": "data/layouts/Route1/border.bin",
+      "blockdata_filepath": "data/layouts/Route1/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE2",
+      "name": "Route2_Layout",
+      "width": 24,
+      "height": 80,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AC4",
+      "border_filepath": "data/layouts/Route2/border.bin",
+      "blockdata_filepath": "data/layouts/Route2/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE3",
+      "name": "Route3_Layout",
+      "width": 84,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4ADC",
+      "border_filepath": "data/layouts/Route3/border.bin",
+      "blockdata_filepath": "data/layouts/Route3/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE4",
+      "name": "Route4_Layout",
+      "width": 108,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AF4",
+      "border_filepath": "data/layouts/Route4/border.bin",
+      "blockdata_filepath": "data/layouts/Route4/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE5",
+      "name": "Route5_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AF4",
+      "border_filepath": "data/layouts/Route5/border.bin",
+      "blockdata_filepath": "data/layouts/Route5/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE6",
+      "name": "Route6_Layout",
+      "width": 24,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B24",
+      "border_filepath": "data/layouts/Route6/border.bin",
+      "blockdata_filepath": "data/layouts/Route6/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE7",
+      "name": "Route7_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/Route7/border.bin",
+      "blockdata_filepath": "data/layouts/Route7/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE8",
+      "name": "Route8_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B0C",
+      "border_filepath": "data/layouts/Route8/border.bin",
+      "blockdata_filepath": "data/layouts/Route8/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE9",
+      "name": "Route9_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AF4",
+      "border_filepath": "data/layouts/Route9/border.bin",
+      "blockdata_filepath": "data/layouts/Route9/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE10",
+      "name": "Route10_Layout",
+      "width": 24,
+      "height": 80,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B0C",
+      "border_filepath": "data/layouts/Route10/border.bin",
+      "blockdata_filepath": "data/layouts/Route10/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE11",
+      "name": "Route11_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B24",
+      "border_filepath": "data/layouts/Route11/border.bin",
+      "blockdata_filepath": "data/layouts/Route11/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE12",
+      "name": "Route12_Layout",
+      "width": 24,
+      "height": 120,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B0C",
+      "border_filepath": "data/layouts/Route12/border.bin",
+      "blockdata_filepath": "data/layouts/Route12/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE13",
+      "name": "Route13_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B0C",
+      "border_filepath": "data/layouts/Route13/border.bin",
+      "blockdata_filepath": "data/layouts/Route13/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE14",
+      "name": "Route14_Layout",
+      "width": 24,
+      "height": 60,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B0C",
+      "border_filepath": "data/layouts/Route14/border.bin",
+      "blockdata_filepath": "data/layouts/Route14/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE15",
+      "name": "Route15_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B54",
+      "border_filepath": "data/layouts/Route15/border.bin",
+      "blockdata_filepath": "data/layouts/Route15/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE16",
+      "name": "Route16_Layout",
+      "width": 48,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/Route16/border.bin",
+      "blockdata_filepath": "data/layouts/Route16/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE17",
+      "name": "Route17_Layout",
+      "width": 24,
+      "height": 160,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/Route17/border.bin",
+      "blockdata_filepath": "data/layouts/Route17/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE18",
+      "name": "Route18_Layout",
+      "width": 60,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/Route18/border.bin",
+      "blockdata_filepath": "data/layouts/Route18/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE19",
+      "name": "Route19_Layout",
+      "width": 24,
+      "height": 60,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B54",
+      "border_filepath": "data/layouts/Route19/border.bin",
+      "blockdata_filepath": "data/layouts/Route19/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE20",
+      "name": "Route20_Layout",
+      "width": 120,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B6C",
+      "border_filepath": "data/layouts/Route20/border.bin",
+      "blockdata_filepath": "data/layouts/Route20/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE21_NORTH",
+      "name": "Route21_North_Layout",
+      "width": 24,
+      "height": 50,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AAC",
+      "border_filepath": "data/layouts/Route21_North/border.bin",
+      "blockdata_filepath": "data/layouts/Route21_North/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE22",
+      "name": "Route22_Layout",
+      "width": 48,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AC4",
+      "border_filepath": "data/layouts/Route22/border.bin",
+      "blockdata_filepath": "data/layouts/Route22/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE23",
+      "name": "Route23_Layout",
+      "width": 24,
+      "height": 160,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B84",
+      "border_filepath": "data/layouts/Route23/border.bin",
+      "blockdata_filepath": "data/layouts/Route23/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE24",
+      "name": "Route24_Layout",
+      "width": 24,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AF4",
+      "border_filepath": "data/layouts/Route24/border.bin",
+      "blockdata_filepath": "data/layouts/Route24/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE25",
+      "name": "Route25_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AF4",
+      "border_filepath": "data/layouts/Route25/border.bin",
+      "blockdata_filepath": "data/layouts/Route25/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_MOON_1F",
+      "name": "MtMoon_1F_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/MtMoon_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MtMoon_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_MOON_B1F",
+      "name": "MtMoon_B1F_Layout",
+      "width": 49,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/MtMoon_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/MtMoon_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_MOON_B2F",
+      "name": "MtMoon_B2F_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/MtMoon_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/MtMoon_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_VIRIDIAN_FOREST",
+      "name": "ViridianForest_Layout",
+      "width": 54,
+      "height": 69,
+      "border_width": 3,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4DC4",
+      "border_filepath": "data/layouts/ViridianForest/border.bin",
+      "blockdata_filepath": "data/layouts/ViridianForest/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_EXTERIOR",
+      "name": "SSAnne_Exterior_Layout",
+      "width": 70,
+      "height": 32,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B24",
+      "border_filepath": "data/layouts/SSAnne_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_1F_CORRIDOR",
+      "name": "SSAnne_1F_Corridor_Layout",
+      "width": 31,
+      "height": 21,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_1F_Corridor/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_1F_Corridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_2F_CORRIDOR",
+      "name": "SSAnne_2F_Corridor_Layout",
+      "width": 34,
+      "height": 16,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_2F_Corridor/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_2F_Corridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_3F_CORRIDOR",
+      "name": "SSAnne_3F_Corridor_Layout",
+      "width": 22,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_3F_Corridor/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_3F_Corridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_B1F_CORRIDOR",
+      "name": "SSAnne_B1F_Corridor_Layout",
+      "width": 23,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_B1F_Corridor/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_B1F_Corridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_DECK",
+      "name": "SSAnne_Deck_Layout",
+      "width": 24,
+      "height": 19,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_Deck/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_Deck/map.bin"
+    },
+    {
+      "id": "LAYOUT_DIGLETTS_CAVE_B1F",
+      "name": "DiglettsCave_B1F_Layout",
+      "width": 85,
+      "height": 80,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E0C",
+      "border_filepath": "data/layouts/DiglettsCave_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/DiglettsCave_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_VICTORY_ROAD_1F",
+      "name": "VictoryRoad_1F_Layout",
+      "width": 48,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/VictoryRoad_1F/border.bin",
+      "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_VICTORY_ROAD_2F",
+      "name": "VictoryRoad_2F_Layout",
+      "width": 51,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/VictoryRoad_2F/border.bin",
+      "blockdata_filepath": "data/layouts/VictoryRoad_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_VICTORY_ROAD_3F",
+      "name": "VictoryRoad_3F_Layout",
+      "width": 45,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/VictoryRoad_3F/border.bin",
+      "blockdata_filepath": "data/layouts/VictoryRoad_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROCKET_HIDEOUT_B1F",
+      "name": "RocketHideout_B1F_Layout",
+      "width": 28,
+      "height": 34,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/RocketHideout_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/RocketHideout_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROCKET_HIDEOUT_B2F",
+      "name": "RocketHideout_B2F_Layout",
+      "width": 32,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/RocketHideout_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/RocketHideout_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROCKET_HIDEOUT_B3F",
+      "name": "RocketHideout_B3F_Layout",
+      "width": 22,
+      "height": 27,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/RocketHideout_B3F/border.bin",
+      "blockdata_filepath": "data/layouts/RocketHideout_B3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROCKET_HIDEOUT_B4F",
+      "name": "RocketHideout_B4F_Layout",
+      "width": 24,
+      "height": 26,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/RocketHideout_B4F/border.bin",
+      "blockdata_filepath": "data/layouts/RocketHideout_B4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_1F",
+      "name": "SilphCo_1F_Layout",
+      "width": 36,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_2F",
+      "name": "SilphCo_2F_Layout",
+      "width": 36,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_2F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_3F",
+      "name": "SilphCo_3F_Layout",
+      "width": 36,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_3F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_4F",
+      "name": "SilphCo_4F_Layout",
+      "width": 36,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_4F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_5F",
+      "name": "SilphCo_5F_Layout",
+      "width": 36,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_5F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_6F",
+      "name": "SilphCo_6F_Layout",
+      "width": 31,
+      "height": 19,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_6F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_6F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_7F",
+      "name": "SilphCo_7F_Layout",
+      "width": 31,
+      "height": 19,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_7F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_7F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_8F",
+      "name": "SilphCo_8F_Layout",
+      "width": 31,
+      "height": 19,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_8F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_8F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_9F",
+      "name": "SilphCo_9F_Layout",
+      "width": 31,
+      "height": 19,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_9F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_9F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_10F",
+      "name": "SilphCo_10F_Layout",
+      "width": 17,
+      "height": 19,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_10F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_10F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_11F",
+      "name": "SilphCo_11F_Layout",
+      "width": 17,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_11F/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_11F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_MANSION_1F",
+      "name": "PokemonMansion_1F_Layout",
+      "width": 38,
+      "height": 35,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F2C",
+      "border_filepath": "data/layouts/PokemonMansion_1F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonMansion_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_MANSION_2F",
+      "name": "PokemonMansion_2F_Layout",
+      "width": 38,
+      "height": 38,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F2C",
+      "border_filepath": "data/layouts/PokemonMansion_2F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonMansion_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_MANSION_3F",
+      "name": "PokemonMansion_3F_Layout",
+      "width": 38,
+      "height": 35,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F2C",
+      "border_filepath": "data/layouts/PokemonMansion_3F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonMansion_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_MANSION_B1F",
+      "name": "PokemonMansion_B1F_Layout",
+      "width": 38,
+      "height": 35,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F2C",
+      "border_filepath": "data/layouts/PokemonMansion_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonMansion_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_CENTER",
+      "name": "SafariZone_Center_Layout",
+      "width": 51,
+      "height": 36,
+      "border_width": 3,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B54",
+      "border_filepath": "data/layouts/SafariZone_Center/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_Center/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_EAST",
+      "name": "SafariZone_East_Layout",
+      "width": 54,
+      "height": 35,
+      "border_width": 3,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B54",
+      "border_filepath": "data/layouts/SafariZone_East/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_East/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_NORTH",
+      "name": "SafariZone_North_Layout",
+      "width": 57,
+      "height": 40,
+      "border_width": 3,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B54",
+      "border_filepath": "data/layouts/SafariZone_North/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_North/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_WEST",
+      "name": "SafariZone_West_Layout",
+      "width": 48,
+      "height": 36,
+      "border_width": 3,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B54",
+      "border_filepath": "data/layouts/SafariZone_West/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_West/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CAVE_1F",
+      "name": "CeruleanCave_1F_Layout",
+      "width": 40,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E54",
+      "border_filepath": "data/layouts/CeruleanCave_1F/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCave_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CAVE_2F",
+      "name": "CeruleanCave_2F_Layout",
+      "width": 40,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E54",
+      "border_filepath": "data/layouts/CeruleanCave_2F/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCave_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CAVE_B1F",
+      "name": "CeruleanCave_B1F_Layout",
+      "width": 40,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E54",
+      "border_filepath": "data/layouts/CeruleanCave_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCave_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROCK_TUNNEL_1F",
+      "name": "RockTunnel_1F_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4DF4",
+      "border_filepath": "data/layouts/RockTunnel_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RockTunnel_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROCK_TUNNEL_B1F",
+      "name": "RockTunnel_B1F_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4DF4",
+      "border_filepath": "data/layouts/RockTunnel_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/RockTunnel_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFOAM_ISLANDS_1F",
+      "name": "SeafoamIslands_1F_Layout",
+      "width": 38,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/SeafoamIslands_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SeafoamIslands_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFOAM_ISLANDS_B1F",
+      "name": "SeafoamIslands_B1F_Layout",
+      "width": 38,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/SeafoamIslands_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/SeafoamIslands_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFOAM_ISLANDS_B2F",
+      "name": "SeafoamIslands_B2F_Layout",
+      "width": 38,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/SeafoamIslands_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/SeafoamIslands_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFOAM_ISLANDS_B3F",
+      "name": "SeafoamIslands_B3F_Layout",
+      "width": 38,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/SeafoamIslands_B3F/border.bin",
+      "blockdata_filepath": "data/layouts/SeafoamIslands_B3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFOAM_ISLANDS_B4F",
+      "name": "SeafoamIslands_B4F_Layout",
+      "width": 38,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/SeafoamIslands_B4F/border.bin",
+      "blockdata_filepath": "data/layouts/SeafoamIslands_B4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_TOWER_1F",
+      "name": "PokemonTower_1F_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EFC",
+      "border_filepath": "data/layouts/PokemonTower_1F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonTower_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_TOWER_2F",
+      "name": "PokemonTower_2F_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EFC",
+      "border_filepath": "data/layouts/PokemonTower_2F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonTower_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_TOWER_3F",
+      "name": "PokemonTower_3F_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EFC",
+      "border_filepath": "data/layouts/PokemonTower_3F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonTower_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_TOWER_4F",
+      "name": "PokemonTower_4F_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EFC",
+      "border_filepath": "data/layouts/PokemonTower_4F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonTower_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_TOWER_5F",
+      "name": "PokemonTower_5F_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EFC",
+      "border_filepath": "data/layouts/PokemonTower_5F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonTower_5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_TOWER_6F",
+      "name": "PokemonTower_6F_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EFC",
+      "border_filepath": "data/layouts/PokemonTower_6F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonTower_6F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_TOWER_7F",
+      "name": "PokemonTower_7F_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EFC",
+      "border_filepath": "data/layouts/PokemonTower_7F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonTower_7F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POWER_PLANT",
+      "name": "PowerPlant_Layout",
+      "width": 49,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E9C",
+      "border_filepath": "data/layouts/PowerPlant/border.bin",
+      "blockdata_filepath": "data/layouts/PowerPlant/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE25_SEA_COTTAGE",
+      "name": "Route25_SeaCottage_Layout",
+      "width": 15,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EB4",
+      "border_filepath": "data/layouts/Route25_SeaCottage/border.bin",
+      "blockdata_filepath": "data/layouts/Route25_SeaCottage/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_KITCHEN",
+      "name": "SSAnne_Kitchen_Layout",
+      "width": 16,
+      "height": 14,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_Kitchen/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_Kitchen/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_CAPTAINS_OFFICE",
+      "name": "SSAnne_CaptainsOffice_Layout",
+      "width": 9,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_CaptainsOffice/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_CaptainsOffice/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERGROUND_PATH_ENTRANCE",
+      "name": "UndergroundPath_Entrance_Layout",
+      "width": 13,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/UndergroundPath_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/UndergroundPath_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL",
+      "name": "UndergroundPath_EastWestTunnel_Layout",
+      "width": 80,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EE4",
+      "border_filepath": "data/layouts/UndergroundPath_EastWestTunnel/border.bin",
+      "blockdata_filepath": "data/layouts/UndergroundPath_EastWestTunnel/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL",
+      "name": "UndergroundPath_NorthSouthTunnel_Layout",
+      "width": 8,
+      "height": 63,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4EE4",
+      "border_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/border.bin",
+      "blockdata_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/map.bin"
+    },
+    {},
+    {
+      "id": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F",
+      "name": "Route12_NorthEntrance_1F_Layout",
+      "width": 11,
+      "height": 13,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/Route12_NorthEntrance_1F/border.bin",
+      "blockdata_filepath": "data/layouts/Route12_NorthEntrance_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_ROOM1",
+      "name": "SSAnne_Room1_Layout",
+      "width": 6,
+      "height": 8,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_Room1/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_Room1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SSANNE_ROOM2",
+      "name": "SSAnne_Room2_Layout",
+      "width": 6,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4D94",
+      "border_filepath": "data/layouts/SSAnne_Room2/border.bin",
+      "blockdata_filepath": "data/layouts/SSAnne_Room2/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "name": "CeladonCity_DepartmentStore_Elevator_Layout",
+      "width": 5,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin"
+    },
+    {
+      "id": "LAYOUT_PEWTER_CITY_MUSEUM_1F",
+      "name": "PewterCity_Museum_1F_Layout",
+      "width": 28,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C2C",
+      "border_filepath": "data/layouts/PewterCity_Museum_1F/border.bin",
+      "blockdata_filepath": "data/layouts/PewterCity_Museum_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_PEWTER_CITY_MUSEUM_2F",
+      "name": "PewterCity_Museum_2F_Layout",
+      "width": 19,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C2C",
+      "border_filepath": "data/layouts/PewterCity_Museum_2F/border.bin",
+      "blockdata_filepath": "data/layouts/PewterCity_Museum_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CITY_HOUSE2",
+      "name": "CeruleanCity_House2_Layout",
+      "width": 10,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4FA4",
+      "border_filepath": "data/layouts/CeruleanCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCity_House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CITY_HOUSE1",
+      "name": "CeruleanCity_House1_Layout",
+      "width": 10,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/CeruleanCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCity_House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F",
+      "name": "CeladonCity_Condominiums_1F_Layout",
+      "width": 15,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F8C",
+      "border_filepath": "data/layouts/CeladonCity_Condominiums_1F/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F",
+      "name": "CeladonCity_Condominiums_2F_Layout",
+      "width": 15,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F8C",
+      "border_filepath": "data/layouts/CeladonCity_Condominiums_2F/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F",
+      "name": "CeladonCity_Condominiums_3F_Layout",
+      "width": 15,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F8C",
+      "border_filepath": "data/layouts/CeladonCity_Condominiums_3F/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF",
+      "name": "CeladonCity_Condominiums_Roof_Layout",
+      "width": 14,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F8C",
+      "border_filepath": "data/layouts/CeladonCity_Condominiums_Roof/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_Roof/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
+      "name": "CeladonCity_Condominiums_RoofRoom_Layout",
+      "width": 10,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F5C",
+      "border_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
+      "name": "CeladonCity_GameCorner_PrizeRoom_Layout",
+      "width": 9,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CEC",
+      "border_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_RESTAURANT",
+      "name": "CeladonCity_Restaurant_Layout",
+      "width": 15,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F44",
+      "border_filepath": "data/layouts/CeladonCity_Restaurant/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Restaurant/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_HOTEL",
+      "name": "CeladonCity_Hotel_Layout",
+      "width": 17,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F44",
+      "border_filepath": "data/layouts/CeladonCity_Hotel/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Hotel/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F",
+      "name": "CeladonCity_DepartmentStore_1F_Layout",
+      "width": 13,
+      "height": 16,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E6C",
+      "border_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F",
+      "name": "CeladonCity_DepartmentStore_2F_Layout",
+      "width": 13,
+      "height": 15,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E6C",
+      "border_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F",
+      "name": "CeladonCity_DepartmentStore_3F_Layout",
+      "width": 13,
+      "height": 15,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E6C",
+      "border_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F",
+      "name": "CeladonCity_DepartmentStore_4F_Layout",
+      "width": 13,
+      "height": 15,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E6C",
+      "border_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F",
+      "name": "CeladonCity_DepartmentStore_5F_Layout",
+      "width": 13,
+      "height": 15,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E6C",
+      "border_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF",
+      "name": "CeladonCity_DepartmentStore_Roof_Layout",
+      "width": 19,
+      "height": 14,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E6C",
+      "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_BUILDING",
+      "name": "SafariZone_Building_Layout",
+      "width": 13,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F14",
+      "border_filepath": "data/layouts/SafariZone_Building/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_Building/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE",
+      "name": "SafariZone_SecretHouse_Layout",
+      "width": 13,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F14",
+      "border_filepath": "data/layouts/SafariZone_SecretHouse/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_SecretHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_FUCHSIA_CITY_ZOO_BUILDING",
+      "name": "FuchsiaCity_ZooBuilding_Layout",
+      "width": 20,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F14",
+      "border_filepath": "data/layouts/FuchsiaCity_ZooBuilding/border.bin",
+      "blockdata_filepath": "data/layouts/FuchsiaCity_ZooBuilding/map.bin"
+    },
+    {
+      "id": "LAYOUT_FUCHSIA_CITY_BUILDING1",
+      "name": "FuchsiaCity_Building1_Layout",
+      "width": 13,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C2C",
+      "border_filepath": "data/layouts/FuchsiaCity_Building1/border.bin",
+      "blockdata_filepath": "data/layouts/FuchsiaCity_Building1/map.bin"
+    },
+    {
+      "id": "LAYOUT_FUCHSIA_CITY_HOUSE2",
+      "name": "FuchsiaCity_House2_Layout",
+      "width": 10,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C2C",
+      "border_filepath": "data/layouts/FuchsiaCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/FuchsiaCity_House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
+      "name": "CinnabarIsland_PokemonLab_Entrance_Layout",
+      "width": 28,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C8C",
+      "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
+      "name": "CinnabarIsland_PokemonLab_Lounge_Layout",
+      "width": 15,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C8C",
+      "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin",
+      "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin"
+    },
+    {
+      "id": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
+      "name": "CinnabarIsland_PokemonLab_ResearchRoom_Layout",
+      "width": 15,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C8C",
+      "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin",
+      "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
+      "name": "CinnabarIsland_PokemonLab_ExperimentRoom_Layout",
+      "width": 15,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C8C",
+      "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin",
+      "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY_DUPLICATE",
+      "name": "SaffronCity_Duplicate_Layout",
+      "width": 66,
+      "height": 55,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B9C",
+      "border_filepath": "data/layouts/SaffronCity_Duplicate/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_Duplicate/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE",
+      "name": "SaffronCity_NorthSouthEntrance_Layout",
+      "width": 9,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE",
+      "name": "SaffronCity_EastWestEntrance_Layout",
+      "width": 13,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/SaffronCity_EastWestEntrance/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_EastWestEntrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE",
+      "name": "DiglettsCave_NorthEntrance_Layout",
+      "width": 10,
+      "height": 8,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E0C",
+      "border_filepath": "data/layouts/DiglettsCave_NorthEntrance/border.bin",
+      "blockdata_filepath": "data/layouts/DiglettsCave_NorthEntrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE",
+      "name": "DiglettsCave_SouthEntrance_Layout",
+      "width": 10,
+      "height": 8,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E0C",
+      "border_filepath": "data/layouts/DiglettsCave_SouthEntrance/border.bin",
+      "blockdata_filepath": "data/layouts/DiglettsCave_SouthEntrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_INDIGO_PLATEAU_POKEMON_CENTER_1F",
+      "name": "IndigoPlateau_PokemonCenter_1F_Layout",
+      "width": 25,
+      "height": 18,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BE4",
+      "border_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_LEAGUE_LORELEIS_ROOM",
+      "name": "PokemonLeague_LoreleisRoom_Layout",
+      "width": 13,
+      "height": 13,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D50C4",
+      "border_filepath": "data/layouts/PokemonLeague_LoreleisRoom/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonLeague_LoreleisRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM",
+      "name": "PokemonLeague_BrunosRoom_Layout",
+      "width": 13,
+      "height": 13,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D50C4",
+      "border_filepath": "data/layouts/PokemonLeague_BrunosRoom/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonLeague_BrunosRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM",
+      "name": "PokemonLeague_AgathasRoom_Layout",
+      "width": 13,
+      "height": 13,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D50C4",
+      "border_filepath": "data/layouts/PokemonLeague_AgathasRoom/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonLeague_AgathasRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM",
+      "name": "PokemonLeague_LancesRoom_Layout",
+      "width": 28,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D50C4",
+      "border_filepath": "data/layouts/PokemonLeague_LancesRoom/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonLeague_LancesRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM",
+      "name": "PokemonLeague_ChampionsRoom_Layout",
+      "width": 13,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D50C4",
+      "border_filepath": "data/layouts/PokemonLeague_ChampionsRoom/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonLeague_ChampionsRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME",
+      "name": "PokemonLeague_HallOfFame_Layout",
+      "width": 11,
+      "height": 13,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D50DC",
+      "border_filepath": "data/layouts/PokemonLeague_HallOfFame/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonLeague_HallOfFame/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE21_SOUTH",
+      "name": "Route21_South_Layout",
+      "width": 24,
+      "height": 50,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B6C",
+      "border_filepath": "data/layouts/Route21_South/border.bin",
+      "blockdata_filepath": "data/layouts/Route21_South/map.bin"
+    },
+    {
+      "id": "LAYOUT_ENTRANCE_2F",
+      "name": "Entrance_2F_Layout",
+      "width": 13,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/Entrance_2F/border.bin",
+      "blockdata_filepath": "data/layouts/Entrance_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE2_ENTRANCE",
+      "name": "Route2_Entrance_Layout",
+      "width": 15,
+      "height": 12,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/Route2_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/Route2_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE22_NORTH_ENTRANCE",
+      "name": "Route22_NorthEntrance_Layout",
+      "width": 15,
+      "height": 12,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/Route22_NorthEntrance/border.bin",
+      "blockdata_filepath": "data/layouts/Route22_NorthEntrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F",
+      "name": "Route16_NorthEntrance_1F_Layout",
+      "width": 13,
+      "height": 18,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/Route16_NorthEntrance_1F/border.bin",
+      "blockdata_filepath": "data/layouts/Route16_NorthEntrance_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ENTRANCE_1F",
+      "name": "Entrance_1F_Layout",
+      "width": 13,
+      "height": 12,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/Entrance_1F/border.bin",
+      "blockdata_filepath": "data/layouts/Entrance_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR",
+      "name": "RocketHideout_Elevator_Layout",
+      "width": 5,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/RocketHideout_Elevator/border.bin",
+      "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
+      "name": "SaffronCity_House1_1F_Layout",
+      "width": 13,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C74",
+      "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
+      "name": "SaffronCity_House1_2F_Layout",
+      "width": 12,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4C74",
+      "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY_DOJO",
+      "name": "SaffronCity_Dojo_Layout",
+      "width": 13,
+      "height": 16,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4D04",
+      "border_filepath": "data/layouts/SaffronCity_Dojo/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_Dojo/map.bin"
+    },
+    {
+      "id": "LAYOUT_SILPH_CO_ELEVATOR",
+      "name": "SilphCo_Elevator_Layout",
+      "width": 5,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SilphCo_Elevator/border.bin",
+      "blockdata_filepath": "data/layouts/SilphCo_Elevator/map.bin"
+    },
+    {
+      "id": "LAYOUT_ONE_ISLAND",
+      "name": "OneIsland_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/OneIsland/border.bin",
+      "blockdata_filepath": "data/layouts/OneIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_TWO_ISLAND",
+      "name": "TwoIsland_Layout",
+      "width": 48,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/TwoIsland/border.bin",
+      "blockdata_filepath": "data/layouts/TwoIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_THREE_ISLAND",
+      "name": "ThreeIsland_Layout",
+      "width": 24,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/ThreeIsland/border.bin",
+      "blockdata_filepath": "data/layouts/ThreeIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_FOUR_ISLAND",
+      "name": "FourIsland_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D5064",
+      "border_filepath": "data/layouts/FourIsland/border.bin",
+      "blockdata_filepath": "data/layouts/FourIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND",
+      "name": "FiveIsland_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D5064",
+      "border_filepath": "data/layouts/FiveIsland/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND",
+      "name": "SevenIsland_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SevenIsland/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND",
+      "name": "SixIsland_Layout",
+      "width": 24,
+      "height": 30,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SixIsland/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_ONE_ISLAND_KINDLE_ROAD",
+      "name": "OneIsland_KindleRoad_Layout",
+      "width": 24,
+      "height": 140,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/OneIsland_KindleRoad/border.bin",
+      "blockdata_filepath": "data/layouts/OneIsland_KindleRoad/map.bin"
+    },
+    {
+      "id": "LAYOUT_ONE_ISLAND_TREASURE_BEACH",
+      "name": "OneIsland_TreasureBeach_Layout",
+      "width": 24,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/OneIsland_TreasureBeach/border.bin",
+      "blockdata_filepath": "data/layouts/OneIsland_TreasureBeach/map.bin"
+    },
+    {
+      "id": "LAYOUT_TWO_ISLAND_CAPE_BRINK",
+      "name": "TwoIsland_CapeBrink_Layout",
+      "width": 24,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/TwoIsland_CapeBrink/border.bin",
+      "blockdata_filepath": "data/layouts/TwoIsland_CapeBrink/map.bin"
+    },
+    {
+      "id": "LAYOUT_THREE_ISLAND_BOND_BRIDGE",
+      "name": "ThreeIsland_BondBridge_Layout",
+      "width": 96,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/ThreeIsland_BondBridge/border.bin",
+      "blockdata_filepath": "data/layouts/ThreeIsland_BondBridge/map.bin"
+    },
+    {
+      "id": "LAYOUT_THREE_ISLAND_PORT",
+      "name": "ThreeIsland_Port_Layout",
+      "width": 48,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/ThreeIsland_Port/border.bin",
+      "blockdata_filepath": "data/layouts/ThreeIsland_Port/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_03_50",
+      "name": "UnknownMap_03_50_Layout",
+      "width": 1,
+      "height": 1,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/UnknownMap_03_50/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_03_50/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_03_51",
+      "name": "UnknownMap_03_51_Layout",
+      "width": 1,
+      "height": 1,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/UnknownMap_03_51/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_03_51/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_03_52",
+      "name": "UnknownMap_03_52_Layout",
+      "width": 84,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/UnknownMap_03_52/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_03_52/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_03_53",
+      "name": "UnknownMap_03_53_Layout",
+      "width": 24,
+      "height": 60,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4B3C",
+      "border_filepath": "data/layouts/UnknownMap_03_53/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_03_53/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS",
+      "name": "FiveIsland_ResortGorgeous_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D5064",
+      "border_filepath": "data/layouts/FiveIsland_ResortGorgeous/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH",
+      "name": "FiveIsland_WaterLabyrinth_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D5064",
+      "border_filepath": "data/layouts/FiveIsland_WaterLabyrinth/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_WaterLabyrinth/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_MEADOW",
+      "name": "FiveIsland_Meadow_Layout",
+      "width": 24,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D5064",
+      "border_filepath": "data/layouts/FiveIsland_Meadow/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_Meadow/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR",
+      "name": "FiveIsland_MemorialPillar_Layout",
+      "width": 24,
+      "height": 60,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D5064",
+      "border_filepath": "data/layouts/FiveIsland_MemorialPillar/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_MemorialPillar/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND",
+      "name": "SixIsland_OutcastIsland_Layout",
+      "width": 24,
+      "height": 80,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SixIsland_OutcastIsland/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_OutcastIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_GREEN_PATH",
+      "name": "SixIsland_GreenPath_Layout",
+      "width": 72,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SixIsland_GreenPath/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_GreenPath/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_WATER_PATH",
+      "name": "SixIsland_WaterPath_Layout",
+      "width": 24,
+      "height": 100,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SixIsland_WaterPath/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_WaterPath/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_RUIN_VALLEY",
+      "name": "SixIsland_RuinValley_Layout",
+      "width": 48,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SixIsland_RuinValley/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_RuinValley/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER",
+      "name": "SevenIsland_TrainerTower_Layout",
+      "width": 120,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE",
+      "name": "SevenIsland_SevaultCanyon_Entrance_Layout",
+      "width": 24,
+      "height": 40,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON",
+      "name": "SevenIsland_SevaultCanyon_Layout",
+      "width": 24,
+      "height": 80,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SevenIsland_SevaultCanyon/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS",
+      "name": "SevenIsland_TanobyRuins_Layout",
+      "width": 144,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/SevenIsland_TanobyRuins/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_833614C",
+      "name": "UnusedLayout_833614C_Layout",
+      "width": 24,
+      "height": 60,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AAC",
+      "border_filepath": "data/layouts/UnusedLayout_833614C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_833614C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_83377F0",
+      "name": "UnusedLayout_83377F0_Layout",
+      "width": 144,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AAC",
+      "border_filepath": "data/layouts/UnusedLayout_83377F0/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_83377F0/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_8338354",
+      "name": "UnusedLayout_8338354_Layout",
+      "width": 24,
+      "height": 60,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AAC",
+      "border_filepath": "data/layouts/UnusedLayout_8338354/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_8338354/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_8338738",
+      "name": "UnusedLayout_8338738_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4AAC",
+      "border_filepath": "data/layouts/UnusedLayout_8338738/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_00_04",
+      "name": "UnknownMap_00_04_Layout",
+      "width": 15,
+      "height": 12,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D50DC",
+      "border_filepath": "data/layouts/UnknownMap_00_04/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_00_04/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB",
+      "name": "SaffronCity_PokemonTrainerFanClub_Layout",
+      "width": 11,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F74",
+      "border_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_8338B4C",
+      "name": "UnusedLayout_8338B4C_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/UnusedLayout_8338B4C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_8338B4C/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2",
+      "name": "SevenIsland_House_Room2_Layout",
+      "width": 12,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/SevenIsland_House_Room2/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin"
+    },
+    {
+      "id": "LAYOUT_VIRIDIAN_CITY_HOUSE2",
+      "name": "ViridianCity_House2_Layout",
+      "width": 10,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F5C",
+      "border_filepath": "data/layouts/ViridianCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/ViridianCity_House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_8338E90",
+      "name": "UnusedLayout_8338E90_Layout",
+      "width": 15,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F44",
+      "border_filepath": "data/layouts/UnusedLayout_8338E90/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_8338E90/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_833902C",
+      "name": "UnusedLayout_833902C_Layout",
+      "width": 17,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F44",
+      "border_filepath": "data/layouts/UnusedLayout_833902C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_833902C/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_RUBY_PATH_B4F",
+      "name": "MtEmber_RubyPath_B4F_Layout",
+      "width": 18,
+      "height": 16,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_RubyPath_B4F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_THREE_ISLAND_BERRY_FOREST",
+      "name": "ThreeIsland_BerryForest_Layout",
+      "width": 57,
+      "height": 47,
+      "border_width": 3,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D5004",
+      "border_filepath": "data/layouts/ThreeIsland_BerryForest/border.bin",
+      "blockdata_filepath": "data/layouts/ThreeIsland_BerryForest/map.bin"
+    },
+    {
+      "id": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F",
+      "name": "OneIsland_PokemonCenter_1F_Layout",
+      "width": 19,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BE4",
+      "border_filepath": "data/layouts/OneIsland_PokemonCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER",
+      "name": "TwoIsland_JoyfulGameCorner_Layout",
+      "width": 12,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4CEC",
+      "border_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/border.bin",
+      "blockdata_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/map.bin"
+    },
+    {
+      "id": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB",
+      "name": "VermilionCity_PokemonFanClub_Layout",
+      "width": 12,
+      "height": 12,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F74",
+      "border_filepath": "data/layouts/VermilionCity_PokemonFanClub/border.bin",
+      "blockdata_filepath": "data/layouts/VermilionCity_PokemonFanClub/map.bin"
+    },
+    {
+      "id": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE",
+      "name": "LavenderTown_VolunteerPokemonHouse_Layout",
+      "width": 12,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F74",
+      "border_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin",
+      "blockdata_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE5_POKEMON_DAY_CARE",
+      "name": "Route5_PokemonDayCare_Layout",
+      "width": 12,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F74",
+      "border_filepath": "data/layouts/Route5_PokemonDayCare/border.bin",
+      "blockdata_filepath": "data/layouts/Route5_PokemonDayCare/map.bin"
+    },
+    {
+      "id": "LAYOUT_VIRIDIAN_CITY_HOUSE1",
+      "name": "ViridianCity_House1_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/ViridianCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE",
+      "name": "FourIsland_PokemonDayCare_Layout",
+      "width": 12,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4F74",
+      "border_filepath": "data/layouts/FourIsland_PokemonDayCare/border.bin",
+      "blockdata_filepath": "data/layouts/FourIsland_PokemonDayCare/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_833B6EC",
+      "name": "UnusedLayout_833B6EC_Layout",
+      "width": 38,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/UnusedLayout_833B6EC/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_833B6EC/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_833BE30",
+      "name": "UnusedLayout_833BE30_Layout",
+      "width": 38,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/UnusedLayout_833BE30/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_833BE30/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_EXTERIOR",
+      "name": "MtEmber_Exterior_Layout",
+      "width": 57,
+      "height": 54,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/MtEmber_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_SUMMIT",
+      "name": "MtEmber_Summit_Layout",
+      "width": 19,
+      "height": 22,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/MtEmber_Summit/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_Summit/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F",
+      "name": "MtEmber_SummitPath_1F_Layout",
+      "width": 15,
+      "height": 18,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_SummitPath_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_SummitPath_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F",
+      "name": "MtEmber_SummitPath_2F_Layout",
+      "width": 48,
+      "height": 46,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_SummitPath_2F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_SummitPath_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F",
+      "name": "MtEmber_SummitPath_3F_Layout",
+      "width": 15,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_SummitPath_3F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_SummitPath_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_RUBY_PATH_1F",
+      "name": "MtEmber_RubyPath_1F_Layout",
+      "width": 27,
+      "height": 19,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_RubyPath_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_RubyPath_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_RUBY_PATH_B1F",
+      "name": "MtEmber_RubyPath_B1F_Layout",
+      "width": 11,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_RubyPath_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_RUBY_PATH_B2F",
+      "name": "MtEmber_RubyPath_B2F_Layout",
+      "width": 16,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_RubyPath_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_RUBY_PATH_B3F",
+      "name": "MtEmber_RubyPath_B3F_Layout",
+      "width": 31,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_RubyPath_B3F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS",
+      "name": "MtEmber_RubyPath_B1F_Stairs_Layout",
+      "width": 6,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS",
+      "name": "MtEmber_RubyPath_B2F_Stairs_Layout",
+      "width": 8,
+      "height": 6,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_EMBER_RUBY_PATH_B5F",
+      "name": "MtEmber_RubyPath_B5F_Layout",
+      "width": 16,
+      "height": 15,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/MtEmber_RubyPath_B5F/border.bin",
+      "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE",
+      "name": "FiveIsland_RocketWarehouse_Layout",
+      "width": 29,
+      "height": 27,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/FiveIsland_RocketWarehouse/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_RocketWarehouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE",
+      "name": "FourIsland_IcefallCave_Entrance_Layout",
+      "width": 30,
+      "height": 36,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F",
+      "name": "FourIsland_IcefallCave_1F_Layout",
+      "width": 20,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/FourIsland_IcefallCave_1F/border.bin",
+      "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F",
+      "name": "FourIsland_IcefallCave_B1F_Layout",
+      "width": 24,
+      "height": 20,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/FourIsland_IcefallCave_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK",
+      "name": "FourIsland_IcefallCave_Back_Layout",
+      "width": 25,
+      "height": 26,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/FourIsland_IcefallCave_Back/border.bin",
+      "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Back/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+      "name": "SevenIsland_TrainerTower_Lobby_Layout",
+      "width": 19,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F",
+      "name": "SevenIsland_TrainerTower_1F_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F",
+      "name": "SevenIsland_TrainerTower_2F_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_2F/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F",
+      "name": "SevenIsland_TrainerTower_3F_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_3F/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F",
+      "name": "SevenIsland_TrainerTower_4F_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_4F/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F",
+      "name": "SevenIsland_TrainerTower_5F_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_5F/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F",
+      "name": "SevenIsland_TrainerTower_6F_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_6F/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_6F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F",
+      "name": "SevenIsland_TrainerTower_7F_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_7F/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_7F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F",
+      "name": "SevenIsland_TrainerTower_8F_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_8F/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_8F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
+      "name": "SevenIsland_TrainerTower_Roof_Layout",
+      "width": 18,
+      "height": 16,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "name": "SevenIsland_TrainerTower_Elevator_Layout",
+      "width": 5,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4ECC",
+      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/map.bin"
+    },
+    {
+      "id": "LAYOUT_CERULEAN_CITY_HOUSE5",
+      "name": "CeruleanCity_House5_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E84",
+      "border_filepath": "data/layouts/CeruleanCity_House5/border.bin",
+      "blockdata_filepath": "data/layouts/CeruleanCity_House5/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F",
+      "name": "SixIsland_DottedHole_1F_Layout",
+      "width": 16,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/SixIsland_DottedHole_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_DottedHole_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F",
+      "name": "SixIsland_DottedHole_B1F_Layout",
+      "width": 13,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/SixIsland_DottedHole_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F",
+      "name": "SixIsland_DottedHole_B2F_Layout",
+      "width": 13,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/SixIsland_DottedHole_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F",
+      "name": "SixIsland_DottedHole_B3F_Layout",
+      "width": 13,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/SixIsland_DottedHole_B3F/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F",
+      "name": "SixIsland_DottedHole_B4F_Layout",
+      "width": 13,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/SixIsland_DottedHole_B4F/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM",
+      "name": "SixIsland_DottedHole_SapphireRoom_Layout",
+      "width": 16,
+      "height": 15,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_ISLAND_HARBOR",
+      "name": "Island_Harbor_Layout",
+      "width": 17,
+      "height": 13,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D50AC",
+      "border_filepath": "data/layouts/Island_Harbor/border.bin",
+      "blockdata_filepath": "data/layouts/Island_Harbor/map.bin"
+    },
+    {
+      "id": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F",
+      "name": "OneIsland_PokemonCenter_2F_Layout",
+      "width": 15,
+      "height": 10,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4BE4",
+      "border_filepath": "data/layouts/OneIsland_PokemonCenter_2F/border.bin",
+      "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_PATTERN_BUSH",
+      "name": "SixIsland_PatternBush_Layout",
+      "width": 60,
+      "height": 32,
+      "border_width": 3,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4DC4",
+      "border_filepath": "data/layouts/SixIsland_PatternBush/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_PatternBush/map.bin"
+    },
+    {
+      "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL",
+      "name": "ThreeIsland_DunsparceTunnel_Layout",
+      "width": 30,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/border.bin",
+      "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_83453C0",
+      "name": "UnusedLayout_83453C0_Layout",
+      "width": 30,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
+      "name": "FiveIsland_LostCave_Entrance_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "name": "FiveIsland_LostCave_Room1_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room1/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room1/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2",
+      "name": "FiveIsland_LostCave_Room2_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room2/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room2/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3",
+      "name": "FiveIsland_LostCave_Room3_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room3/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room3/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4",
+      "name": "FiveIsland_LostCave_Room4_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room4/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room4/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5",
+      "name": "FiveIsland_LostCave_Room5_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room5/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room5/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6",
+      "name": "FiveIsland_LostCave_Room6_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room6/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room6/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7",
+      "name": "FiveIsland_LostCave_Room7_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room7/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room7/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8",
+      "name": "FiveIsland_LostCave_Room8_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room8/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room8/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9",
+      "name": "FiveIsland_LostCave_Room9_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room9/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room9/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10",
+      "name": "FiveIsland_LostCave_Room10_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room10/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room10/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11",
+      "name": "FiveIsland_LostCave_Room11_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room11/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room11/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12",
+      "name": "FiveIsland_LostCave_Room12_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room12/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room12/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13",
+      "name": "FiveIsland_LostCave_Room13_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room13/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room13/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14",
+      "name": "FiveIsland_LostCave_Room14_Layout",
+      "width": 11,
+      "height": 11,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4BFC",
+      "border_filepath": "data/layouts/FiveIsland_LostCave_Room14/border.bin",
+      "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room14/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER",
+      "name": "SevenIsland_TanobyRuins_MoneanChamber_Layout",
+      "width": 23,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5034",
+      "border_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER",
+      "name": "SevenIsland_TanobyRuins_LiptooChamber_Layout",
+      "width": 23,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5034",
+      "border_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER",
+      "name": "SevenIsland_TanobyRuins_WeepthChamber_Layout",
+      "width": 23,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5034",
+      "border_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER",
+      "name": "SevenIsland_TanobyRuins_DilfordChamber_Layout",
+      "width": 23,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5034",
+      "border_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER",
+      "name": "SevenIsland_TanobyRuins_ScufibChamber_Layout",
+      "width": 23,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5034",
+      "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin"
+    },
+    {
+      "id": "LAYOUT_SIX_ISLAND_ALTERING_CAVE",
+      "name": "SixIsland_AlteringCave_Layout",
+      "width": 32,
+      "height": 24,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4DF4",
+      "border_filepath": "data/layouts/SixIsland_AlteringCave/border.bin",
+      "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
+      "name": "SevenIsland_SeavaultCanyon_TanobyKey_Layout",
+      "width": 15,
+      "height": 16,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4E0C",
+      "border_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin"
+    },
+    {
+      "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
+      "name": "BirthIsland_Exterior_Layout",
+      "width": 30,
+      "height": 30,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D507C",
+      "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_EXTERIOR",
+      "name": "NavelRock_Exterior_Layout",
+      "width": 20,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D504C",
+      "border_filepath": "data/layouts/NavelRock_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_1F",
+      "name": "NavelRock_1F_Layout",
+      "width": 17,
+      "height": 26,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_1F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_SUMMIT",
+      "name": "NavelRock_Summit_Layout",
+      "width": 19,
+      "height": 25,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_Summit/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Summit/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE",
+      "name": "NavelRock_Base_Layout",
+      "width": 21,
+      "height": 23,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_Base/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Base/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F",
+      "name": "NavelRock_SummitPath_2F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_SummitPath_2F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_SummitPath_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F",
+      "name": "NavelRock_SummitPath_3F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_SummitPath_3F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_SummitPath_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F",
+      "name": "NavelRock_SummitPath_4F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_SummitPath_4F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_SummitPath_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F",
+      "name": "NavelRock_SummitPath_5F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_SummitPath_5F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_SummitPath_5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F",
+      "name": "NavelRock_BasePath_B1F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F",
+      "name": "NavelRock_BasePath_B2F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F",
+      "name": "NavelRock_BasePath_B3F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B3F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F",
+      "name": "NavelRock_BasePath_B4F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B4F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F",
+      "name": "NavelRock_BasePath_B5F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B5F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F",
+      "name": "NavelRock_BasePath_B6F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B6F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B6F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F",
+      "name": "NavelRock_BasePath_B7F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B7F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B7F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F",
+      "name": "NavelRock_BasePath_B8F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B8F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B8F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F",
+      "name": "NavelRock_BasePath_B9F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B9F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B9F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F",
+      "name": "NavelRock_BasePath_B10F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B10F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B10F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F",
+      "name": "NavelRock_BasePath_B11F_Layout",
+      "width": 7,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_BasePath_B11F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_BasePath_B11F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER",
+      "name": "SevenIsland_TanobyRuins_RixyChamber_Layout",
+      "width": 23,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5034",
+      "border_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER",
+      "name": "SevenIsland_TanobyRuins_ViapoisChamber_Layout",
+      "width": 23,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5034",
+      "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_B1F",
+      "name": "NavelRock_B1F_Layout",
+      "width": 17,
+      "height": 7,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_FORK",
+      "name": "NavelRock_Fork_Layout",
+      "width": 30,
+      "height": 100,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D501C",
+      "border_filepath": "data/layouts/NavelRock_Fork/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834BC2C",
+      "name": "UnusedLayout_834BC2C_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834BC2C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834BC2C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834BEB4",
+      "name": "UnusedLayout_834BEB4_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834BEB4/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834BEB4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834C13C",
+      "name": "UnusedLayout_834C13C_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834C13C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834C13C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834C3C4",
+      "name": "UnusedLayout_834C3C4_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834C3C4/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834C3C4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834C64C",
+      "name": "UnusedLayout_834C64C_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834C64C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834C64C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834C8D4",
+      "name": "UnusedLayout_834C8D4_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834C8D4/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834C8D4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834CB5C",
+      "name": "UnusedLayout_834CB5C_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834CB5C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834CB5C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834CDE4",
+      "name": "UnusedLayout_834CDE4_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834CDE4/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834CDE4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834D06C",
+      "name": "UnusedLayout_834D06C_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834D06C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834D06C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834D2F4",
+      "name": "UnusedLayout_834D2F4_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834D2F4/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834D2F4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834D57C",
+      "name": "UnusedLayout_834D57C_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834D57C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834D57C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834D804",
+      "name": "UnusedLayout_834D804_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834D804/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834D804/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834DA8C",
+      "name": "UnusedLayout_834DA8C_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834DA8C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834DA8C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834DD14",
+      "name": "UnusedLayout_834DD14_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834DD14/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834DD14/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834DF9C",
+      "name": "UnusedLayout_834DF9C_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834DF9C/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834DF9C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNUSED_LAYOUT_834E224",
+      "name": "UnusedLayout_834E224_Layout",
+      "width": 18,
+      "height": 17,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D5094",
+      "border_filepath": "data/layouts/UnusedLayout_834E224/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedLayout_834E224/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1",
+      "name": "SevenIsland_House_Room1_Layout",
+      "width": 11,
+      "height": 9,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4BB4",
+      "secondary_tileset": "gTileset_82D4E24",
+      "border_filepath": "data/layouts/SevenIsland_House_Room1/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_House_Room1/map.bin"
+    },
+    {
+      "id": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA",
+      "name": "OneIsland_KindleRoad_EmberSpa_Layout",
+      "width": 27,
+      "height": 39,
+      "border_width": 2,
+      "border_height": 2,
+      "primary_tileset": "gTileset_82D4A94",
+      "secondary_tileset": "gTileset_82D4FEC",
+      "border_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin",
+      "blockdata_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc
new file mode 100644
index 000000000..460477812
--- /dev/null
+++ b/data/map_event_scripts.inc
@@ -0,0 +1,4753 @@
+
+	.include "data/maps/UnknownMap_00_00/scripts.inc"
+	.include "data/maps/UnknownMap_00_01/scripts.inc"
+	.include "data/maps/UnknownMap_00_02/scripts.inc"
+	.include "data/maps/UnknownMap_00_03/scripts.inc"
+	.include "data/maps/UnknownMap_00_04/scripts.inc"
+	.include "data/maps/ViridianForest/scripts.inc"
+	.include "data/maps/MtMoon_1F/scripts.inc"
+	.include "data/maps/MtMoon_B1F/scripts.inc"
+	.include "data/maps/MtMoon_B2F/scripts.inc"
+	.include "data/maps/SSAnne_Exterior/scripts.inc"
+	.include "data/maps/SSAnne_1F_Corridor/scripts.inc"
+	.include "data/maps/SSAnne_2F_Corridor/scripts.inc"
+	.include "data/maps/SSAnne_3F_Corridor/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Corridor/scripts.inc"
+	.include "data/maps/SSAnne_Deck/scripts.inc"
+	.include "data/maps/SSAnne_Kitchen/scripts.inc"
+	.include "data/maps/SSAnne_CaptainsOffice/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room1/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room2/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room3/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room4/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room5/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room7/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room1/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room2/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room3/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room4/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room5/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room6/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room1/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room2/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room3/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room4/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room5/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room6/scripts.inc"
+	.include "data/maps/UndergroundPath_NorthEntrance/scripts.inc"
+	.include "data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc"
+	.include "data/maps/UndergroundPath_SouthEntrance/scripts.inc"
+	.include "data/maps/UndergroundPath_WestEntrance/scripts.inc"
+	.include "data/maps/UndergroundPath_EastWestTunnel/scripts.inc"
+	.include "data/maps/UndergroundPath_EastEntrance/scripts.inc"
+	.include "data/maps/DiglettsCave_NorthEntrance/scripts.inc"
+	.include "data/maps/DiglettsCave_B1F/scripts.inc"
+	.include "data/maps/DiglettsCave_SouthEntrance/scripts.inc"
+	.include "data/maps/VictoryRoad_1F/scripts.inc"
+	.include "data/maps/VictoryRoad_2F/scripts.inc"
+	.include "data/maps/VictoryRoad_3F/scripts.inc"
+	.include "data/maps/RocketHideout_B1F/scripts.inc"
+	.include "data/maps/RocketHideout_B2F/scripts.inc"
+	.include "data/maps/RocketHideout_B3F/scripts.inc"
+	.include "data/maps/RocketHideout_B4F/scripts.inc"
+	.include "data/maps/RocketHideout_Elevator/scripts.inc"
+	.include "data/maps/SilphCo_1F/scripts.inc"
+	.include "data/maps/SilphCo_2F/scripts.inc"
+	.include "data/maps/SilphCo_3F/scripts.inc"
+	.include "data/maps/SilphCo_4F/scripts.inc"
+	.include "data/maps/SilphCo_5F/scripts.inc"
+	.include "data/maps/SilphCo_6F/scripts.inc"
+	.include "data/maps/SilphCo_7F/scripts.inc"
+	.include "data/maps/SilphCo_8F/scripts.inc"
+	.include "data/maps/SilphCo_9F/scripts.inc"
+	.include "data/maps/SilphCo_10F/scripts.inc"
+	.include "data/maps/SilphCo_11F/scripts.inc"
+	.include "data/maps/SilphCo_Elevator/scripts.inc"
+	.include "data/maps/PokemonMansion_1F/scripts.inc"
+	.include "data/maps/PokemonMansion_2F/scripts.inc"
+	.include "data/maps/PokemonMansion_3F/scripts.inc"
+	.include "data/maps/PokemonMansion_B1F/scripts.inc"
+	.include "data/maps/SafariZone_Center/scripts.inc"
+	.include "data/maps/SafariZone_East/scripts.inc"
+	.include "data/maps/SafariZone_North/scripts.inc"
+	.include "data/maps/SafariZone_West/scripts.inc"
+	.include "data/maps/SafariZone_Building1/scripts.inc"
+	.include "data/maps/SafariZone_Building2/scripts.inc"
+	.include "data/maps/SafariZone_Building3/scripts.inc"
+	.include "data/maps/SafariZone_Building4/scripts.inc"
+	.include "data/maps/SafariZone_SecretHouse/scripts.inc"
+	.include "data/maps/CeruleanCave_1F/scripts.inc"
+	.include "data/maps/CeruleanCave_2F/scripts.inc"
+	.include "data/maps/CeruleanCave_B1F/scripts.inc"
+	.include "data/maps/PokemonLeague_LoreleisRoom/scripts.inc"
+	.include "data/maps/PokemonLeague_BrunosRoom/scripts.inc"
+	.include "data/maps/PokemonLeague_AgathasRoom/scripts.inc"
+	.include "data/maps/PokemonLeague_LancesRoom/scripts.inc"
+	.include "data/maps/PokemonLeague_ChampionsRoom/scripts.inc"
+	.include "data/maps/PokemonLeague_HallOfFame/scripts.inc"
+	.include "data/maps/RockTunnel_1F/scripts.inc"
+	.include "data/maps/RockTunnel_B1F/scripts.inc"
+	.include "data/maps/SeafoamIslands_1F/scripts.inc"
+	.include "data/maps/SeafoamIslands_B1F/scripts.inc"
+	.include "data/maps/SeafoamIslands_B2F/scripts.inc"
+	.include "data/maps/SeafoamIslands_B3F/scripts.inc"
+	.include "data/maps/SeafoamIslands_B4F/scripts.inc"
+	.include "data/maps/PokemonTower_1F/scripts.inc"
+	.include "data/maps/PokemonTower_2F/scripts.inc"
+	.include "data/maps/PokemonTower_3F/scripts.inc"
+	.include "data/maps/PokemonTower_4F/scripts.inc"
+	.include "data/maps/PokemonTower_5F/scripts.inc"
+	.include "data/maps/PokemonTower_6F/scripts.inc"
+	.include "data/maps/PokemonTower_7F/scripts.inc"
+	.include "data/maps/PowerPlant/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B4F/scripts.inc"
+	.include "data/maps/MtEmber_Exterior/scripts.inc"
+	.include "data/maps/MtEmber_SummitPath_1F/scripts.inc"
+	.include "data/maps/MtEmber_SummitPath_2F/scripts.inc"
+	.include "data/maps/MtEmber_SummitPath_3F/scripts.inc"
+	.include "data/maps/MtEmber_Summit/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B5F/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_1F/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B1F/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B2F/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B3F/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc"
+	.include "data/maps/ThreeIsland_BerryForest/scripts.inc"
+	.include "data/maps/FourIsland_IcefallCave_Entrance/scripts.inc"
+	.include "data/maps/FourIsland_IcefallCave_1F/scripts.inc"
+	.include "data/maps/FourIsland_IcefallCave_B1F/scripts.inc"
+	.include "data/maps/FourIsland_IcefallCave_Back/scripts.inc"
+	.include "data/maps/FiveIsland_RocketWarehouse/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_1F/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_B1F/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_B2F/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_B3F/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_B4F/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc"
+	.include "data/maps/SixIsland_PatternBush/scripts.inc"
+	.include "data/maps/SixIsland_AlteringCave/scripts.inc"
+	.include "data/maps/NavelRock_Exterior/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_1F/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_2F/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_3F/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_4F/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_5F/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_6F/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_7F/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_8F/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_Roof/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Entrance/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room1/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room2/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room3/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room4/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room5/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room6/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room7/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room8/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room9/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room10/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room11/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room12/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room13/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room14/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc"
+	.include "data/maps/ThreeIsland_DunsparceTunnel/scripts.inc"
+	.include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc"
+	.include "data/maps/NavelRock_1F/scripts.inc"
+	.include "data/maps/NavelRock_Summit/scripts.inc"
+	.include "data/maps/NavelRock_Base/scripts.inc"
+	.include "data/maps/NavelRock_SummitPath_2F/scripts.inc"
+	.include "data/maps/NavelRock_SummitPath_3F/scripts.inc"
+	.include "data/maps/NavelRock_SummitPath_4F/scripts.inc"
+	.include "data/maps/NavelRock_SummitPath_5F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B1F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B2F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B3F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B4F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B5F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B6F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B7F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B8F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B9F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B10F/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B11F/scripts.inc"
+	.include "data/maps/NavelRock_B1F/scripts.inc"
+	.include "data/maps/NavelRock_Fork/scripts.inc"
+	.include "data/maps/BirthIsland_Exterior/scripts.inc"
+	.include "data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc"
+	.include "data/maps/BirthIsland_Harbor/scripts.inc"
+	.include "data/maps/PalletTown/scripts.inc"
+	.include "data/maps/ViridianCity/scripts.inc"
+	.include "data/maps/PewterCity/scripts.inc"
+	.include "data/maps/CeruleanCity/scripts.inc"
+	.include "data/maps/LavenderTown/scripts.inc"
+	.include "data/maps/VermilionCity/scripts.inc"
+	.include "data/maps/CeladonCity/scripts.inc"
+	.include "data/maps/FuchsiaCity/scripts.inc"
+	.include "data/maps/CinnabarIsland/scripts.inc"
+	.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
+	.include "data/maps/SaffronCity_Duplicate/scripts.inc"
+	.include "data/maps/SaffronCity/scripts.inc"
+	.include "data/maps/OneIsland/scripts.inc"
+	.include "data/maps/TwoIsland/scripts.inc"
+	.include "data/maps/ThreeIsland/scripts.inc"
+	.include "data/maps/FourIsland/scripts.inc"
+	.include "data/maps/FiveIsland/scripts.inc"
+	.include "data/maps/SevenIsland/scripts.inc"
+	.include "data/maps/SixIsland/scripts.inc"
+	.include "data/maps/Route1/scripts.inc"
+	.include "data/maps/Route2/scripts.inc"
+	.include "data/maps/Route3/scripts.inc"
+	.include "data/maps/Route4/scripts.inc"
+	.include "data/maps/Route5/scripts.inc"
+	.include "data/maps/Route6/scripts.inc"
+	.include "data/maps/Route7/scripts.inc"
+	.include "data/maps/Route8/scripts.inc"
+	.include "data/maps/Route9/scripts.inc"
+	.include "data/maps/Route10/scripts.inc"
+	.include "data/maps/Route11/scripts.inc"
+	.include "data/maps/Route12/scripts.inc"
+	.include "data/maps/Route13/scripts.inc"
+	.include "data/maps/Route14/scripts.inc"
+	.include "data/maps/Route15/scripts.inc"
+	.include "data/maps/Route16/scripts.inc"
+	.include "data/maps/Route17/scripts.inc"
+	.include "data/maps/Route18/scripts.inc"
+	.include "data/maps/Route19/scripts.inc"
+	.include "data/maps/Route20/scripts.inc"
+	.include "data/maps/Route21_North/scripts.inc"
+	.include "data/maps/Route21_South/scripts.inc"
+	.include "data/maps/Route22/scripts.inc"
+	.include "data/maps/Route23/scripts.inc"
+	.include "data/maps/Route24/scripts.inc"
+	.include "data/maps/Route25/scripts.inc"
+	.include "data/maps/OneIsland_KindleRoad/scripts.inc"
+	.include "data/maps/OneIsland_TreasureBeach/scripts.inc"
+	.include "data/maps/TwoIsland_CapeBrink/scripts.inc"
+	.include "data/maps/ThreeIsland_BondBridge/scripts.inc"
+	.include "data/maps/ThreeIsland_Port/scripts.inc"
+	.include "data/maps/UnknownMap_03_50/scripts.inc"
+	.include "data/maps/UnknownMap_03_51/scripts.inc"
+	.include "data/maps/UnknownMap_03_52/scripts.inc"
+	.include "data/maps/UnknownMap_03_53/scripts.inc"
+	.include "data/maps/FiveIsland_ResortGorgeous/scripts.inc"
+	.include "data/maps/FiveIsland_WaterLabyrinth/scripts.inc"
+	.include "data/maps/FiveIsland_Meadow/scripts.inc"
+	.include "data/maps/FiveIsland_MemorialPillar/scripts.inc"
+	.include "data/maps/SixIsland_OutcastIsland/scripts.inc"
+	.include "data/maps/SixIsland_GreenPath/scripts.inc"
+	.include "data/maps/SixIsland_WaterPath/scripts.inc"
+	.include "data/maps/SixIsland_RuinValley/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower/scripts.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins/scripts.inc"
+	.include "data/maps/PalletTown_PlayersHouse_1F/scripts.inc"
+	.include "data/maps/PalletTown_PlayersHouse_2F/scripts.inc"
+	.include "data/maps/PalletTown_GarysHouse/scripts.inc"
+	.include "data/maps/PalletTown_ProfessorOaksLab/scripts.inc"
+	.include "data/maps/ViridianCity_House1/scripts.inc"
+	.include "data/maps/ViridianCity_Gym/scripts.inc"
+	.include "data/maps/ViridianCity_House2/scripts.inc"
+	.include "data/maps/ViridianCity_Mart/scripts.inc"
+	.include "data/maps/ViridianCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/ViridianCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PewterCity_Museum_1F/scripts.inc"
+	.include "data/maps/PewterCity_Museum_2F/scripts.inc"
+	.include "data/maps/PewterCity_Gym/scripts.inc"
+	.include "data/maps/PewterCity_Mart/scripts.inc"
+	.include "data/maps/PewterCity_House1/scripts.inc"
+	.include "data/maps/PewterCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PewterCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PewterCity_House2/scripts.inc"
+	.include "data/maps/CeruleanCity_House1/scripts.inc"
+	.include "data/maps/CeruleanCity_House2/scripts.inc"
+	.include "data/maps/CeruleanCity_House3/scripts.inc"
+	.include "data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/CeruleanCity_Gym/scripts.inc"
+	.include "data/maps/CeruleanCity_BikeShop/scripts.inc"
+	.include "data/maps/CeruleanCity_Mart/scripts.inc"
+	.include "data/maps/CeruleanCity_House4/scripts.inc"
+	.include "data/maps/CeruleanCity_House5/scripts.inc"
+	.include "data/maps/LavenderTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LavenderTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc"
+	.include "data/maps/LavenderTown_House1/scripts.inc"
+	.include "data/maps/LavenderTown_House2/scripts.inc"
+	.include "data/maps/LavenderTown_Mart/scripts.inc"
+	.include "data/maps/VermilionCity_House1/scripts.inc"
+	.include "data/maps/VermilionCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/VermilionCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/VermilionCity_PokemonFanClub/scripts.inc"
+	.include "data/maps/VermilionCity_Mart/scripts.inc"
+	.include "data/maps/VermilionCity_Gym/scripts.inc"
+	.include "data/maps/VermilionCity_House3/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_1F/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_2F/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_3F/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_4F/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_5F/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_1F/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_2F/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_3F/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_Roof/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc"
+	.include "data/maps/CeladonCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/CeladonCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/CeladonCity_GameCorner/scripts.inc"
+	.include "data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc"
+	.include "data/maps/CeladonCity_Gym/scripts.inc"
+	.include "data/maps/CeladonCity_Restaurant/scripts.inc"
+	.include "data/maps/CeladonCity_House1/scripts.inc"
+	.include "data/maps/CeladonCity_Hotel/scripts.inc"
+	.include "data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc"
+	.include "data/maps/FuchsiaCity_Mart/scripts.inc"
+	.include "data/maps/FuchsiaCity_ZooBuilding/scripts.inc"
+	.include "data/maps/FuchsiaCity_Gym/scripts.inc"
+	.include "data/maps/FuchsiaCity_House1/scripts.inc"
+	.include "data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FuchsiaCity_Building1/scripts.inc"
+	.include "data/maps/FuchsiaCity_House2/scripts.inc"
+	.include "data/maps/FuchsiaCity_House3/scripts.inc"
+	.include "data/maps/CinnabarIsland_Gym/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/CinnabarIsland_Mart/scripts.inc"
+	.include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SaffronCity_House1_1F/scripts.inc"
+	.include "data/maps/SaffronCity_House1_2F/scripts.inc"
+	.include "data/maps/SaffronCity_Dojo/scripts.inc"
+	.include "data/maps/SaffronCity_Gym/scripts.inc"
+	.include "data/maps/SaffronCity_House2/scripts.inc"
+	.include "data/maps/SaffronCity_Mart/scripts.inc"
+	.include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SaffronCity_House3/scripts.inc"
+	.include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc"
+	.include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc"
+	.include "data/maps/Route2_House/scripts.inc"
+	.include "data/maps/Route2_EastBuilding/scripts.inc"
+	.include "data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc"
+	.include "data/maps/Route4_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/Route4_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/Route5_PokemonDayCare/scripts.inc"
+	.include "data/maps/Route5_SouthEntrance/scripts.inc"
+	.include "data/maps/Route6_NorthEntrance/scripts.inc"
+	.include "data/maps/UnknownMap_18_01/scripts.inc"
+	.include "data/maps/Route7_EastEntrance/scripts.inc"
+	.include "data/maps/Route8_WestEntrance/scripts.inc"
+	.include "data/maps/Route10_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/Route10_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/Route11_EastEntrance_1F/scripts.inc"
+	.include "data/maps/Route11_EastEntrance_2F/scripts.inc"
+	.include "data/maps/Route12_NorthEntrance_1F/scripts.inc"
+	.include "data/maps/Route12_NorthEntrance_2F/scripts.inc"
+	.include "data/maps/Route12_FishingHouse/scripts.inc"
+	.include "data/maps/Route15_WestEntrance_1F/scripts.inc"
+	.include "data/maps/Route15_WestEntrance_2F/scripts.inc"
+	.include "data/maps/Route16_House/scripts.inc"
+	.include "data/maps/Route16_NorthEntrance_1F/scripts.inc"
+	.include "data/maps/Route16_NorthEntrance_2F/scripts.inc"
+	.include "data/maps/Route18_EastEntrance_1F/scripts.inc"
+	.include "data/maps/Route18_EastEntrance_2F/scripts.inc"
+	.include "data/maps/UnusedHouse_27_00/scripts.inc"
+	.include "data/maps/Route22_NorthEntrance/scripts.inc"
+	.include "data/maps/UnusedHouse_29_00/scripts.inc"
+	.include "data/maps/Route25_SeaCottage/scripts.inc"
+	.include "data/maps/SevenIsland_House_Room1/scripts.inc"
+	.include "data/maps/SevenIsland_House_Room2/scripts.inc"
+	.include "data/maps/SevenIsland_Mart/scripts.inc"
+	.include "data/maps/SevenIsland_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SevenIsland_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/UnusedHouse_31_05/scripts.inc"
+	.include "data/maps/SevenIsland_Harbor/scripts.inc"
+	.include "data/maps/OneIsland_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/OneIsland_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/OneIsland_House1/scripts.inc"
+	.include "data/maps/OneIsland_House2/scripts.inc"
+	.include "data/maps/OneIsland_Harbor/scripts.inc"
+	.include "data/maps/TwoIsland_JoyfulGameCorner/scripts.inc"
+	.include "data/maps/TwoIsland_House/scripts.inc"
+	.include "data/maps/TwoIsland_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/TwoIsland_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/TwoIsland_Harbor/scripts.inc"
+	.include "data/maps/ThreeIsland_House1/scripts.inc"
+	.include "data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/ThreeIsland_Mart/scripts.inc"
+	.include "data/maps/ThreeIsland_House2/scripts.inc"
+	.include "data/maps/ThreeIsland_House3/scripts.inc"
+	.include "data/maps/ThreeIsland_House4/scripts.inc"
+	.include "data/maps/ThreeIsland_House5/scripts.inc"
+	.include "data/maps/FourIsland_PokemonDayCare/scripts.inc"
+	.include "data/maps/FourIsland_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FourIsland_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FourIsland_House1/scripts.inc"
+	.include "data/maps/FourIsland_LoreleisHouse/scripts.inc"
+	.include "data/maps/FourIsland_Harbor/scripts.inc"
+	.include "data/maps/FourIsland_House2/scripts.inc"
+	.include "data/maps/FourIsland_Mart/scripts.inc"
+	.include "data/maps/FiveIsland_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FiveIsland_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FiveIsland_Harbor/scripts.inc"
+	.include "data/maps/FiveIsland_House1/scripts.inc"
+	.include "data/maps/FiveIsland_House2/scripts.inc"
+	.include "data/maps/SixIsland_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SixIsland_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SixIsland_Harbor/scripts.inc"
+	.include "data/maps/SixIsland_House/scripts.inc"
+	.include "data/maps/SixIsland_Mart/scripts.inc"
+	.include "data/maps/ThreeIsland_Harbor/scripts.inc"
+	.include "data/maps/FiveIsland_ResortGorgeous_House/scripts.inc"
+	.include "data/maps/TwoIsland_CapeBrink_House/scripts.inc"
+	.include "data/maps/SixIsland_WaterPath_House1/scripts.inc"
+	.include "data/maps/SixIsland_WaterPath_House2/scripts.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon_House/scripts.inc"
+
+
+
+	.include "data/maps/ViridianForest/text.inc"
+	.include "data/maps/MtMoon_1F/text.inc"
+	.include "data/maps/MtMoon_B2F/text.inc"
+	.include "data/maps/SSAnne_1F_Corridor/text.inc"
+	.include "data/maps/SSAnne_2F_Corridor/text.inc"
+	.include "data/maps/SSAnne_3F_Corridor/text.inc"
+	.include "data/maps/SSAnne_Deck/text.inc"
+	.include "data/maps/SSAnne_Kitchen/text.inc"
+	.include "data/maps/SSAnne_CaptainsOffice/text.inc"
+	.include "data/maps/SSAnne_1F_Room1/text.inc"
+	.include "data/maps/SSAnne_1F_Room2/text.inc"
+	.include "data/maps/SSAnne_1F_Room3/text.inc"
+	.include "data/maps/SSAnne_1F_Room4/text.inc"
+	.include "data/maps/SSAnne_1F_Room5/text.inc"
+	.include "data/maps/SSAnne_1F_Room7/text.inc"
+	.include "data/maps/SSAnne_2F_Room1/text.inc"
+	.include "data/maps/SSAnne_2F_Room2/text.inc"
+	.include "data/maps/SSAnne_2F_Room3/text.inc"
+	.include "data/maps/SSAnne_2F_Room4/text.inc"
+	.include "data/maps/SSAnne_2F_Room5/text.inc"
+	.include "data/maps/SSAnne_2F_Room6/text.inc"
+	.include "data/maps/SSAnne_B1F_Room1/text.inc"
+	.include "data/maps/SSAnne_B1F_Room2/text.inc"
+	.include "data/maps/SSAnne_B1F_Room3/text.inc"
+	.include "data/maps/SSAnne_B1F_Room4/text.inc"
+	.include "data/maps/SSAnne_B1F_Room5/text.inc"
+	.include "data/maps/SSAnne_1F_Room6/text.inc"
+	.include "data/maps/UndergroundPath_SouthEntrance/text.inc"
+	.include "data/maps/UndergroundPath_WestEntrance/text.inc"
+	.include "data/maps/UndergroundPath_EastEntrance/text.inc"
+	.include "data/maps/DiglettsCave_NorthEntrance/text.inc"
+	.include "data/maps/DiglettsCave_SouthEntrance/text.inc"
+	.include "data/maps/VictoryRoad_1F/text.inc"
+	.include "data/maps/VictoryRoad_2F/text.inc"
+	.include "data/maps/VictoryRoad_3F/text.inc"
+	.include "data/maps/RocketHideout_B1F/text.inc"
+	.include "data/maps/RocketHideout_B2F/text.inc"
+	.include "data/maps/RocketHideout_B3F/text.inc"
+	.include "data/maps/RocketHideout_B4F/text.inc"
+	.include "data/maps/RocketHideout_Elevator/text.inc"
+	.include "data/maps/SilphCo_1F/text.inc"
+	.include "data/maps/SilphCo_2F/text.inc"
+	.include "data/maps/SilphCo_3F/text.inc"
+	.include "data/maps/SilphCo_4F/text.inc"
+	.include "data/maps/SilphCo_5F/text.inc"
+	.include "data/maps/SilphCo_6F/text.inc"
+	.include "data/maps/SilphCo_7F/text.inc"
+	.include "data/maps/SilphCo_8F/text.inc"
+	.include "data/maps/SilphCo_9F/text.inc"
+	.include "data/maps/SilphCo_10F/text.inc"
+	.include "data/maps/SilphCo_11F/text.inc"
+	.include "data/maps/PokemonMansion_1F/text.inc"
+	.include "data/maps/PokemonMansion_2F/text.inc"
+	.include "data/maps/PokemonMansion_3F/text.inc"
+	.include "data/maps/PokemonMansion_B1F/text.inc"
+	.include "data/maps/SafariZone_Center/text.inc"
+	.include "data/maps/SafariZone_East/text.inc"
+	.include "data/maps/SafariZone_North/text.inc"
+	.include "data/maps/SafariZone_West/text.inc"
+	.include "data/maps/SafariZone_Building1/text.inc"
+	.include "data/maps/SafariZone_Building2/text.inc"
+	.include "data/maps/SafariZone_Building3/text.inc"
+	.include "data/maps/SafariZone_Building4/text.inc"
+	.include "data/maps/SafariZone_SecretHouse/text.inc"
+	.include "data/maps/CeruleanCave_B1F/text.inc"
+	.include "data/maps/PokemonLeague_LoreleisRoom/text.inc"
+	.include "data/maps/PokemonLeague_BrunosRoom/text.inc"
+	.include "data/maps/PokemonLeague_AgathasRoom/text.inc"
+	.include "data/maps/PokemonLeague_LancesRoom/text.inc"
+	.include "data/maps/PokemonLeague_ChampionsRoom/text.inc"
+	.include "data/maps/PokemonLeague_HallOfFame/text.inc"
+	.include "data/maps/RockTunnel_1F/text.inc"
+	.include "data/maps/RockTunnel_B1F/text.inc"
+	.include "data/maps/SeafoamIslands_B4F/text.inc"
+	.include "data/maps/PokemonTower_1F/text.inc"
+	.include "data/maps/PokemonTower_2F/text.inc"
+	.include "data/maps/PokemonTower_3F/text.inc"
+	.include "data/maps/PokemonTower_4F/text.inc"
+	.include "data/maps/PokemonTower_5F/text.inc"
+	.include "data/maps/PokemonTower_6F/text.inc"
+	.include "data/maps/PokemonTower_7F/text.inc"
+	.include "data/maps/MtEmber_Exterior/text.inc"
+	.include "data/maps/MtEmber_RubyPath_B3F/text.inc"
+	.include "data/maps/ThreeIsland_BerryForest/text.inc"
+	.include "data/maps/FourIsland_IcefallCave_Back/text.inc"
+	.include "data/maps/FiveIsland_RocketWarehouse/text.inc"
+	.include "data/maps/SixIsland_DottedHole_SapphireRoom/text.inc"
+	.include "data/maps/SixIsland_PatternBush/text.inc"
+	.include "data/maps/SevenIsland_TrainerTower_Lobby/text.inc"
+	.include "data/maps/FiveIsland_LostCave_Room1/text.inc"
+	.include "data/maps/FiveIsland_LostCave_Room4/text.inc"
+	.include "data/maps/FiveIsland_LostCave_Room10/text.inc"
+	.include "data/maps/ThreeIsland_DunsparceTunnel/text.inc"
+	.include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc"
+	.include "data/maps/OneIsland_KindleRoad_EmberSpa/text.inc"
+	.include "data/maps/PalletTown/text.inc"
+	.include "data/maps/ViridianCity/text.inc"
+	.include "data/maps/PewterCity/text.inc"
+	.include "data/maps/CeruleanCity/text.inc"
+	.include "data/maps/LavenderTown/text.inc"
+	.include "data/maps/VermilionCity/text.inc"
+	.include "data/maps/CeladonCity/text.inc"
+	.include "data/maps/FuchsiaCity/text.inc"
+	.include "data/maps/CinnabarIsland/text.inc"
+	.include "data/maps/SaffronCity_Duplicate/text.inc"
+	.include "data/maps/OneIsland/text.inc"
+	.include "data/maps/TwoIsland/text.inc"
+	.include "data/maps/ThreeIsland/text.inc"
+	.include "data/maps/FourIsland/text.inc"
+	.include "data/maps/FiveIsland/text.inc"
+	.include "data/maps/SevenIsland/text.inc"
+	.include "data/maps/SixIsland/text.inc"
+	.include "data/maps/Route1/text.inc"
+	.include "data/maps/Route2/text.inc"
+	.include "data/maps/Route3/text.inc"
+	.include "data/maps/Route4/text.inc"
+	.include "data/maps/Route5/text.inc"
+	.include "data/maps/Route6/text.inc"
+	.include "data/maps/Route7/text.inc"
+	.include "data/maps/Route8/text.inc"
+	.include "data/maps/Route9/text.inc"
+	.include "data/maps/Route10/text.inc"
+	.include "data/maps/Route11/text.inc"
+	.include "data/maps/Route12/text.inc"
+	.include "data/maps/Route13/text.inc"
+	.include "data/maps/Route14/text.inc"
+	.include "data/maps/Route15/text.inc"
+	.include "data/maps/Route16/text.inc"
+	.include "data/maps/Route17/text.inc"
+	.include "data/maps/Route18/text.inc"
+	.include "data/maps/Route19/text.inc"
+	.include "data/maps/Route20/text.inc"
+	.include "data/maps/Route22/text.inc"
+	.include "data/maps/Route23/text.inc"
+	.include "data/maps/Route24/text.inc"
+	.include "data/maps/Route25/text.inc"
+	.include "data/maps/OneIsland_KindleRoad/text.inc"
+	.include "data/maps/OneIsland_TreasureBeach/text.inc"
+	.include "data/maps/ThreeIsland_BondBridge/text.inc"
+	.include "data/maps/ThreeIsland_Port/text.inc"
+	.include "data/maps/FiveIsland_ResortGorgeous/text.inc"
+	.include "data/maps/FiveIsland_WaterLabyrinth/text.inc"
+	.include "data/maps/FiveIsland_Meadow/text.inc"
+	.include "data/maps/FiveIsland_MemorialPillar/text.inc"
+	.include "data/maps/SixIsland_OutcastIsland/text.inc"
+	.include "data/maps/SixIsland_GreenPath/text.inc"
+	.include "data/maps/SixIsland_WaterPath/text.inc"
+	.include "data/maps/SixIsland_RuinValley/text.inc"
+	.include "data/maps/SevenIsland_TrainerTower/text.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon/text.inc"
+	.include "data/maps/PalletTown_PlayersHouse_1F/text.inc"
+	.include "data/maps/PalletTown_PlayersHouse_2F/text.inc"
+	.include "data/maps/PalletTown_GarysHouse/text.inc"
+	.include "data/maps/PalletTown_ProfessorOaksLab/text.inc"
+	.include "data/maps/ViridianCity_House1/text.inc"
+	.include "data/maps/ViridianCity_Gym/text.inc"
+	.include "data/maps/ViridianCity_House2/text.inc"
+	.include "data/maps/ViridianCity_Mart/text.inc"
+	.include "data/maps/ViridianCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/PewterCity_Museum_1F/text.inc"
+	.include "data/maps/PewterCity_Museum_2F/text.inc"
+	.include "data/maps/PewterCity_Gym/text.inc"
+	.include "data/maps/PewterCity_Mart/text.inc"
+	.include "data/maps/PewterCity_House1/text.inc"
+	.include "data/maps/PewterCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/PewterCity_House2/text.inc"
+	.include "data/maps/CeruleanCity_House1/text.inc"
+	.include "data/maps/CeruleanCity_House2/text.inc"
+	.include "data/maps/CeruleanCity_House3/text.inc"
+	.include "data/maps/CeruleanCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/CeruleanCity_Gym/text.inc"
+	.include "data/maps/CeruleanCity_BikeShop/text.inc"
+	.include "data/maps/CeruleanCity_Mart/text.inc"
+	.include "data/maps/CeruleanCity_House4/text.inc"
+	.include "data/maps/CeruleanCity_House5/text.inc"
+	.include "data/maps/LavenderTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/LavenderTown_VolunteerPokemonHouse/text.inc"
+	.include "data/maps/LavenderTown_House1/text.inc"
+	.include "data/maps/LavenderTown_House2/text.inc"
+	.include "data/maps/LavenderTown_Mart/text.inc"
+	.include "data/maps/VermilionCity_House1/text.inc"
+	.include "data/maps/VermilionCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/VermilionCity_PokemonFanClub/text.inc"
+	.include "data/maps/VermilionCity_Mart/text.inc"
+	.include "data/maps/VermilionCity_Gym/text.inc"
+	.include "data/maps/VermilionCity_House3/text.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_1F/text.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_2F/text.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_3F/text.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_4F/text.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_5F/text.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_Roof/text.inc"
+	.include "data/maps/CeladonCity_Condominiums_1F/text.inc"
+	.include "data/maps/CeladonCity_Condominiums_2F/text.inc"
+	.include "data/maps/CeladonCity_Condominiums_3F/text.inc"
+	.include "data/maps/CeladonCity_Condominiums_Roof/text.inc"
+	.include "data/maps/CeladonCity_Condominiums_RoofRoom/text.inc"
+	.include "data/maps/CeladonCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/CeladonCity_GameCorner/text.inc"
+	.include "data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc"
+	.include "data/maps/CeladonCity_Gym/text.inc"
+	.include "data/maps/CeladonCity_Restaurant/text.inc"
+	.include "data/maps/CeladonCity_House1/text.inc"
+	.include "data/maps/CeladonCity_Hotel/text.inc"
+	.include "data/maps/FuchsiaCity_SafariZone_Entrance/text.inc"
+	.include "data/maps/FuchsiaCity_Mart/text.inc"
+	.include "data/maps/FuchsiaCity_ZooBuilding/text.inc"
+	.include "data/maps/FuchsiaCity_Gym/text.inc"
+	.include "data/maps/FuchsiaCity_House1/text.inc"
+	.include "data/maps/FuchsiaCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/FuchsiaCity_Building1/text.inc"
+	.include "data/maps/FuchsiaCity_House2/text.inc"
+	.include "data/maps/FuchsiaCity_House3/text.inc"
+	.include "data/maps/CinnabarIsland_Gym/text.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc"
+	.include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc"
+	.include "data/maps/CinnabarIsland_Mart/text.inc"
+	.include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc"
+	.include "data/maps/SaffronCity_House1_1F/text.inc"
+	.include "data/maps/SaffronCity_House1_2F/text.inc"
+	.include "data/maps/SaffronCity_Dojo/text.inc"
+	.include "data/maps/SaffronCity_Gym/text.inc"
+	.include "data/maps/SaffronCity_House2/text.inc"
+	.include "data/maps/SaffronCity_Mart/text.inc"
+	.include "data/maps/SaffronCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/SaffronCity_House3/text.inc"
+	.include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc"
+	.include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc"
+	.include "data/maps/Route2_House/text.inc"
+	.include "data/maps/Route2_EastBuilding/text.inc"
+	.include "data/maps/Route2_ViridianForest_NorthEntrance/text.inc"
+	.include "data/maps/Route4_PokemonCenter_1F/text.inc"
+	.include "data/maps/Route5_SouthEntrance/text.inc"
+	.include "data/maps/Route6_NorthEntrance/text.inc"
+	.include "data/maps/Route7_EastEntrance/text.inc"
+	.include "data/maps/Route8_WestEntrance/text.inc"
+	.include "data/maps/Route10_PokemonCenter_1F/text.inc"
+	.include "data/maps/Route11_EastEntrance_1F/text.inc"
+	.include "data/maps/Route11_EastEntrance_2F/text.inc"
+	.include "data/maps/Route12_NorthEntrance_1F/text.inc"
+	.include "data/maps/Route12_NorthEntrance_2F/text.inc"
+	.include "data/maps/Route12_FishingHouse/text.inc"
+	.include "data/maps/Route15_WestEntrance_1F/text.inc"
+	.include "data/maps/Route15_WestEntrance_2F/text.inc"
+	.include "data/maps/Route16_House/text.inc"
+	.include "data/maps/Route16_NorthEntrance_1F/text.inc"
+	.include "data/maps/Route16_NorthEntrance_2F/text.inc"
+	.include "data/maps/Route18_EastEntrance_1F/text.inc"
+	.include "data/maps/Route18_EastEntrance_2F/text.inc"
+	.include "data/maps/Route25_SeaCottage/text.inc"
+	.include "data/maps/SevenIsland_House_Room1/text.inc"
+	.include "data/maps/SevenIsland_Mart/text.inc"
+	.include "data/maps/SevenIsland_PokemonCenter_1F/text.inc"
+	.include "data/maps/OneIsland_PokemonCenter_1F/text.inc"
+	.include "data/maps/OneIsland_House1/text.inc"
+	.include "data/maps/OneIsland_House2/text.inc"
+	.include "data/maps/TwoIsland_JoyfulGameCorner/text.inc"
+	.include "data/maps/TwoIsland_House/text.inc"
+	.include "data/maps/TwoIsland_PokemonCenter_1F/text.inc"
+	.include "data/maps/ThreeIsland_House1/text.inc"
+	.include "data/maps/ThreeIsland_PokemonCenter_1F/text.inc"
+	.include "data/maps/ThreeIsland_Mart/text.inc"
+	.include "data/maps/ThreeIsland_House2/text.inc"
+	.include "data/maps/ThreeIsland_House3/text.inc"
+	.include "data/maps/ThreeIsland_House4/text.inc"
+	.include "data/maps/ThreeIsland_House5/text.inc"
+	.include "data/maps/FourIsland_PokemonCenter_1F/text.inc"
+	.include "data/maps/FourIsland_House1/text.inc"
+	.include "data/maps/FourIsland_LoreleisHouse/text.inc"
+	.include "data/maps/FourIsland_Mart/text.inc"
+	.include "data/maps/FiveIsland_PokemonCenter_1F/text.inc"
+	.include "data/maps/FiveIsland_House1/text.inc"
+	.include "data/maps/FiveIsland_House2/text.inc"
+	.include "data/maps/SixIsland_PokemonCenter_1F/text.inc"
+	.include "data/maps/SixIsland_House/text.inc"
+	.include "data/maps/SixIsland_Mart/text.inc"
+	.include "data/maps/FiveIsland_ResortGorgeous_House/text.inc"
+	.include "data/maps/SixIsland_WaterPath_House1/text.inc"
+	.include "data/maps/SixIsland_WaterPath_House2/text.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon_House/text.inc"
+
+
+
+gStdScript_2:: @ 81A4E3F
+	lock
+	faceplayer
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	release
+	return
+
+gStdScript_3:: @ 81A4E4A
+	lockall
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	releaseall
+	return
+
+gStdScript_4:: @ 81A4E54
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	return
+
+gStdScript_5:: @ 81A4E5C
+	message 0x0
+	waitmessage
+	yesnobox 20, 8
+	return
+
+gStdScript_ItemMessageAndFanfare:: @ 81A4E66
+	textcolor 3
+	compare_var_to_value VAR_0x8002, MUS_FANFA1
+	call_if 1, EventScript_1A4EA2
+	compare_var_to_value VAR_0x8002, BGM_FRLG_ME_KEYITEM
+	call_if 1, EventScript_1A4EA6
+	message 0x0
+	waitmessage
+	waitfanfare
+	compare_var_to_value VAR_0x8002, MUS_FANFA1
+	call_if 1, EventScript_1A4EAA
+	setorcopyvar VAR_0x8000, VAR_0x8000
+	setorcopyvar VAR_0x8001, VAR_0x8001
+	callstd 8
+	call EventScript_1A6675
+	return
+
+EventScript_1A4EA2:: @ 81A4EA2
+	playfanfare MUS_FANFA1
+	return
+
+EventScript_1A4EA6:: @ 81A4EA6
+	playfanfare BGM_FRLG_ME_KEYITEM
+	return
+
+EventScript_1A4EAA:: @ 81A4EAA
+	delay 50
+	return
+
+EventScript_1A4EAE:: @ 81A4EAE
+	return
+
+EventScript_1A4EAF:: @ 81A4EAF
+	special sub_806F67C
+	waitstate
+	return
+
+gUnknown_81A4EB4:: @ 81A4EB4
+	lock
+	special sub_8080628
+	special ScrSpecial_EndTrainerApproach
+	waitstate
+	goto EventScript_1A4FC7
+
+gUnknown_81A4EC1:: @ 81A4EC1
+	lock
+	faceplayer
+	applymovement VAR_LAST_TALKED, Movement_1A4FC5
+	waitmovement 0
+	specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
+	compare_var_to_value VAR_RESULT, 0
+	goto_if 5, EventScript_1A4EE8
+	special sub_8080628
+	special sub_8080398
+	goto EventScript_1A4FC7
+
+EventScript_1A4EE8:: @ 81A4EE8
+	ontrainerbattleend
+
+gUnknown_81A4EE9:: @ 81A4EE9
+	lock
+	faceplayer
+	call EventScript_1A4FBA
+	specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
+	compare_var_to_value VAR_RESULT, 0
+	goto_if 5, EventScript_1A4F20
+	special CheckForAlivePartyMons
+	compare_var_to_value VAR_RESULT, 0
+	goto_if 5, EventScript_1A4F19
+	special sub_8080628
+	special sub_8080398
+	goto EventScript_1A4FC7
+
+EventScript_1A4F19:: @ 81A4F19
+	special sub_8080618
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+EventScript_1A4F20:: @ 81A4F20
+	ontrainerbattleend
+
+gUnknown_81A4F21:: @ 81A4F21
+	applymovement VAR_LAST_TALKED, Movement_1A4FC5
+	waitmovement 0
+	special sub_8080628
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A501A
+	battlebegin
+	ontrainerbattleend
+
+gUnknown_81A4F3E:: @ 81A4F3E
+	call EventScript_1A4FBA
+	specialvar VAR_RESULT, sub_810CEB4
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A4F72
+	special sub_8080628
+	special sub_8080398
+	special sub_80805D8
+	waitmessage
+	waitbuttonpress
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A4FB8
+	special sub_80805B0
+	waitstate
+	releaseall
+	end
+
+EventScript_1A4F72:: @ 81A4F72
+	ontrainerbattleend
+
+gUnknown_81A4F73:: @ 81A4F73
+	specialvar VAR_RESULT, sub_810CEB4
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A4FB0
+	special CheckForAlivePartyMons
+	compare_var_to_value VAR_RESULT, 0
+	goto_if 5, EventScript_1A4FB1
+	special sub_8080628
+	special sub_8080398
+	special sub_80805D8
+	waitmessage
+	waitbuttonpress
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A4FB8
+	special sub_80805B0
+	waitstate
+	releaseall
+	end
+
+EventScript_1A4FB0:: @ 81A4FB0
+	ontrainerbattleend
+
+EventScript_1A4FB1:: @ 81A4FB1
+	special sub_8080618
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+EventScript_1A4FB8:: @ 81A4FB8
+	releaseall
+	end
+
+EventScript_1A4FBA:: @ 81A4FBA
+	applymovement VAR_LAST_TALKED, Movement_1A4FC5
+	waitmovement 0
+	return
+
+Movement_1A4FC5:: @ 81A4FC5
+	step_67
+	step_end
+
+EventScript_1A4FC7:: @ 81A4FC7
+	special sub_80805D8
+	waitmessage
+	waitbuttonpress
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A501A
+	battlebegin
+	specialvar VAR_RESULT, sub_80803CC
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A5017
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A5019
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1A5019
+	compare_var_to_value VAR_RESULT, 6
+	goto_if_eq EventScript_1A5019
+	compare_var_to_value VAR_RESULT, 8
+	goto_if_eq EventScript_1A5019
+
+EventScript_1A5017:: @ 81A5017
+	releaseall
+	end
+
+EventScript_1A5019:: @ 81A5019
+	ontrainerbattleendgoto
+
+EventScript_1A501A:: @ 81A501A
+	special sub_80803FC
+	releaseall
+	end
+
+gStdScript_Message_WaitButton_AndRelease:: @ 81A501F
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	release
+	return
+
+
+
+gUnknown_81A5028:: @ 81A5028
+	.string "Would you like to mix records with\n"
+	.string "other TRAINERS?$"
+
+Text_1A505B:: @ 81A505B
+	.string "We hope to see you again!$"
+
+Text_1A5075:: @ 81A5075
+	.string "{PLAYER} booted up the PC.$"
+
+gUnknown_81A508A:: @ 81A508A
+	.string "Which PC should be accessed?$"
+
+Text_1A50A7:: @ 81A50A7
+	.string "Accessed Someone's PC.$"
+
+Text_1A50BE:: @ 81A50BE
+	.string "POKéMON Storage System opened.$"
+
+Text_1A50DD:: @ 81A50DD
+	.string "Accessed {PLAYER}'s PC.$"
+
+Text_1A50EF:: @ 81A50EF
+	.string "Accessed BILL's PC.$"
+
+Text_1A5103:: @ 81A5103
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "TRADE CENTER.$"
+
+Text_1A5133:: @ 81A5133
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "COLOSSEUM.$"
+
+Text_1A5160:: @ 81A5160
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "TIME CAPSULE.$"
+
+gUnknown_81A5190:: @ 81A5190
+	.string "Please come again!$"
+
+Text_1A51A3:: @ 81A51A3
+	.string "Welcome!\p"
+	.string "We're having a discount sale today!$"
+
+Text_1A51D0:: @ 81A51D0
+	.string "{PLAYER}{KUN}, welcome!\p"
+	.string "What can I do for you?$"
+
+Text_1A51F6:: @ 81A51F6
+	.string "Obtained the {STR_VAR_2}!$"
+
+gUnknown_81A5207:: @ 81A5207
+	.string "The BAG is full…$"
+
+gUnknown_81A5218:: @ 81A5218
+	.string "{PLAYER} put the {STR_VAR_2}\n"
+	.string "in the {STR_VAR_3}.$"
+
+Text_1A5231:: @ 81A5231
+	.string "{PLAYER} found one {STR_VAR_2}!$"
+
+gUnknown_81A5242:: @ 81A5242
+	.string "Too bad!\n"
+	.string "The BAG is full…$"
+
+Text_1A525C:: @ 81A525C
+	.string "{PLAYER} found\n"
+	.string "{STR_VAR_1} {STR_VAR_2}!$"
+
+Text_1A526C:: @ 81A526C
+	.string "{PLAYER} put the COINS away in\n"
+	.string "the COIN CASE.$"
+
+Text_1A5294:: @ 81A5294
+	.string "Too bad!\n"
+	.string "The COIN CASE is full…$"
+
+Text_1A52B4:: @ 81A52B4
+	.string "Too bad!\n"
+	.string "There's nothing to put them in…$"
+
+Text_1A52DD:: @ 81A52DD
+	.string "{PLAYER} found\n"
+	.string "{STR_VAR_1} {STR_VAR_2}(s)!$"
+
+Text_1A52F0:: @ 81A52F0
+	.string "Obtained the {STR_VAR_2}!$"
+
+Text_1A5301:: @ 81A5301
+	.string "Too bad! There's no room left for\n"
+	.string "another {STR_VAR_2}…$"
+
+gUnknown_81A532F:: @ 81A532F
+	.string "The {STR_VAR_2} was transferred\n"
+	.string "to the PC.$"
+
+Text_1A5351:: @ 81A5351
+	.string "じゅんびちゅうです！$"
+
+Text_1A535C:: @ 81A535C
+	.string "Which floor do you want?$"
+
+Text_1A5375:: @ 81A5375
+	.string "An item in the BAG can be\n"
+	.string "registered to SELECT for easy use.$"
+
+Text_1A53B2:: @ 81A53B2
+	.string "パソコンに\n"
+	.string "ポケモン　トレーナー　こうざの\l"
+	.string "メールが　きている！\p"
+	.string "‥‥　‥‥　‥‥\p"
+	.string "ポケモンが　おぼえられる　わざは　4つ！\p"
+	.string "どんな　わざを　おぼえさせるかで\n"
+	.string "トレーナーの　じつりょくが　とわれます！\p"
+	.string "‥‥　‥‥　‥‥$"
+
+gUnknown_81A5420:: @ 81A5420
+	.string "{PLAYER} booted up the PC.$"
+
+Text_1A5435:: @ 81A5435
+	.string "つうしんは　キャンセルされました$"
+
+Text_1A5446:: @ 81A5446
+	.string "Want to give a nickname to the\n"
+	.string "{STR_VAR_2} you received?$"
+
+gUnknown_81A5476:: @ 81A5476
+	.string "{STR_VAR_1} fainted…\p"
+	.string "$"
+
+Text_1A5483:: @ 81A5483
+	.string "Welcome to our POKéMON CENTER!\p"
+	.string "Would you like me to heal your\n"
+	.string "POKéMON back to perfect health?$"
+
+Text_1A54E1:: @ 81A54E1
+	.string "Okay, I'll take your POKéMON for a\n"
+	.string "few seconds.$"
+
+Text_1A5511:: @ 81A5511
+	.string "We hope to see you again!$"
+
+Text_1A552B:: @ 81A552B
+	.string "Thank you for waiting.\n"
+	.string "We've restored your POKéMON to\l"
+	.string "full health.$"
+
+Text_1A556E:: @ 81A556E
+	.string "The water is dyed a deep blue…\n"
+	.string "Would you like to SURF?$"
+
+Text_1A55A5:: @ 81A55A5
+	.string "{STR_VAR_1} used SURF!$"
+
+Text_1A55B3:: @ 81A55B3
+	.string "The current is much too fast!\n"
+	.string "SURF can't be used here…$"
+
+Text_1A55EA:: @ 81A55EA
+	.string "どこか　とおくの　とびらが\n"
+	.string "ひらいたような　おとだ‥‥$"
+
+Text_1A5606:: @ 81A5606
+	.string "かべに\n"
+	.string "おおきな　あなが　あいている！$"
+
+Text_1A561A:: @ 81A561A
+	.string "I'm terribly sorry.\n"
+	.string "The POKéMON WIRELESS CLUB is\l"
+	.string "undergoing adjustments now.$"
+
+Text_1A5667:: @ 81A5667
+	.string "It appears to be undergoing\n"
+	.string "adjustments…$"
+
+Text_1A5690:: @ 81A5690
+	.string "{PLAYER} handed over the\n"
+	.string "{STR_VAR_1}.$"
+
+gUnknown_81A56A7:: @ 81A56A7
+	.string "Do you want to give a nickname to\n"
+	.string "this {STR_VAR_1}?$"
+
+Text_1A56D2:: @ 81A56D2
+	.string "おッ！　ダウジングマシンが\n"
+	.string "はんのう　してるぞ！\p"
+	.string "ましたに　どうぐが　うまってる！\n"
+	.string "‥‥‥$"
+
+Text_1A5700:: @ 81A5700
+	.string "{PLAYER} dug up one {STR_VAR_2}\n"
+	.string "from deep in the ground.$"
+
+Text_1A572A:: @ 81A572A
+	.string "Only truly skilled TRAINERS are\n"
+	.string "allowed through.\p"
+	.string "You don't have the {STR_VAR_1}\n"
+	.string "yet!$"
+
+Text_1A5776:: @ 81A5776
+	.string "Rules are rules.\n"
+	.string "I can't let you pass.$"
+
+Text_1A579D:: @ 81A579D
+	.string "Oh! That is the {STR_VAR_1}!\n"
+	.string "Go right ahead.$"
+
+Text_1A57C1:: @ 81A57C1
+	.string "You can pass here only if you have\n"
+	.string "the {STR_VAR_1}.\p"
+	.string "You don't have the {STR_VAR_1}\n"
+	.string "yet.\p"
+	.string "You have to have it to get to\n"
+	.string "the POKéMON LEAGUE.$"
+
+Text_1A5839:: @ 81A5839
+	.string "You can pass here only if you have\n"
+	.string "the {STR_VAR_1}.\p"
+	.string "Oh! That is the {STR_VAR_1}!{PAUSE_MUSIC}{PLAY_BGM}{MUS_FANFA1}{PAUSE 0x60}{RESUME_MUSIC}\p"
+	.string "Okay, then.\n"
+	.string "Please, go right ahead.$"
+
+Text_1A58A7:: @ 81A58A7
+	.string "Let's see…\n"
+	.string "Uh-oh! You have caught only\l"
+	.string "{STR_VAR_3} kinds of POKéMON!\p"
+	.string "You need {STR_VAR_1} kinds\n"
+	.string "if you want the {STR_VAR_2}.$"
+
+Text_1A5909:: @ 81A5909
+	.string "…Oh. I see.\p"
+	.string "When you get {STR_VAR_1} kinds of POKéMON,\n"
+	.string "come back for the {STR_VAR_2}.$"
+
+Text_1A594D:: @ 81A594D
+	.string "Oh! I see you don't have any\n"
+	.string "room for the {STR_VAR_2}.$"
+
+gUnknown_81A597B:: @ 81A597B
+	.string "I'm looking for the POKéMON\n"
+	.string "{STR_VAR_1}!\p"
+	.string "Wanna trade one for my\n"
+	.string "{STR_VAR_2}?$"
+
+gUnknown_81A59B6:: @ 81A59B6
+	.string "Awww!\n"
+	.string "Oh, well…$"
+
+gUnknown_81A59C6:: @ 81A59C6
+	.string "What?\n"
+	.string "That's no {STR_VAR_1}!$"
+
+gUnknown_81A59DA:: @ 81A59DA
+	.string "Hey, thanks!$"
+
+gUnknown_81A59E7:: @ 81A59E7
+	.string "Isn't my old {STR_VAR_2} great?$"
+
+gUnknown_81A59FE:: @ 81A59FE
+	.string "Hello, there! Do you happen to\n"
+	.string "have a {STR_VAR_1}?\p"
+	.string "Would you agree to a trade for\n"
+	.string "my {STR_VAR_2}?$"
+
+gUnknown_81A5A4E:: @ 81A5A4E
+	.string "Well, if you don't want to…$"
+
+gUnknown_81A5A6A:: @ 81A5A6A
+	.string "Hmmm?\n"
+	.string "This isn't a {STR_VAR_1}.\p"
+	.string "Think of me if you get one.$"
+
+gUnknown_81A5A9D:: @ 81A5A9D
+	.string "Thanks!$"
+
+gUnknown_81A5AA5:: @ 81A5AA5
+	.string "The {STR_VAR_2} that I traded you,\n"
+	.string "has it grown stronger?$"
+
+gUnknown_81A5AD6:: @ 81A5AD6
+	.string "Hi!\n"
+	.string "Do you have a {STR_VAR_1}?\p"
+	.string "Want to trade it for my\n"
+	.string "{STR_VAR_2}?$"
+
+gUnknown_81A5B08:: @ 81A5B08
+	.string "That's too bad.$"
+
+gUnknown_81A5B18:: @ 81A5B18
+	.string "…This is no {STR_VAR_1}.\p"
+	.string "If you get one, trade it with me.$"
+
+gUnknown_81A5B4A:: @ 81A5B4A
+	.string "Thanks, you're a pal!$"
+
+gUnknown_81A5B60:: @ 81A5B60
+	.string "How is my old {STR_VAR_2}?\n"
+	.string "My {STR_VAR_1} is doing great!$"
+
+Text_1A5B88:: @ 81A5B88
+	.string "Bingo!\n"
+	.string "The CARD KEY opened the door!$"
+
+Text_1A5BAD:: @ 81A5BAD
+	.string "No!\n"
+	.string "It needs a CARD KEY!$"
+
+Text_1A5BC6:: @ 81A5BC6
+	.string "Accessed PROF. OAK's PC…\p"
+	.string "Accessed the POKéDEX Rating\n"
+	.string "System…$"
+
+Text_1A5C03:: @ 81A5C03
+	.string "Would you like to have your\n"
+	.string "POKéDEX rated?$"
+
+Text_1A5C2E:: @ 81A5C2E
+	.string "Closed link to PROF. OAK's PC.$"
+
+Text_1A5C4D:: @ 81A5C4D
+	.string "Someone's voice rang out,\n"
+	.string "“Don't run away!”$"
+
+Text_1A5C79:: @ 81A5C79
+	.string "えっとー\n"
+	.string "{STR_VAR_2}が　みてみたいなー\p"
+	.string "それも　{STR_VAR_1}{STR_VAR_3}\n"
+	.string "{STR_VAR_2}が　みてみたいなー$"
+
+Text_1A5C9F:: @ 81A5C9F
+	.string "わぁー　すごい！\n"
+	.string "{STR_VAR_1}{STR_VAR_3}{STR_VAR_2}だー！\p"
+	.string "ありがとー\n"
+	.string "また　よろしくねー！$"
+
+Text_1A5CC3:: @ 81A5CC3
+	.string "それっ　ちがうよー！$"
+
+Text_1A5CCE:: @ 81A5CCE
+	.string "そっか‥$"
+
+Text_1A5CD3:: @ 81A5CD3
+	.string "ドアは　しまっている‥$"
+
+Text_1A5CDF:: @ 81A5CDF
+	.string "The door is open…$"
+
+Text_1A5CF1:: @ 81A5CF1
+	.string "{STR_VAR_2} was transferred to\n"
+	.string "Someone's PC.\p"
+	.string "It was placed in \n"
+	.string "BOX “{STR_VAR_1}.”$"
+
+Text_1A5D31:: @ 81A5D31
+	.string "{STR_VAR_2} was transferred to\n"
+	.string "BILL'S PC.\p"
+	.string "It was placed in \n"
+	.string "BOX “{STR_VAR_1}.”$"
+
+Text_1A5D6E:: @ 81A5D6E
+	.string "BOX “{STR_VAR_3}” on\n"
+	.string "Someone's PC was full.\p"
+	.string "{STR_VAR_2} was transferred to\n"
+	.string "BOX “{STR_VAR_1}.”$"
+
+Text_1A5DB1:: @ 81A5DB1
+	.string "BOX “{STR_VAR_3}” on\n"
+	.string "BILL'S PC was full.\p"
+	.string "{STR_VAR_2} was transferred to\n"
+	.string "BOX “{STR_VAR_1}.”$"
+
+Text_1A5DF1:: @ 81A5DF1
+	.string "{PLAYER} obtained\n"
+	.string "the {STR_VAR_1}!$"
+
+Text_1A5E05:: @ 81A5E05
+	.string "ポケモンを　もちきれないので\n"
+	.string "パソコンの　ボックス“{STR_VAR_1}”　に\l"
+	.string "{STR_VAR_2}を　てんそうした！$"
+
+gUnknown_81A5E31:: @ 81A5E31
+	.string "There's no more room for POKéMON!\p"
+	.string "The POKéMON BOXES are full and\n"
+	.string "can't accept any more!$"
+
+Text_1A5E89:: @ 81A5E89
+	.string "First, you should restore your\n"
+	.string "POKéMON to full health.$"
+
+Text_1A5EC0:: @ 81A5EC0
+	.string "Your POKéMON have been healed\n"
+	.string "to perfect health.\p"
+	.string "If your POKéMON's energy, HP,\n"
+	.string "is down, please come see us.\p"
+	.string "If you're planning to go far in the\n"
+	.string "field, you should buy some POTIONS\l"
+	.string "at the POKéMON MART.\p"
+	.string "We hope you excel!$"
+
+Text_1A5F9B:: @ 81A5F9B
+	.string "Your POKéMON have been healed\n"
+	.string "to perfect health.\p"
+	.string "We hope you excel!$"
+
+Text_1A5FDF:: @ 81A5FDF
+	.string "MOM: {PLAYER}!\n"
+	.string "Welcome home.\p"
+	.string "It sounds like you had quite\n"
+	.string "an experience.\p"
+	.string "Maybe you should take a quick\n"
+	.string "rest.$"
+
+Text_1A6046:: @ 81A6046
+	.string "MOM: Oh, good! You and your\n"
+	.string "POKéMON are looking great.\p"
+	.string "I just heard from PROF. OAK.\p"
+	.string "He said that POKéMON's energy is\n"
+	.string "measured in HP.\p"
+	.string "If your POKéMON lose their HP,\n"
+	.string "you can restore them at any\l"
+	.string "POKéMON CENTER.\p"
+	.string "If you're going to travel far away,\n"
+	.string "the smart TRAINER stocks up on\l"
+	.string "POTIONS at the POKéMON MART.\p"
+	.string "Make me proud, honey!\p"
+	.string "Take care!$"
+
+Text_1A6197:: @ 81A6197
+	.string "{PLAYER} is out of usable\n"
+	.string "POKéMON!\p"
+	.string "{PLAYER} panicked and lost ¥{STR_VAR_1}…\p"
+	.string "… … … …\p"
+	.string "{PLAYER} whited out!$"
+
+Text_1A61E5:: @ 81A61E5
+	.string "{PLAYER} is out of usable\n"
+	.string "POKéMON!\p"
+	.string "{PLAYER} whited out!$"
+
+Text_1A6211:: @ 81A6211
+	.string "Hi, there!\n"
+	.string "May I help you?$"
+
+Text_1A622C:: @ 81A622C
+	.string "There is a questionnaire.\n"
+	.string "Would you like to fill it out?$"
+
+Text_1A6265:: @ 81A6265
+	.string "Thank you for taking the time to\n"
+	.string "fill out our questionnaire.\p"
+	.string "Your feedback will be used for\n"
+	.string "future reference.$"
+
+Text_1A62D3:: @ 81A62D3
+	.string "Oh, hello!\n"
+	.string "You know those words?\p"
+	.string "That means you must know about\n"
+	.string "the MYSTERY GIFT.\p"
+	.string "From now on, you should be\n"
+	.string "receiving MYSTERY GIFTS!$"
+
+Text_1A6359:: @ 81A6359
+	.string "Once you save your game, you can\n"
+	.string "access the MYSTERY GIFT.$"
+
+Text_1A6393:: @ 81A6393
+	.string "Thank you for accessing the\n"
+	.string "MYSTERY GIFT System.$"
+
+Text_1A63C4:: @ 81A63C4
+	.string "The {STR_VAR_1} flew away!$"
+
+Text_1A63D6:: @ 81A63D6
+	.string "ベッドが　ある‥‥\n"
+	.string "やすんでいこう$"
+
+Text_1A63E8:: @ 81A63E8
+	.string "{PLAYER} found a {STR_VAR_2}!\n"
+	.string "It contains {STR_VAR_1}.$"
+
+Text_1A6407:: @ 81A6407
+	.string "おつかれさん！\n"
+	.string "どこに　いきたいんだ？$"
+
+Text_1A641B:: @ 81A641B
+	.string "All right!\n"
+	.string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$"
+
+Text_1A6448:: @ 81A6448
+	.string "Gyaoo!$"
+
+Text_1A644F:: @ 81A644F
+	.string "This move can be learned only\n"
+	.string "once. Is that okay?$"
+
+
+gUnknown_81A6481:: @ 81A6481
+	setflag FLAG_0x02B
+	setflag FLAG_0x02C
+	setflag FLAG_0x033
+	setflag FLAG_0x092
+	setflag FLAG_0x035
+	setflag FLAG_0x036
+	setflag FLAG_0x037
+	setflag FLAG_0x03C
+	setflag FLAG_0x03D
+	setflag FLAG_0x0A1
+	setflag FLAG_0x03F
+	setflag FLAG_0x04F
+	setflag FLAG_0x05A
+	setflag FLAG_0x0A3
+	setflag FLAG_0x0A4
+	setflag FLAG_0x062
+	setflag FLAG_0x06B
+	setflag FLAG_0x0A2
+	setflag FLAG_0x08C
+	setflag FLAG_0x06C
+	setflag FLAG_0x06D
+	setflag FLAG_0x06E
+	setflag FLAG_0x06F
+	setflag FLAG_0x075
+	setflag FLAG_0x074
+	setflag FLAG_0x07B
+	setflag FLAG_0x07C
+	setflag FLAG_0x07D
+	setflag FLAG_0x076
+	setflag FLAG_0x091
+	setflag FLAG_0x097
+	setflag FLAG_0x090
+	setflag FLAG_0x094
+	setflag FLAG_0x095
+	setflag FLAG_0x096
+	setflag FLAG_0x099
+	setflag FLAG_0x0A5
+	setflag FLAG_0x0A6
+	setflag FLAG_0x0A7
+	setflag FLAG_0x0A8
+	setflag FLAG_0x0A9
+	setflag FLAG_0x0AA
+	setflag FLAG_0x0AB
+	setflag FLAG_0x0AC
+	setflag FLAG_0x09D
+	setflag FLAG_0x09E
+	setflag FLAG_0x09F
+	setflag FLAG_0x0A0
+	setflag FLAG_0x0AE
+	setvar VAR_MIRAGE_RND_L, 500
+	end
+
+EventScript_1A651A:: @ 81A651A
+	clearflag FLAG_0x09D
+	call EventScript_1A6551
+	special sub_81130A8
+	specialvar VAR_RESULT, sub_806E25C
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_1A653B
+	call EventScript_1A6541
+	return
+
+EventScript_1A653B:: @ 81A653B
+	setvar VAR_MAP_SCENE_PALLET_TOWN, 2
+	return
+
+EventScript_1A6541:: @ 81A6541
+	clearflag FLAG_0x2F5
+	clearflag FLAG_0x2F6
+	clearflag FLAG_0x2F7
+	return
+
+gUnknown_81A654B:: @ 81A654B
+	call EventScript_1A6551
+	end
+
+EventScript_1A6551:: @ 81A6551
+	clearflag FLAG_0x4B8
+	clearflag FLAG_0x4B9
+	clearflag FLAG_0x4BA
+	clearflag FLAG_0x4BB
+	clearflag FLAG_0x4BC
+	cleartrainerflag 438
+	cleartrainerflag 439
+	cleartrainerflag 440
+	cleartrainerflag 739
+	cleartrainerflag 740
+	cleartrainerflag 741
+	setvar VAR_0x4068, 0
+	return
+
+EventScript_1A6578:: @ 81A6578
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	message Text_1A5483
+	waitmessage
+	multichoice 19, 8, 0, 2
+	switch VAR_RESULT
+	case 0, EventScript_1A65B8
+	case 1 EventScript_1A6663
+	case 127, EventScript_1A6663
+	end
+
+EventScript_1A65B8:: @ 81A65B8
+	incrementgamestat 15
+	message Text_1A54E1
+	waitmessage
+	call EventScript_1A65CE
+	special sub_80CC524
+	goto EventScript_1A65EC
+	end
+
+EventScript_1A65CE:: @ 81A65CE
+	applymovement VAR_LAST_TALKED, Movement_1A75E7
+	waitmovement 0
+	dofieldeffect 25
+	waitfieldeffect 25
+	applymovement VAR_LAST_TALKED, Movement_1A75ED
+	waitmovement 0
+	special sp000_heal_pokemon
+	return
+
+EventScript_1A65EC:: @ 81A65EC
+	specialvar VAR_RESULT, sub_80CD074
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A661D
+	specialvar VAR_RESULT, sp182_move_string
+	copyvar VAR_0x8008, VAR_RESULT
+	compare_var_to_value VAR_0x8008, 0
+	goto_if_eq EventScript_1A661D
+	compare_var_to_value VAR_0x8008, 1
+	goto_if_eq EventScript_1A6636
+	end
+
+EventScript_1A661D:: @ 81A661D
+	message Text_1A552B
+	waitmessage
+	applymovement VAR_LAST_TALKED, Movement_1A666C
+	waitmovement 0
+	loadword 0, Text_1A5511
+	callstd 4
+	return
+
+EventScript_1A6636:: @ 81A6636
+	checkflag 2114
+	goto_if_eq EventScript_1A661D
+	loadword 0, Text_1A552B
+	callstd 4
+	setflag 2114
+	message Text_1BCCCA
+	waitmessage
+	applymovement VAR_LAST_TALKED, Movement_1A666C
+	waitmovement 0
+	loadword 0, Text_1A5511
+	callstd 4
+	return
+
+EventScript_1A6663:: @ 81A6663
+	loadword 0, Text_1A5511
+	callstd 4
+	return
+
+Movement_1A666C:: @ 81A666C
+	step_5b
+	step_1a
+	step_end
+
+EventScript_1A666F:: @ 81A666F
+	copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID
+	return
+
+EventScript_1A6675:: @ 81A6675
+	copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS
+	return
+
+
+
+gStdScript_0:: @ 81A667B
+	copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID
+	textcolor 3
+	additem VAR_0x8000, VAR_0x8001
+	copyvar VAR_0x8007, VAR_RESULT
+	call EventScript_1A6697
+	copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS
+	return
+
+EventScript_1A6697:: @ 81A6697
+	bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
+	checkitemtype VAR_0x8000
+	call EventScript_1A66BC
+	compare_var_to_value VAR_0x8007, 1
+	call_if 1, EventScript_1A6749
+	compare_var_to_value VAR_0x8007, 0
+	call_if 1, EventScript_1A675E
+	return
+
+EventScript_1A66BC:: @ 81A66BC
+	copyvar VAR_0x8000, VAR_RESULT
+	compare_var_to_value VAR_0x8000, 1
+	goto_if_eq EventScript_1A66F9
+	compare_var_to_value VAR_0x8000, 2
+	goto_if_eq EventScript_1A6709
+	compare_var_to_value VAR_0x8000, 3
+	goto_if_eq EventScript_1A6719
+	compare_var_to_value VAR_0x8000, 4
+	goto_if_eq EventScript_1A6729
+	compare_var_to_value VAR_0x8000, 5
+	goto_if_eq EventScript_1A6739
+	end
+
+EventScript_1A66F9:: @ 81A66F9
+	getstdstring 2, 24
+	compare_var_to_value VAR_0x8007, 1
+	call_if 1, EventScript_1A6764
+	return
+
+EventScript_1A6709:: @ 81A6709
+	getstdstring 2, 25
+	compare_var_to_value VAR_0x8007, 1
+	call_if 1, EventScript_1A6764
+	return
+
+EventScript_1A6719:: @ 81A6719
+	getstdstring 2, 26
+	compare_var_to_value VAR_0x8007, 1
+	call_if 1, EventScript_1A6764
+	return
+
+EventScript_1A6729:: @ 81A6729
+	getstdstring 2, 27
+	compare_var_to_value VAR_0x8007, 1
+	call_if 1, EventScript_1A6768
+	return
+
+EventScript_1A6739:: @ 81A6739
+	getstdstring 2, 28
+	compare_var_to_value VAR_0x8007, 1
+	call_if 1, EventScript_1A6764
+	return
+
+EventScript_1A6749:: @ 81A6749
+	message Text_1A51F6
+	waitfanfare
+	waitmessage
+	loadword 0, gUnknown_81A5218
+	callstd 4
+	setvar VAR_RESULT, 1
+	return
+
+EventScript_1A675E:: @ 81A675E
+	setvar VAR_RESULT, 0
+	return
+
+EventScript_1A6764:: @ 81A6764
+	playfanfare MUS_FANFA1
+	return
+
+EventScript_1A6768:: @ 81A6768
+	playfanfare MUS_FANFA1
+	return
+
+gStdScript_7:: @ 81A676C
+	adddecor VAR_0x8000
+	copyvar VAR_0x8007, VAR_RESULT
+	call EventScript_1A677A
+	return
+
+EventScript_1A677A:: @ 81A677A
+	getdecorname 1, VAR_0x8000
+	compare_var_to_value VAR_0x8007, 1
+	call_if 1, EventScript_1A6795
+	compare_var_to_value VAR_0x8007, 0
+	call_if 1, EventScript_1A67AD
+	return
+
+EventScript_1A6795:: @ 81A6795
+	playfanfare MUS_FANFA4
+	message Text_1A52F0
+	waitfanfare
+	waitmessage
+	loadword 0, gUnknown_81A532F
+	callstd 4
+	setvar VAR_RESULT, 1
+	return
+
+EventScript_1A67AD:: @ 81A67AD
+	setvar VAR_RESULT, 0
+	return
+
+gStdScript_1:: @ 81A67B3
+	lock
+	faceplayer
+	waitse
+	copyvar VAR_0x8004, VAR_0x8000
+	copyvar VAR_0x8005, VAR_0x8001
+	checkitemspace VAR_0x8000, VAR_0x8001
+	copyvar VAR_0x8007, VAR_RESULT
+	getitemname 1, VAR_0x8000
+	checkitemtype VAR_0x8000
+	call EventScript_1A66BC
+	compare_var_to_value VAR_0x8007, 1
+	call_if 1, EventScript_1A67EE
+	compare_var_to_value VAR_0x8007, 0
+	call_if 1, EventScript_1A682D
+	release
+	return
+
+EventScript_1A67EE:: @ 81A67EE
+	removeobject VAR_LAST_TALKED
+	additem VAR_0x8004, VAR_0x8005
+	specialvar VAR_RESULT, sub_80CC8CC
+	copyvar VAR_0x8008, VAR_RESULT
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_1A6821
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, EventScript_1A6827
+	waitfanfare
+	waitmessage
+	loadword 0, gUnknown_81A5218
+	callstd 4
+	return
+
+EventScript_1A6821:: @ 81A6821
+	message Text_1A63E8
+	return
+
+EventScript_1A6827:: @ 81A6827
+	message Text_1A5231
+	return
+
+EventScript_1A682D:: @ 81A682D
+	loadword 0, Text_1A51F6
+	callstd 4
+	loadword 0, gUnknown_81A5242
+	callstd 4
+	setvar VAR_RESULT, 0
+	return
+
+gUnknown_81A6843:: @ 81A6843
+	.incbin "baserom.gba", 0x1A6843, 0x112
+
+gUnknown_81A6955:: @ 81A6955
+	.incbin "baserom.gba", 0x1A6955, 0x173
+
+gUnknown_81A6AC8:: @ 81A6AC8
+	.incbin "baserom.gba", 0x1A6AC8, 0x45
+
+gUnknown_81A6B0D:: @ 81A6B0D
+	.incbin "baserom.gba", 0x1A6B0D, 0xB
+
+EventScript_1A6B18:: @ 81A6B18
+	.incbin "baserom.gba", 0x1A6B18, 0xE1
+
+EventScript_1A6BF9:: @ 81A6BF9
+	.incbin "baserom.gba", 0x1A6BF9, 0x2D
+
+EventScript_1A6C26:: @ 81A6C26
+	.incbin "baserom.gba", 0x1A6C26, 0xC
+
+gUnknown_81A6C32:: @ 81A6C32
+	.incbin "baserom.gba", 0x1A6C32, 0xE5
+
+gUnknown_81A6D17:: @ 81A6D17
+	.incbin "baserom.gba", 0x1A6D17, 0x56
+
+gUnknown_81A6D6D:: @ 81A6D6D
+	.incbin "baserom.gba", 0x1A6D6D, 0x72
+
+gUnknown_81A6DDF:: @ 81A6DDF
+	.incbin "baserom.gba", 0x1A6DDF, 0x57
+
+gUnknown_81A6E36:: @ 81A6E36
+	.incbin "baserom.gba", 0x1A6E36, 0x6E
+
+gUnknown_81A6EA4:: @ 81A6EA4
+	.incbin "baserom.gba", 0x1A6EA4, 0x67
+
+gUnknown_81A6F0B:: @ 81A6F0B
+	.incbin "baserom.gba", 0x1A6F0B, 0x66
+
+gUnknown_81A6F71:: @ 81A6F71
+	.incbin "baserom.gba", 0x1A6F71, 0x3A
+
+gUnknown_81A6FAB:: @ 81A6FAB
+	.incbin "baserom.gba", 0x1A6FAB, 0x46
+
+gUnknown_81A6FF1:: @ 81A6FF1
+	.incbin "baserom.gba", 0x1A6FF1, 0x40
+
+gUnknown_81A7031:: @ 81A7031
+	.incbin "baserom.gba", 0x1A7031, 0x32
+
+gUnknown_81A7063:: @ 81A7063
+	.incbin "baserom.gba", 0x1A7063, 0x42
+
+gUnknown_81A70A5:: @ 81A70A5
+	.incbin "baserom.gba", 0x1A70A5, 0x33
+
+gUnknown_81A70D8:: @ 81A70D8
+	.incbin "baserom.gba", 0x1A70D8, 0x30
+
+gUnknown_81A7108:: @ 81A7108
+	.incbin "baserom.gba", 0x1A7108, 0x2F
+
+gUnknown_81A7137:: @ 81A7137
+	.incbin "baserom.gba", 0x1A7137, 0x3E
+
+gUnknown_81A7175:: @ 81A7175
+	.incbin "baserom.gba", 0x1A7175, 0x11C
+
+Text_1A7291:: @ 81A7291
+	.incbin "baserom.gba", 0x1A7291, 0x1C
+
+gUnknown_81A72AD:: @ 81A72AD
+	.incbin "baserom.gba", 0x1A72AD, 0xCE
+
+EventScript_1A737B:: @ 81A737B
+	.incbin "baserom.gba", 0x1A737B, 0x170
+
+EventScript_1A74EB:: @ 81A74EB
+	.incbin "baserom.gba", 0x1A74EB, 0x1B
+
+EventScript_1A7506:: @ 81A7506
+	.incbin "baserom.gba", 0x1A7506, 0x19
+
+EventScript_1A751F:: @ 81A751F
+	.incbin "baserom.gba", 0x1A751F, 0x19
+
+EventScript_1A7538:: @ 81A7538
+	.incbin "baserom.gba", 0x1A7538, 0x2B
+
+EventScript_1A7563:: @ 81A7563
+	.incbin "baserom.gba", 0x1A7563, 0x26
+
+EventScript_1A7589:: @ 81A7589
+	.incbin "baserom.gba", 0x1A7589, 0x13
+
+EventScript_1A759C:: @ 81A759C
+	.incbin "baserom.gba", 0x1A759C, 0x39
+
+EventScript_1A75D5:: @ 81A75D5
+	.incbin "baserom.gba", 0x1A75D5, 0x4
+
+Movement_1A75D9:: @ 81A75D9
+	.incbin "baserom.gba", 0x1A75D9, 0x2
+
+Movement_1A75DB:: @ 81A75DB
+	.incbin "baserom.gba", 0x1A75DB, 0x2
+
+Movement_1A75DD:: @ 81A75DD
+	.incbin "baserom.gba", 0x1A75DD, 0x4
+
+Movement_1A75E1:: @ 81A75E1
+	.incbin "baserom.gba", 0x1A75E1, 0x4
+
+Movement_1A75E5:: @ 81A75E5
+	.incbin "baserom.gba", 0x1A75E5, 0x2
+
+Movement_1A75E7:: @ 81A75E7
+	.incbin "baserom.gba", 0x1A75E7, 0x2
+
+Movement_1A75E9:: @ 81A75E9
+	.incbin "baserom.gba", 0x1A75E9, 0x2
+
+Movement_1A75EB:: @ 81A75EB
+	.incbin "baserom.gba", 0x1A75EB, 0x2
+
+Movement_1A75ED:: @ 81A75ED
+	.incbin "baserom.gba", 0x1A75ED, 0x2
+
+Movement_1A75EF:: @ 81A75EF
+	.incbin "baserom.gba", 0x1A75EF, 0x2
+
+Movement_1A75F1:: @ 81A75F1
+	.incbin "baserom.gba", 0x1A75F1, 0x15
+
+gUnknown_81A7606:: @ 81A7606
+	.incbin "baserom.gba", 0x1A7606, 0x9
+
+gUnknown_81A760F:: @ 81A760F
+	.incbin "baserom.gba", 0x1A760F, 0x9
+
+gUnknown_81A7618:: @ 81A7618
+	.incbin "baserom.gba", 0x1A7618, 0x9
+
+gUnknown_81A7621:: @ 81A7621
+	.incbin "baserom.gba", 0x1A7621, 0x9
+
+gUnknown_81A762A:: @ 81A762A
+	.incbin "baserom.gba", 0x1A762A, 0x9
+
+gUnknown_81A7633:: @ 81A7633
+	.incbin "baserom.gba", 0x1A7633, 0x9
+
+gUnknown_81A763C:: @ 81A763C
+	.incbin "baserom.gba", 0x1A763C, 0x9
+
+gUnknown_81A7645:: @ 81A7645
+	.incbin "baserom.gba", 0x1A7645, 0x9
+
+gUnknown_81A764E:: @ 81A764E
+	.incbin "baserom.gba", 0x1A764E, 0x9
+
+gUnknown_81A7657:: @ 81A7657
+	.incbin "baserom.gba", 0x1A7657, 0x9
+
+gUnknown_81A7660:: @ 81A7660
+	.incbin "baserom.gba", 0x1A7660, 0x9
+
+gUnknown_81A7669:: @ 81A7669
+	.incbin "baserom.gba", 0x1A7669, 0x9
+
+gUnknown_81A7672:: @ 81A7672
+	.incbin "baserom.gba", 0x1A7672, 0x9
+
+gUnknown_81A767B:: @ 81A767B
+	.incbin "baserom.gba", 0x1A767B, 0x9
+
+gUnknown_81A7684:: @ 81A7684
+	.incbin "baserom.gba", 0x1A7684, 0x9
+
+gUnknown_81A768D:: @ 81A768D
+	.incbin "baserom.gba", 0x1A768D, 0x9
+
+gUnknown_81A7696:: @ 81A7696
+	.incbin "baserom.gba", 0x1A7696, 0x9
+
+gUnknown_81A769F:: @ 81A769F
+	.incbin "baserom.gba", 0x1A769F, 0x9
+
+gUnknown_81A76A8:: @ 81A76A8
+	.incbin "baserom.gba", 0x1A76A8, 0x9
+
+gUnknown_81A76B1:: @ 81A76B1
+	.incbin "baserom.gba", 0x1A76B1, 0x9
+
+gUnknown_81A76BA:: @ 81A76BA
+	.incbin "baserom.gba", 0x1A76BA, 0x9
+
+gUnknown_81A76C3:: @ 81A76C3
+	.incbin "baserom.gba", 0x1A76C3, 0x9
+
+gUnknown_81A76CC:: @ 81A76CC
+	.incbin "baserom.gba", 0x1A76CC, 0x9
+
+gUnknown_81A76D5:: @ 81A76D5
+	.incbin "baserom.gba", 0x1A76D5, 0x9
+
+gUnknown_81A76DE:: @ 81A76DE
+	.incbin "baserom.gba", 0x1A76DE, 0x9
+
+gUnknown_81A76E7:: @ 81A76E7
+	.incbin "baserom.gba", 0x1A76E7, 0x9
+
+gUnknown_81A76F0:: @ 81A76F0
+	.incbin "baserom.gba", 0x1A76F0, 0x9
+
+gUnknown_81A76F9:: @ 81A76F9
+	.incbin "baserom.gba", 0x1A76F9, 0x9
+
+gUnknown_81A7702:: @ 81A7702
+	.incbin "baserom.gba", 0x1A7702, 0x9E
+
+gUnknown_81A77A0:: @ 81A77A0
+	.incbin "baserom.gba", 0x1A77A0, 0x9
+
+EventScript_1A77A9:: @ 81A77A9
+	.incbin "baserom.gba", 0x1A77A9, 0x1
+
+EventScript_1A77AA:: @ 81A77AA
+	.incbin "baserom.gba", 0x1A77AA, 0x6
+
+EventScript_1A77B0:: @ 81A77B0
+	.incbin "baserom.gba", 0x1A77B0, 0x6
+
+Route16_NorthEntrance_1F_EventScript_1A77B6:: @ 81A77B6
+Route18_EastEntrance_1F_EventScript_1A77B6:: @ 81A77B6
+	.incbin "baserom.gba", 0x1A77B6, 0xB
+
+Route16_NorthEntrance_1F_EventScript_1A77C1:: @ 81A77C1
+Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1
+	.incbin "baserom.gba", 0x1A77C1, 0x42
+
+EventScript_1A7803:: @ 81A7803
+	.incbin "baserom.gba", 0x1A7803, 0x69
+
+EventScript_1A786C:: @ 81A786C
+	.incbin "baserom.gba", 0x1A786C, 0x102
+
+EventScript_1A796E:: @ 81A796E
+	.incbin "baserom.gba", 0x1A796E, 0x14B
+
+EventScript_1A7AB9:: @ 81A7AB9
+	.incbin "baserom.gba", 0x1A7AB9, 0x4
+
+EventScript_1A7ABD:: @ 81A7ABD
+	.incbin "baserom.gba", 0x1A7ABD, 0xA
+
+EventScript_1A7AC7:: @ 81A7AC7
+	.incbin "baserom.gba", 0x1A7AC7, 0xA
+
+EventScript_1A7AD1:: @ 81A7AD1
+	.incbin "baserom.gba", 0x1A7AD1, 0xA
+
+gUnknown_81A7ADB:: @ 81A7ADB
+	.incbin "baserom.gba", 0x1A7ADB, 0x5
+
+EventScript_1A7AE0:: @ 81A7AE0
+	.incbin "baserom.gba", 0x1A7AE0, 0x2
+
+EventScript_1A7AE2:: @ 81A7AE2
+	.incbin "baserom.gba", 0x1A7AE2, 0x98
+
+EventScript_1A7B7A:: @ 81A7B7A
+	.incbin "baserom.gba", 0x1A7B7A, 0x1C4
+
+EventScript_1A7D3E:: @ 81A7D3E
+	.incbin "baserom.gba", 0x1A7D3E, 0x134
+
+EventScript_1A7E72:: @ 81A7E72
+	.incbin "baserom.gba", 0x1A7E72, 0xDA
+
+EventScript_1A7F4C:: @ 81A7F4C
+	.incbin "baserom.gba", 0x1A7F4C, 0x1FD
+
+EventScript_1A8149:: @ 81A8149
+	.incbin "baserom.gba", 0x1A8149, 0x2E
+
+EventScript_1A8177:: @ 81A8177
+	.incbin "baserom.gba", 0x1A8177, 0x2E
+
+EventScript_1A81A5:: @ 81A81A5
+	.incbin "baserom.gba", 0x1A81A5, 0x37
+
+EventScript_1A81DC:: @ 81A81DC
+	.incbin "baserom.gba", 0x1A81DC, 0x37
+
+EventScript_1A8213:: @ 81A8213
+	.incbin "baserom.gba", 0x1A8213, 0x2E
+
+EventScript_1A8241:: @ 81A8241
+	.incbin "baserom.gba", 0x1A8241, 0x2E
+
+EventScript_1A826F:: @ 81A826F
+	.incbin "baserom.gba", 0x1A826F, 0x37
+
+EventScript_1A82A6:: @ 81A82A6
+	.incbin "baserom.gba", 0x1A82A6, 0x37
+
+EventScript_1A82DD:: @ 81A82DD
+	.incbin "baserom.gba", 0x1A82DD, 0x37
+
+EventScript_1A8314:: @ 81A8314
+	.incbin "baserom.gba", 0x1A8314, 0x37
+
+EventScript_1A834B:: @ 81A834B
+	.incbin "baserom.gba", 0x1A834B, 0x2E
+
+EventScript_1A8379:: @ 81A8379
+	.incbin "baserom.gba", 0x1A8379, 0x2E
+
+EventScript_1A83A7:: @ 81A83A7
+	.incbin "baserom.gba", 0x1A83A7, 0x2E
+
+EventScript_1A83D5:: @ 81A83D5
+	.incbin "baserom.gba", 0x1A83D5, 0x37
+
+EventScript_1A840C:: @ 81A840C
+	.incbin "baserom.gba", 0x1A840C, 0x37
+
+EventScript_1A8443:: @ 81A8443
+	.incbin "baserom.gba", 0x1A8443, 0x37
+
+EventScript_1A847A:: @ 81A847A
+	.incbin "baserom.gba", 0x1A847A, 0x2E
+
+EventScript_1A84A8:: @ 81A84A8
+	.incbin "baserom.gba", 0x1A84A8, 0x2E
+
+EventScript_1A84D6:: @ 81A84D6
+	.incbin "baserom.gba", 0x1A84D6, 0x2E
+
+EventScript_1A8504:: @ 81A8504
+	.incbin "baserom.gba", 0x1A8504, 0x417
+
+SilphCo_2F_EventScript_1A891B:: @ 81A891B
+	.incbin "baserom.gba", 0x1A891B, 0x1A
+
+SilphCo_2F_EventScript_1A8935:: @ 81A8935
+	.incbin "baserom.gba", 0x1A8935, 0x1A
+
+SilphCo_3F_EventScript_1A894F:: @ 81A894F
+	.incbin "baserom.gba", 0x1A894F, 0x1A
+
+SilphCo_3F_EventScript_1A8969:: @ 81A8969
+	.incbin "baserom.gba", 0x1A8969, 0x1A
+
+SilphCo_4F_EventScript_1A8983:: @ 81A8983
+	.incbin "baserom.gba", 0x1A8983, 0x1A
+
+SilphCo_4F_EventScript_1A899D:: @ 81A899D
+	.incbin "baserom.gba", 0x1A899D, 0x1A
+
+SilphCo_5F_EventScript_1A89B7:: @ 81A89B7
+	.incbin "baserom.gba", 0x1A89B7, 0x1A
+
+SilphCo_5F_EventScript_1A89D1:: @ 81A89D1
+	.incbin "baserom.gba", 0x1A89D1, 0x1A
+
+SilphCo_5F_EventScript_1A89EB:: @ 81A89EB
+	.incbin "baserom.gba", 0x1A89EB, 0x1A
+
+SilphCo_6F_EventScript_1A8A05:: @ 81A8A05
+	.incbin "baserom.gba", 0x1A8A05, 0x1A
+
+SilphCo_7F_EventScript_1A8A1F:: @ 81A8A1F
+	.incbin "baserom.gba", 0x1A8A1F, 0x1A
+
+SilphCo_7F_EventScript_1A8A39:: @ 81A8A39
+	.incbin "baserom.gba", 0x1A8A39, 0x1A
+
+SilphCo_7F_EventScript_1A8A53:: @ 81A8A53
+	.incbin "baserom.gba", 0x1A8A53, 0x1A
+
+SilphCo_8F_EventScript_1A8A6D:: @ 81A8A6D
+	.incbin "baserom.gba", 0x1A8A6D, 0x1A
+
+SilphCo_9F_EventScript_1A8A87:: @ 81A8A87
+	.incbin "baserom.gba", 0x1A8A87, 0x1A
+
+SilphCo_9F_EventScript_1A8AA1:: @ 81A8AA1
+	.incbin "baserom.gba", 0x1A8AA1, 0x1A
+
+SilphCo_9F_EventScript_1A8ABB:: @ 81A8ABB
+	.incbin "baserom.gba", 0x1A8ABB, 0x1A
+
+SilphCo_9F_EventScript_1A8AD5:: @ 81A8AD5
+	.incbin "baserom.gba", 0x1A8AD5, 0x1A
+
+SilphCo_10F_EventScript_1A8AEF:: @ 81A8AEF
+	.incbin "baserom.gba", 0x1A8AEF, 0x1A
+
+SilphCo_11F_EventScript_1A8B09:: @ 81A8B09
+	.incbin "baserom.gba", 0x1A8B09, 0x11E
+
+EventScript_1A8C27:: @ 81A8C27
+	.incbin "baserom.gba", 0x1A8C27, 0xC
+
+EventScript_1A8C33:: @ 81A8C33
+	.incbin "baserom.gba", 0x1A8C33, 0x9
+
+EventScript_1A8C3C:: @ 81A8C3C
+	.incbin "baserom.gba", 0x1A8C3C, 0x71
+
+EventScript_1A8CAD:: @ 81A8CAD
+	.incbin "baserom.gba", 0x1A8CAD, 0x10
+
+EventScript_1A8CBD:: @ 81A8CBD
+	.incbin "baserom.gba", 0x1A8CBD, 0xC
+
+EventScript_1A8CC9:: @ 81A8CC9
+	.incbin "baserom.gba", 0x1A8CC9, 0x10
+
+EventScript_1A8CD9:: @ 81A8CD9
+	.incbin "baserom.gba", 0x1A8CD9, 0x14
+
+gUnknown_81A8CED:: @ 81A8CED
+	.incbin "baserom.gba", 0x1A8CED, 0x9
+
+CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+FiveIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+OneIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+PewterCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+SevenIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+VermilionCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+FourIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+SixIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+TwoIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+Route4_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+SaffronCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+CeladonCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+LavenderTown_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+ViridianCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+	.incbin "baserom.gba", 0x1A8CF6, 0x6
+
+CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+FiveIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+OneIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+PewterCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+SevenIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+VermilionCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+FourIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+SixIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+TwoIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+Route4_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+SaffronCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+CeladonCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+LavenderTown_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+ViridianCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+	.incbin "baserom.gba", 0x1A8CFC, 0x6
+
+CeruleanCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+FiveIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+OneIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+PewterCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+SevenIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+VermilionCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+FourIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+SixIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+ThreeIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+TwoIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+Route4_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+SaffronCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+CeladonCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+LavenderTown_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+	.incbin "baserom.gba", 0x1A8D02, 0x6
+
+VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
+	.incbin "baserom.gba", 0x1A8D08, 0x41
+
+gUnknown_81A8D49:: @ 81A8D49
+	.incbin "baserom.gba", 0x1A8D49, 0x4E
+
+gUnknown_81A8D97:: @ 81A8D97
+	.incbin "baserom.gba", 0x1A8D97, 0x41
+
+gUnknown_81A8DD8:: @ 81A8DD8
+	.incbin "baserom.gba", 0x1A8DD8, 0x25
+
+gUnknown_81A8DFD:: @ 81A8DFD
+	.incbin "baserom.gba", 0x1A8DFD, 0x5B
+
+gStdScript_8:: @ 81A8E58
+	.incbin "baserom.gba", 0x1A8E58, 0x6D
+
+EventScript_1A8EC5:: @ 81A8EC5
+	.incbin "baserom.gba", 0x1A8EC5, 0x8F
+
+EventScript_1A8F54:: @ 81A8F54
+	.incbin "baserom.gba", 0x1A8F54, 0x9A
+
+EventScript_1A8FEE:: @ 81A8FEE
+	.incbin "baserom.gba", 0x1A8FEE, 0xB
+
+EventScript_1A8FF9:: @ 81A8FF9
+	.incbin "baserom.gba", 0x1A8FF9, 0xB
+
+EventScript_1A9004:: @ 81A9004
+	.incbin "baserom.gba", 0x1A9004, 0xB
+
+EventScript_1A900F:: @ 81A900F
+	.incbin "baserom.gba", 0x1A900F, 0xCB
+
+EventScript_1A90DA:: @ 81A90DA
+	.incbin "baserom.gba", 0x1A90DA, 0x1C
+
+EventScript_1A90F6:: @ 81A90F6
+	.incbin "baserom.gba", 0x1A90F6, 0x12
+
+EventScript_1A9108:: @ 81A9108
+	.incbin "baserom.gba", 0x1A9108, 0x16
+
+EventScript_1A911E:: @ 81A911E
+	.incbin "baserom.gba", 0x1A911E, 0xB7
+
+EventScript_1A91D5:: @ 81A91D5
+	.incbin "baserom.gba", 0x1A91D5, 0x58
+
+EventScript_1A922D:: @ 81A922D
+	.incbin "baserom.gba", 0x1A922D, 0x9
+
+EventScript_1A9236:: @ 81A9236
+	.incbin "baserom.gba", 0x1A9236, 0x15
+
+EventScript_1A924B:: @ 81A924B
+	.incbin "baserom.gba", 0x1A924B, 0x13
+
+EventScript_1A925E:: @ 81A925E
+	.incbin "baserom.gba", 0x1A925E, 0xE
+
+EventScript_1A926C:: @ 81A926C
+	.incbin "baserom.gba", 0x1A926C, 0x10
+
+EventScript_1A927C:: @ 81A927C
+	.incbin "baserom.gba", 0x1A927C, 0xC
+
+gUnknown_81A9288:: @ 81A9288
+	.incbin "baserom.gba", 0x1A9288, 0x3
+
+gUnknown_81A928B:: @ 81A928B
+	.incbin "baserom.gba", 0x1A928B, 0x5
+
+gUnknown_81A9290:: @ 81A9290
+	.incbin "baserom.gba", 0x1A9290, 0x6
+
+gUnknown_81A9296:: @ 81A9296
+	.incbin "baserom.gba", 0x1A9296, 0x5
+
+gUnknown_81A929B:: @ 81A929B
+	.incbin "baserom.gba", 0x1A929B, 0x4
+
+gUnknown_81A929F:: @ 81A929F
+	.incbin "baserom.gba", 0x1A929F, 0x4
+
+gUnknown_81A92A3:: @ 81A92A3
+	.incbin "baserom.gba", 0x1A92A3, 0x4
+
+gUnknown_81A92A7:: @ 81A92A7
+	.incbin "baserom.gba", 0x1A92A7, 0x4
+
+gUnknown_81A92AB:: @ 81A92AB
+	.incbin "baserom.gba", 0x1A92AB, 0x4
+
+gUnknown_81A92AF:: @ 81A92AF
+	.incbin "baserom.gba", 0x1A92AF, 0x4
+
+gUnknown_81A92B3:: @ 81A92B3
+	.incbin "baserom.gba", 0x1A92B3, 0x4
+
+gUnknown_81A92B7:: @ 81A92B7
+	.incbin "baserom.gba", 0x1A92B7, 0x5
+
+gUnknown_81A92BC:: @ 81A92BC
+	.incbin "baserom.gba", 0x1A92BC, 0x5
+
+gUnknown_81A92C1:: @ 81A92C1
+	.incbin "baserom.gba", 0x1A92C1, 0x2
+
+gUnknown_81A92C3:: @ 81A92C3
+	.incbin "baserom.gba", 0x1A92C3, 0x2
+
+gUnknown_81A92C5:: @ 81A92C5
+	.incbin "baserom.gba", 0x1A92C5, 0xB
+
+gUnknown_81A92D0:: @ 81A92D0
+	.incbin "baserom.gba", 0x1A92D0, 0xC
+
+gUnknown_81A92DC:: @ 81A92DC
+	.incbin "baserom.gba", 0x1A92DC, 0xA
+
+gUnknown_81A92E6:: @ 81A92E6
+	.incbin "baserom.gba", 0x1A92E6, 0xC
+
+gUnknown_81A92F2:: @ 81A92F2
+	.incbin "baserom.gba", 0x1A92F2, 0xC
+
+gUnknown_81A92FE:: @ 81A92FE
+	.incbin "baserom.gba", 0x1A92FE, 0xC
+
+gUnknown_81A930A:: @ 81A930A
+	.incbin "baserom.gba", 0x1A930A, 0xC
+
+gUnknown_81A9316:: @ 81A9316
+	.incbin "baserom.gba", 0x1A9316, 0xB
+
+gUnknown_81A9321:: @ 81A9321
+	.incbin "baserom.gba", 0x1A9321, 0xC
+
+gUnknown_81A932D:: @ 81A932D
+	.incbin "baserom.gba", 0x1A932D, 0xB
+
+gUnknown_81A9338:: @ 81A9338
+	.incbin "baserom.gba", 0x1A9338, 0x7
+
+gUnknown_81A933F:: @ 81A933F
+	.incbin "baserom.gba", 0x1A933F, 0xB
+
+gUnknown_81A934A:: @ 81A934A
+	.incbin "baserom.gba", 0x1A934A, 0xC
+
+gUnknown_81A9356:: @ 81A9356
+	.incbin "baserom.gba", 0x1A9356, 0xC
+
+gUnknown_81A9362:: @ 81A9362
+	.incbin "baserom.gba", 0x1A9362, 0x6
+
+gUnknown_81A9368:: @ 81A9368
+	.incbin "baserom.gba", 0x1A9368, 0xC
+
+gUnknown_81A9374:: @ 81A9374
+	.incbin "baserom.gba", 0x1A9374, 0x8
+
+gUnknown_81A937C:: @ 81A937C
+	.incbin "baserom.gba", 0x1A937C, 0xB
+
+gUnknown_81A9387:: @ 81A9387
+	.incbin "baserom.gba", 0x1A9387, 0xC
+
+gUnknown_81A9393:: @ 81A9393
+	.incbin "baserom.gba", 0x1A9393, 0xC
+
+gUnknown_81A939F:: @ 81A939F
+	.incbin "baserom.gba", 0x1A939F, 0xC
+
+gUnknown_81A93AB:: @ 81A93AB
+	.incbin "baserom.gba", 0x1A93AB, 0x9
+
+gUnknown_81A93B4:: @ 81A93B4
+	.incbin "baserom.gba", 0x1A93B4, 0xC
+
+gUnknown_81A93C0:: @ 81A93C0
+	.incbin "baserom.gba", 0x1A93C0, 0x9
+
+Route3_EventScript_1A93C9:: @ 81A93C9
+	.incbin "baserom.gba", 0x1A93C9, 0x3E
+
+Route3_EventScript_1A9407:: @ 81A9407
+	.incbin "baserom.gba", 0x1A9407, 0x3E
+
+Route3_EventScript_1A9445:: @ 81A9445
+	.incbin "baserom.gba", 0x1A9445, 0x3E
+
+Route3_EventScript_1A9483:: @ 81A9483
+	.incbin "baserom.gba", 0x1A9483, 0x3E
+
+Route3_EventScript_1A94C1:: @ 81A94C1
+	.incbin "baserom.gba", 0x1A94C1, 0x3E
+
+Route3_EventScript_1A94FF:: @ 81A94FF
+	.incbin "baserom.gba", 0x1A94FF, 0x3E
+
+Route3_EventScript_1A953D:: @ 81A953D
+	.incbin "baserom.gba", 0x1A953D, 0x3E
+
+Route3_EventScript_1A957B:: @ 81A957B
+	.incbin "baserom.gba", 0x1A957B, 0x3E
+
+Route4_EventScript_1A95B9:: @ 81A95B9
+	.incbin "baserom.gba", 0x1A95B9, 0x3E
+
+Route24_EventScript_1A95F7:: @ 81A95F7
+	.incbin "baserom.gba", 0x1A95F7, 0x3E
+
+Route24_EventScript_1A9635:: @ 81A9635
+	.incbin "baserom.gba", 0x1A9635, 0x3E
+
+Route24_EventScript_1A9673:: @ 81A9673
+	.incbin "baserom.gba", 0x1A9673, 0x3E
+
+Route24_EventScript_1A96B1:: @ 81A96B1
+	.incbin "baserom.gba", 0x1A96B1, 0x3E
+
+Route24_EventScript_1A96EF:: @ 81A96EF
+	.incbin "baserom.gba", 0x1A96EF, 0x3E
+
+Route24_EventScript_1A972D:: @ 81A972D
+	.incbin "baserom.gba", 0x1A972D, 0x3E
+
+Route25_EventScript_1A976B:: @ 81A976B
+	.incbin "baserom.gba", 0x1A976B, 0x3E
+
+Route25_EventScript_1A97A9:: @ 81A97A9
+	.incbin "baserom.gba", 0x1A97A9, 0x3E
+
+Route25_EventScript_1A97E7:: @ 81A97E7
+	.incbin "baserom.gba", 0x1A97E7, 0x3E
+
+Route25_EventScript_1A9825:: @ 81A9825
+	.incbin "baserom.gba", 0x1A9825, 0x3E
+
+Route25_EventScript_1A9863:: @ 81A9863
+	.incbin "baserom.gba", 0x1A9863, 0x3E
+
+Route25_EventScript_1A98A1:: @ 81A98A1
+	.incbin "baserom.gba", 0x1A98A1, 0x3E
+
+Route25_EventScript_1A98DF:: @ 81A98DF
+	.incbin "baserom.gba", 0x1A98DF, 0x3E
+
+Route25_EventScript_1A991D:: @ 81A991D
+	.incbin "baserom.gba", 0x1A991D, 0x3E
+
+Route25_EventScript_1A995B:: @ 81A995B
+	.incbin "baserom.gba", 0x1A995B, 0x3E
+
+Route6_EventScript_1A9999:: @ 81A9999
+	.incbin "baserom.gba", 0x1A9999, 0x3E
+
+Route6_EventScript_1A99D7:: @ 81A99D7
+	.incbin "baserom.gba", 0x1A99D7, 0x3E
+
+Route6_EventScript_1A9A15:: @ 81A9A15
+	.incbin "baserom.gba", 0x1A9A15, 0x3E
+
+Route6_EventScript_1A9A53:: @ 81A9A53
+	.incbin "baserom.gba", 0x1A9A53, 0x3E
+
+Route6_EventScript_1A9A91:: @ 81A9A91
+	.incbin "baserom.gba", 0x1A9A91, 0x3E
+
+Route6_EventScript_1A9ACF:: @ 81A9ACF
+	.incbin "baserom.gba", 0x1A9ACF, 0x3E
+
+Route11_EventScript_1A9B0D:: @ 81A9B0D
+	.incbin "baserom.gba", 0x1A9B0D, 0x3E
+
+Route11_EventScript_1A9B4B:: @ 81A9B4B
+	.incbin "baserom.gba", 0x1A9B4B, 0x3E
+
+Route11_EventScript_1A9B89:: @ 81A9B89
+	.incbin "baserom.gba", 0x1A9B89, 0x3E
+
+Route11_EventScript_1A9BC7:: @ 81A9BC7
+	.incbin "baserom.gba", 0x1A9BC7, 0x3E
+
+Route11_EventScript_1A9C05:: @ 81A9C05
+	.incbin "baserom.gba", 0x1A9C05, 0x3E
+
+Route11_EventScript_1A9C43:: @ 81A9C43
+	.incbin "baserom.gba", 0x1A9C43, 0x3E
+
+Route11_EventScript_1A9C81:: @ 81A9C81
+	.incbin "baserom.gba", 0x1A9C81, 0x3E
+
+Route11_EventScript_1A9CBF:: @ 81A9CBF
+	.incbin "baserom.gba", 0x1A9CBF, 0x3E
+
+Route11_EventScript_1A9CFD:: @ 81A9CFD
+	.incbin "baserom.gba", 0x1A9CFD, 0x3E
+
+Route11_EventScript_1A9D3B:: @ 81A9D3B
+	.incbin "baserom.gba", 0x1A9D3B, 0x3E
+
+Route9_EventScript_1A9D79:: @ 81A9D79
+	.incbin "baserom.gba", 0x1A9D79, 0x3E
+
+Route9_EventScript_1A9DB7:: @ 81A9DB7
+	.incbin "baserom.gba", 0x1A9DB7, 0x3E
+
+Route9_EventScript_1A9DF5:: @ 81A9DF5
+	.incbin "baserom.gba", 0x1A9DF5, 0x3E
+
+Route9_EventScript_1A9E33:: @ 81A9E33
+	.incbin "baserom.gba", 0x1A9E33, 0x3E
+
+Route9_EventScript_1A9E71:: @ 81A9E71
+	.incbin "baserom.gba", 0x1A9E71, 0x3E
+
+Route9_EventScript_1A9EAF:: @ 81A9EAF
+	.incbin "baserom.gba", 0x1A9EAF, 0x3E
+
+Route9_EventScript_1A9EED:: @ 81A9EED
+	.incbin "baserom.gba", 0x1A9EED, 0x3E
+
+Route9_EventScript_1A9F2B:: @ 81A9F2B
+	.incbin "baserom.gba", 0x1A9F2B, 0x3E
+
+Route9_EventScript_1A9F69:: @ 81A9F69
+	.incbin "baserom.gba", 0x1A9F69, 0x3E
+
+Route10_EventScript_1A9FA7:: @ 81A9FA7
+	.incbin "baserom.gba", 0x1A9FA7, 0x3E
+
+Route10_EventScript_1A9FE5:: @ 81A9FE5
+	.incbin "baserom.gba", 0x1A9FE5, 0x3E
+
+Route10_EventScript_1AA023:: @ 81AA023
+	.incbin "baserom.gba", 0x1AA023, 0x3E
+
+Route10_EventScript_1AA061:: @ 81AA061
+	.incbin "baserom.gba", 0x1AA061, 0x3E
+
+Route10_EventScript_1AA09F:: @ 81AA09F
+	.incbin "baserom.gba", 0x1AA09F, 0x3E
+
+Route10_EventScript_1AA0DD:: @ 81AA0DD
+	.incbin "baserom.gba", 0x1AA0DD, 0x3E
+
+Route8_EventScript_1AA11B:: @ 81AA11B
+	.incbin "baserom.gba", 0x1AA11B, 0x3E
+
+Route8_EventScript_1AA159:: @ 81AA159
+	.incbin "baserom.gba", 0x1AA159, 0x3E
+
+Route8_EventScript_1AA197:: @ 81AA197
+	.incbin "baserom.gba", 0x1AA197, 0x3E
+
+Route8_EventScript_1AA1D5:: @ 81AA1D5
+	.incbin "baserom.gba", 0x1AA1D5, 0x3E
+
+Route8_EventScript_1AA213:: @ 81AA213
+	.incbin "baserom.gba", 0x1AA213, 0x3E
+
+Route8_EventScript_1AA251:: @ 81AA251
+	.incbin "baserom.gba", 0x1AA251, 0x3E
+
+Route8_EventScript_1AA28F:: @ 81AA28F
+	.incbin "baserom.gba", 0x1AA28F, 0x3E
+
+Route8_EventScript_1AA2CD:: @ 81AA2CD
+	.incbin "baserom.gba", 0x1AA2CD, 0x3E
+
+Route8_EventScript_1AA30B:: @ 81AA30B
+	.incbin "baserom.gba", 0x1AA30B, 0x3E
+
+Route8_EventScript_1AA349:: @ 81AA349
+	.incbin "baserom.gba", 0x1AA349, 0x46
+
+Route8_EventScript_1AA38F:: @ 81AA38F
+	.incbin "baserom.gba", 0x1AA38F, 0x46
+
+Route8_EventScript_1AA3D5:: @ 81AA3D5
+	.incbin "baserom.gba", 0x1AA3D5, 0x3E
+
+Route8_EventScript_1AA413:: @ 81AA413
+	.incbin "baserom.gba", 0x1AA413, 0x3E
+
+Route12_EventScript_1AA451:: @ 81AA451
+	.incbin "baserom.gba", 0x1AA451, 0x3E
+
+Route12_EventScript_1AA48F:: @ 81AA48F
+	.incbin "baserom.gba", 0x1AA48F, 0x3E
+
+Route12_EventScript_1AA4CD:: @ 81AA4CD
+	.incbin "baserom.gba", 0x1AA4CD, 0x3E
+
+Route12_EventScript_1AA50B:: @ 81AA50B
+	.incbin "baserom.gba", 0x1AA50B, 0x3E
+
+Route12_EventScript_1AA549:: @ 81AA549
+	.incbin "baserom.gba", 0x1AA549, 0x3E
+
+Route12_EventScript_1AA587:: @ 81AA587
+	.incbin "baserom.gba", 0x1AA587, 0x3E
+
+Route12_EventScript_1AA5C5:: @ 81AA5C5
+	.incbin "baserom.gba", 0x1AA5C5, 0x3E
+
+Route12_EventScript_1AA603:: @ 81AA603
+	.incbin "baserom.gba", 0x1AA603, 0x46
+
+Route12_EventScript_1AA649:: @ 81AA649
+	.incbin "baserom.gba", 0x1AA649, 0x46
+
+Route13_EventScript_1AA68F:: @ 81AA68F
+	.incbin "baserom.gba", 0x1AA68F, 0x3E
+
+Route13_EventScript_1AA6CD:: @ 81AA6CD
+	.incbin "baserom.gba", 0x1AA6CD, 0x3E
+
+Route13_EventScript_1AA70B:: @ 81AA70B
+	.incbin "baserom.gba", 0x1AA70B, 0x3E
+
+Route13_EventScript_1AA749:: @ 81AA749
+	.incbin "baserom.gba", 0x1AA749, 0x3E
+
+Route13_EventScript_1AA787:: @ 81AA787
+	.incbin "baserom.gba", 0x1AA787, 0x3E
+
+Route13_EventScript_1AA7C5:: @ 81AA7C5
+	.incbin "baserom.gba", 0x1AA7C5, 0x3E
+
+Route13_EventScript_1AA803:: @ 81AA803
+	.incbin "baserom.gba", 0x1AA803, 0x3E
+
+Route13_EventScript_1AA841:: @ 81AA841
+	.incbin "baserom.gba", 0x1AA841, 0x3E
+
+Route13_EventScript_1AA87F:: @ 81AA87F
+	.incbin "baserom.gba", 0x1AA87F, 0x3E
+
+Route13_EventScript_1AA8BD:: @ 81AA8BD
+	.incbin "baserom.gba", 0x1AA8BD, 0x3E
+
+Route14_EventScript_1AA8FB:: @ 81AA8FB
+	.incbin "baserom.gba", 0x1AA8FB, 0x3E
+
+Route14_EventScript_1AA939:: @ 81AA939
+	.incbin "baserom.gba", 0x1AA939, 0x3E
+
+Route14_EventScript_1AA977:: @ 81AA977
+	.incbin "baserom.gba", 0x1AA977, 0x3E
+
+Route14_EventScript_1AA9B5:: @ 81AA9B5
+	.incbin "baserom.gba", 0x1AA9B5, 0x3E
+
+Route14_EventScript_1AA9F3:: @ 81AA9F3
+	.incbin "baserom.gba", 0x1AA9F3, 0x3E
+
+Route14_EventScript_1AAA31:: @ 81AAA31
+	.incbin "baserom.gba", 0x1AAA31, 0x3E
+
+Route14_EventScript_1AAA6F:: @ 81AAA6F
+	.incbin "baserom.gba", 0x1AAA6F, 0x3E
+
+Route14_EventScript_1AAAAD:: @ 81AAAAD
+	.incbin "baserom.gba", 0x1AAAAD, 0x3E
+
+Route14_EventScript_1AAAEB:: @ 81AAAEB
+	.incbin "baserom.gba", 0x1AAAEB, 0x3E
+
+Route14_EventScript_1AAB29:: @ 81AAB29
+	.incbin "baserom.gba", 0x1AAB29, 0x3E
+
+Route14_EventScript_1AAB67:: @ 81AAB67
+	.incbin "baserom.gba", 0x1AAB67, 0x46
+
+Route14_EventScript_1AABAD:: @ 81AABAD
+	.incbin "baserom.gba", 0x1AABAD, 0x46
+
+Route15_EventScript_1AABF3:: @ 81AABF3
+	.incbin "baserom.gba", 0x1AABF3, 0x3E
+
+Route15_EventScript_1AAC31:: @ 81AAC31
+	.incbin "baserom.gba", 0x1AAC31, 0x3E
+
+Route15_EventScript_1AAC6F:: @ 81AAC6F
+	.incbin "baserom.gba", 0x1AAC6F, 0x3E
+
+Route15_EventScript_1AACAD:: @ 81AACAD
+	.incbin "baserom.gba", 0x1AACAD, 0x3E
+
+Route15_EventScript_1AACEB:: @ 81AACEB
+	.incbin "baserom.gba", 0x1AACEB, 0x3E
+
+Route15_EventScript_1AAD29:: @ 81AAD29
+	.incbin "baserom.gba", 0x1AAD29, 0x3E
+
+Route15_EventScript_1AAD67:: @ 81AAD67
+	.incbin "baserom.gba", 0x1AAD67, 0x3E
+
+Route15_EventScript_1AADA5:: @ 81AADA5
+	.incbin "baserom.gba", 0x1AADA5, 0x3E
+
+Route15_EventScript_1AADE3:: @ 81AADE3
+	.incbin "baserom.gba", 0x1AADE3, 0x3E
+
+Route15_EventScript_1AAE21:: @ 81AAE21
+	.incbin "baserom.gba", 0x1AAE21, 0x3E
+
+Route15_EventScript_1AAE5F:: @ 81AAE5F
+	.incbin "baserom.gba", 0x1AAE5F, 0x46
+
+Route15_EventScript_1AAEA5:: @ 81AAEA5
+	.incbin "baserom.gba", 0x1AAEA5, 0x46
+
+Route16_EventScript_1AAEEB:: @ 81AAEEB
+	.incbin "baserom.gba", 0x1AAEEB, 0x3E
+
+Route16_EventScript_1AAF29:: @ 81AAF29
+	.incbin "baserom.gba", 0x1AAF29, 0x3E
+
+Route16_EventScript_1AAF67:: @ 81AAF67
+	.incbin "baserom.gba", 0x1AAF67, 0x3E
+
+Route16_EventScript_1AAFA5:: @ 81AAFA5
+	.incbin "baserom.gba", 0x1AAFA5, 0x3E
+
+Route16_EventScript_1AAFE3:: @ 81AAFE3
+	.incbin "baserom.gba", 0x1AAFE3, 0x3E
+
+Route16_EventScript_1AB021:: @ 81AB021
+	.incbin "baserom.gba", 0x1AB021, 0x3E
+
+Route16_EventScript_1AB05F:: @ 81AB05F
+	.incbin "baserom.gba", 0x1AB05F, 0x46
+
+Route16_EventScript_1AB0A5:: @ 81AB0A5
+	.incbin "baserom.gba", 0x1AB0A5, 0x46
+
+Route17_EventScript_1AB0EB:: @ 81AB0EB
+	.incbin "baserom.gba", 0x1AB0EB, 0x3E
+
+Route17_EventScript_1AB129:: @ 81AB129
+	.incbin "baserom.gba", 0x1AB129, 0x3E
+
+Route17_EventScript_1AB167:: @ 81AB167
+	.incbin "baserom.gba", 0x1AB167, 0x3E
+
+Route17_EventScript_1AB1A5:: @ 81AB1A5
+	.incbin "baserom.gba", 0x1AB1A5, 0x3E
+
+Route17_EventScript_1AB1E3:: @ 81AB1E3
+	.incbin "baserom.gba", 0x1AB1E3, 0x3E
+
+Route17_EventScript_1AB221:: @ 81AB221
+	.incbin "baserom.gba", 0x1AB221, 0x3E
+
+Route17_EventScript_1AB25F:: @ 81AB25F
+	.incbin "baserom.gba", 0x1AB25F, 0x3E
+
+Route17_EventScript_1AB29D:: @ 81AB29D
+	.incbin "baserom.gba", 0x1AB29D, 0x3E
+
+Route17_EventScript_1AB2DB:: @ 81AB2DB
+	.incbin "baserom.gba", 0x1AB2DB, 0x3E
+
+Route17_EventScript_1AB319:: @ 81AB319
+	.incbin "baserom.gba", 0x1AB319, 0x3E
+
+Route18_EventScript_1AB357:: @ 81AB357
+	.incbin "baserom.gba", 0x1AB357, 0x3E
+
+Route18_EventScript_1AB395:: @ 81AB395
+	.incbin "baserom.gba", 0x1AB395, 0x3E
+
+Route18_EventScript_1AB3D3:: @ 81AB3D3
+	.incbin "baserom.gba", 0x1AB3D3, 0x3E
+
+Route19_EventScript_1AB411:: @ 81AB411
+	.incbin "baserom.gba", 0x1AB411, 0x3E
+
+Route19_EventScript_1AB44F:: @ 81AB44F
+	.incbin "baserom.gba", 0x1AB44F, 0x3E
+
+Route19_EventScript_1AB48D:: @ 81AB48D
+	.incbin "baserom.gba", 0x1AB48D, 0x3E
+
+Route19_EventScript_1AB4CB:: @ 81AB4CB
+	.incbin "baserom.gba", 0x1AB4CB, 0x3E
+
+Route19_EventScript_1AB509:: @ 81AB509
+	.incbin "baserom.gba", 0x1AB509, 0x3E
+
+Route19_EventScript_1AB547:: @ 81AB547
+	.incbin "baserom.gba", 0x1AB547, 0x3E
+
+Route19_EventScript_1AB585:: @ 81AB585
+	.incbin "baserom.gba", 0x1AB585, 0x3E
+
+Route19_EventScript_1AB5C3:: @ 81AB5C3
+	.incbin "baserom.gba", 0x1AB5C3, 0x3E
+
+Route19_EventScript_1AB601:: @ 81AB601
+	.incbin "baserom.gba", 0x1AB601, 0x3E
+
+Route19_EventScript_1AB63F:: @ 81AB63F
+	.incbin "baserom.gba", 0x1AB63F, 0x3E
+
+Route19_EventScript_1AB67D:: @ 81AB67D
+	.incbin "baserom.gba", 0x1AB67D, 0x46
+
+Route19_EventScript_1AB6C3:: @ 81AB6C3
+	.incbin "baserom.gba", 0x1AB6C3, 0x46
+
+Route20_EventScript_1AB709:: @ 81AB709
+	.incbin "baserom.gba", 0x1AB709, 0x3E
+
+Route20_EventScript_1AB747:: @ 81AB747
+	.incbin "baserom.gba", 0x1AB747, 0x3E
+
+Route20_EventScript_1AB785:: @ 81AB785
+	.incbin "baserom.gba", 0x1AB785, 0x3E
+
+Route20_EventScript_1AB7C3:: @ 81AB7C3
+	.incbin "baserom.gba", 0x1AB7C3, 0x3E
+
+Route20_EventScript_1AB801:: @ 81AB801
+	.incbin "baserom.gba", 0x1AB801, 0x3E
+
+Route20_EventScript_1AB83F:: @ 81AB83F
+	.incbin "baserom.gba", 0x1AB83F, 0x3E
+
+Route20_EventScript_1AB87D:: @ 81AB87D
+	.incbin "baserom.gba", 0x1AB87D, 0x3E
+
+Route20_EventScript_1AB8BB:: @ 81AB8BB
+	.incbin "baserom.gba", 0x1AB8BB, 0x3E
+
+Route20_EventScript_1AB8F9:: @ 81AB8F9
+	.incbin "baserom.gba", 0x1AB8F9, 0x3E
+
+Route20_EventScript_1AB937:: @ 81AB937
+	.incbin "baserom.gba", 0x1AB937, 0x3E
+
+Route21_North_EventScript_1AB975:: @ 81AB975
+	.incbin "baserom.gba", 0x1AB975, 0x3E
+
+Route21_South_EventScript_1AB9B3:: @ 81AB9B3
+	.incbin "baserom.gba", 0x1AB9B3, 0x3E
+
+Route21_North_EventScript_1AB9F1:: @ 81AB9F1
+	.incbin "baserom.gba", 0x1AB9F1, 0x3E
+
+Route21_South_EventScript_1ABA2F:: @ 81ABA2F
+	.incbin "baserom.gba", 0x1ABA2F, 0x3E
+
+Route21_North_EventScript_1ABA6D:: @ 81ABA6D
+	.incbin "baserom.gba", 0x1ABA6D, 0x3E
+
+Route21_South_EventScript_1ABAAB:: @ 81ABAAB
+	.incbin "baserom.gba", 0x1ABAAB, 0x3E
+
+Route21_South_EventScript_1ABAE9:: @ 81ABAE9
+	.incbin "baserom.gba", 0x1ABAE9, 0x3E
+
+Route21_South_EventScript_1ABB27:: @ 81ABB27
+	.incbin "baserom.gba", 0x1ABB27, 0x3E
+
+Route21_North_EventScript_1ABB65:: @ 81ABB65
+	.incbin "baserom.gba", 0x1ABB65, 0x46
+
+Route21_North_EventScript_1ABBAB:: @ 81ABBAB
+	.incbin "baserom.gba", 0x1ABBAB, 0x46
+
+OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1
+	.incbin "baserom.gba", 0x1ABBF1, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F
+	.incbin "baserom.gba", 0x1ABC2F, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D
+	.incbin "baserom.gba", 0x1ABC6D, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB
+	.incbin "baserom.gba", 0x1ABCAB, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9
+	.incbin "baserom.gba", 0x1ABCE9, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27
+	.incbin "baserom.gba", 0x1ABD27, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65
+	.incbin "baserom.gba", 0x1ABD65, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3
+	.incbin "baserom.gba", 0x1ABDA3, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1
+	.incbin "baserom.gba", 0x1ABDE1, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F
+	.incbin "baserom.gba", 0x1ABE1F, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D
+	.incbin "baserom.gba", 0x1ABE5D, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B
+	.incbin "baserom.gba", 0x1ABE9B, 0x46
+
+OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1
+	.incbin "baserom.gba", 0x1ABEE1, 0x46
+
+OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27
+	.incbin "baserom.gba", 0x1ABF27, 0x3E
+
+ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65
+	.incbin "baserom.gba", 0x1ABF65, 0x3E
+
+ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3
+	.incbin "baserom.gba", 0x1ABFA3, 0x3E
+
+ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1
+	.incbin "baserom.gba", 0x1ABFE1, 0x3E
+
+ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F
+	.incbin "baserom.gba", 0x1AC01F, 0x3E
+
+ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D
+	.incbin "baserom.gba", 0x1AC05D, 0x3E
+
+ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B
+	.incbin "baserom.gba", 0x1AC09B, 0x46
+
+ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1
+	.incbin "baserom.gba", 0x1AC0E1, 0x46
+
+FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127
+	.incbin "baserom.gba", 0x1AC127, 0x3E
+
+FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165
+	.incbin "baserom.gba", 0x1AC165, 0x3E
+
+FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3
+	.incbin "baserom.gba", 0x1AC1A3, 0x3E
+
+FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1
+	.incbin "baserom.gba", 0x1AC1E1, 0x3E
+
+FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F
+	.incbin "baserom.gba", 0x1AC21F, 0x3E
+
+FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D
+	.incbin "baserom.gba", 0x1AC25D, 0x3E
+
+FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B
+	.incbin "baserom.gba", 0x1AC29B, 0x3E
+
+FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9
+	.incbin "baserom.gba", 0x1AC2D9, 0x3E
+
+FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317
+	.incbin "baserom.gba", 0x1AC317, 0x3E
+
+FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355
+	.incbin "baserom.gba", 0x1AC355, 0x3E
+
+FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393
+	.incbin "baserom.gba", 0x1AC393, 0x3E
+
+SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1
+	.incbin "baserom.gba", 0x1AC3D1, 0x3E
+
+SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F
+	.incbin "baserom.gba", 0x1AC40F, 0x3E
+
+SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D
+	.incbin "baserom.gba", 0x1AC44D, 0x3E
+
+SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B
+	.incbin "baserom.gba", 0x1AC48B, 0x46
+
+SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1
+	.incbin "baserom.gba", 0x1AC4D1, 0x46
+
+SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517
+	.incbin "baserom.gba", 0x1AC517, 0x3E
+
+SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555
+	.incbin "baserom.gba", 0x1AC555, 0x3E
+
+SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593
+	.incbin "baserom.gba", 0x1AC593, 0x3E
+
+SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1
+	.incbin "baserom.gba", 0x1AC5D1, 0x3E
+
+SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F
+	.incbin "baserom.gba", 0x1AC60F, 0x3E
+
+SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D
+	.incbin "baserom.gba", 0x1AC64D, 0x46
+
+SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693
+	.incbin "baserom.gba", 0x1AC693, 0x46
+
+SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9
+	.incbin "baserom.gba", 0x1AC6D9, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717
+	.incbin "baserom.gba", 0x1AC717, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755
+	.incbin "baserom.gba", 0x1AC755, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793
+	.incbin "baserom.gba", 0x1AC793, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1
+	.incbin "baserom.gba", 0x1AC7D1, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F
+	.incbin "baserom.gba", 0x1AC80F, 0x3E
+
+SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D
+	.incbin "baserom.gba", 0x1AC84D, 0x3E
+
+SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B
+	.incbin "baserom.gba", 0x1AC88B, 0x3E
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9
+	.incbin "baserom.gba", 0x1AC8C9, 0x3E
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907
+	.incbin "baserom.gba", 0x1AC907, 0x46
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D
+	.incbin "baserom.gba", 0x1AC94D, 0x46
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993
+	.incbin "baserom.gba", 0x1AC993, 0x3E
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1
+	.incbin "baserom.gba", 0x1AC9D1, 0x3E
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F
+	.incbin "baserom.gba", 0x1ACA0F, 0x3E
+
+SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D
+	.incbin "baserom.gba", 0x1ACA4D, 0x3E
+
+SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B
+	.incbin "baserom.gba", 0x1ACA8B, 0x3E
+
+SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9
+	.incbin "baserom.gba", 0x1ACAC9, 0x3E
+
+SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07
+	.incbin "baserom.gba", 0x1ACB07, 0x3E
+
+SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45
+	.incbin "baserom.gba", 0x1ACB45, 0x3E
+
+SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83
+	.incbin "baserom.gba", 0x1ACB83, 0x3E
+
+SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1
+	.incbin "baserom.gba", 0x1ACBC1, 0x46
+
+SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07
+	.incbin "baserom.gba", 0x1ACC07, 0x46
+
+SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D
+	.incbin "baserom.gba", 0x1ACC4D, 0x3E
+
+SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B
+	.incbin "baserom.gba", 0x1ACC8B, 0x3E
+
+SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9
+	.incbin "baserom.gba", 0x1ACCC9, 0x3E
+
+SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07
+	.incbin "baserom.gba", 0x1ACD07, 0x5E
+
+ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65
+	.incbin "baserom.gba", 0x1ACD65, 0x6B
+
+FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0
+	.incbin "baserom.gba", 0x1ACDD0, 0x1A
+
+Route4_EventScript_1ACDEA:: @ 81ACDEA
+	.incbin "baserom.gba", 0x1ACDEA, 0x19
+
+MtMoon_1F_EventScript_1ACE03:: @ 81ACE03
+	.incbin "baserom.gba", 0x1ACE03, 0x19
+
+PewterCity_Museum_1F_EventScript_1ACE1C:: @ 81ACE1C
+	.incbin "baserom.gba", 0x1ACE1C, 0x1A
+
+Route20_EventScript_1ACE36:: @ 81ACE36
+	.incbin "baserom.gba", 0x1ACE36, 0x19
+
+Route25_EventScript_1ACE4F:: @ 81ACE4F
+	.incbin "baserom.gba", 0x1ACE4F, 0x19
+
+CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68
+	.incbin "baserom.gba", 0x1ACE68, 0x1B
+
+VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83
+	.incbin "baserom.gba", 0x1ACE83, 0x1A
+
+CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D
+	.incbin "baserom.gba", 0x1ACE9D, 0x1B
+
+FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8
+	.incbin "baserom.gba", 0x1ACEB8, 0x1B
+
+SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3
+	.incbin "baserom.gba", 0x1ACED3, 0x19
+
+SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC
+	.incbin "baserom.gba", 0x1ACEEC, 0x1B
+
+CinnabarIsland_Gym_EventScript_1ACF07:: @ 81ACF07
+	.incbin "baserom.gba", 0x1ACF07, 0x25
+
+FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
+	.incbin "baserom.gba", 0x1ACF2C, 0x1A
+
+FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46
+	.incbin "baserom.gba", 0x1ACF46, 0x19
+
+FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F
+	.incbin "baserom.gba", 0x1ACF5F, 0x1B
+
+SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A
+	.incbin "baserom.gba", 0x1ACF7A, 0x1B
+
+SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95
+	.incbin "baserom.gba", 0x1ACF95, 0x19
+
+IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE
+	.incbin "baserom.gba", 0x1ACFAE, 0x26
+
+SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4
+	.incbin "baserom.gba", 0x1ACFD4, 0x1B
+
+SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF
+	.incbin "baserom.gba", 0x1ACFEF, 0x4B
+
+SaffronCity_Duplicate_EventScript_1AD03A:: @ 81AD03A
+	.incbin "baserom.gba", 0x1AD03A, 0x19
+
+CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053
+	.incbin "baserom.gba", 0x1AD053, 0x19
+
+IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C
+	.incbin "baserom.gba", 0x1AD06C, 0x1B
+
+IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087
+	.incbin "baserom.gba", 0x1AD087, 0x19
+
+LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0
+	.incbin "baserom.gba", 0x1AD0A0, 0x19
+
+CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9
+	.incbin "baserom.gba", 0x1AD0B9, 0x1B
+
+SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4
+	.incbin "baserom.gba", 0x1AD0D4, 0x19
+
+@ 0x19
+SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED
+	.incbin "baserom.gba", 0x1AD0ED, 0x19
+
+	.include "data/text/fame_checker.inc"
+
+CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
+	.incbin "baserom.gba", 0x1B2867, 0xD1
+
+FourIsland_House2_EventScript_1B2938:: @ 81B2938
+	.incbin "baserom.gba", 0x1B2938, 0x4C0
+
+	.include "data/text/help_system.inc"
+
+CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+FourIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+OneIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+PewterCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+Route10_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+Route4_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+SixIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
+	.incbin "baserom.gba", 0x1BB1B4, 0x1E
+
+CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+FiveIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+OneIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+PewterCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+SevenIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+VermilionCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+FourIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+SixIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+TwoIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+Route10_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+Route10_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+Route4_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+SaffronCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+CeladonCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+LavenderTown_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+ViridianCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+	.incbin "baserom.gba", 0x1BB1D2, 0x1B
+
+CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+FourIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+OneIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+PewterCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+Route10_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+Route4_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+SixIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
+	.incbin "baserom.gba", 0x1BB1ED, 0x3A
+
+EventScript_1BB227:: @ 81BB227
+	.incbin "baserom.gba", 0x1BB227, 0x10
+
+CeladonCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+CeruleanCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+FiveIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+FourIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+LavenderTown_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+OneIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+PewterCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+Route10_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+Route4_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+SaffronCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+SevenIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+SixIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+ThreeIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+TwoIsland_JoyfulGameCorner_MapScript4_1BB237:: @ 81BB237
+TwoIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+VermilionCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+ViridianCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237
+	.incbin "baserom.gba", 0x1BB237, 0x6C
+
+CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+FourIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+OneIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+PewterCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+Route10_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+Route4_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+SixIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3
+	.incbin "baserom.gba", 0x1BB2A3, 0x5A
+
+EventScript_1BB2FD:: @ 81BB2FD
+	.incbin "baserom.gba", 0x1BB2FD, 0x1A6
+
+EventScript_1BB4A3:: @ 81BB4A3
+	.incbin "baserom.gba", 0x1BB4A3, 0x208
+
+EventScript_1BB6AB:: @ 81BB6AB
+	.incbin "baserom.gba", 0x1BB6AB, 0x133
+
+EventScript_1BB7DE:: @ 81BB7DE
+	.incbin "baserom.gba", 0x1BB7DE, 0xC9
+
+gUnknown_81BB8A7:: @ 81BB8A7
+	.incbin "baserom.gba", 0x1BB8A7, 0x1C
+
+gUnknown_81BB8C3:: @ 81BB8C3
+UnknownMap_00_00_EventScript_1BB8C3:: @ 81BB8C3
+	.incbin "baserom.gba", 0x1BB8C3, 0xC
+
+gUnknown_81BB8CF:: @ 81BB8CF
+UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF
+	.incbin "baserom.gba", 0x1BB8CF, 0xC
+
+gUnknown_81BB8DB:: @ 81BB8DB
+UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
+	.incbin "baserom.gba", 0x1BB8DB, 0x1D
+
+gUnknown_81BB8F8:: @ 81BB8F8
+UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
+	.incbin "baserom.gba", 0x1BB8F8, 0x1D
+
+gUnknown_81BB915:: @ 81BB915
+UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
+	.incbin "baserom.gba", 0x1BB915, 0x1D
+
+gUnknown_81BB932:: @ 81BB932
+UnknownMap_00_03_EventScript_1BB932:: @ 81BB932
+	.incbin "baserom.gba", 0x1BB932, 0x1E
+
+gUnknown_81BB950:: @ 81BB950
+UnknownMap_00_01_EventScript_1BB950:: @ 81BB950
+	.incbin "baserom.gba", 0x1BB950, 0xC
+
+gUnknown_81BB95C:: @ 81BB95C
+UnknownMap_00_01_EventScript_1BB95C:: @ 81BB95C
+	.incbin "baserom.gba", 0x1BB95C, 0x24
+
+gUnknown_81BB980:: @ 81BB980
+UnknownMap_00_02_EventScript_1BB980:: @ 81BB980
+	.incbin "baserom.gba", 0x1BB980, 0x1
+
+gUnknown_81BB981:: @ 81BB981
+	.incbin "baserom.gba", 0x1BB981, 0x11
+
+gUnknown_81BB992:: @ 81BB992
+	.incbin "baserom.gba", 0x1BB992, 0x11
+
+gUnknown_81BB9A3:: @ 81BB9A3
+	.incbin "baserom.gba", 0x1BB9A3, 0xC
+
+UnknownMap_00_00_EventScript_1BB9AF:: @ 81BB9AF
+	.incbin "baserom.gba", 0x1BB9AF, 0x12
+
+UnknownMap_00_01_EventScript_1BB9C1:: @ 81BB9C1
+	.incbin "baserom.gba", 0x1BB9C1, 0x12
+
+UnknownMap_00_02_EventScript_1BB9D3:: @ 81BB9D3
+	.incbin "baserom.gba", 0x1BB9D3, 0x1
+
+gUnknown_81BB9D4:: @ 81BB9D4
+	.incbin "baserom.gba", 0x1BB9D4, 0x1C
+
+gUnknown_81BB9F0:: @ 81BB9F0
+	.incbin "baserom.gba", 0x1BB9F0, 0xC
+
+gUnknown_81BB9FC:: @ 81BB9FC
+	.incbin "baserom.gba", 0x1BB9FC, 0x5DC
+
+gUnknown_81BBFD8:: @ 81BBFD8
+	.incbin "baserom.gba", 0x1BBFD8, 0x84
+
+CeladonCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+FiveIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+FourIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+LavenderTown_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+OneIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+PewterCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+Route10_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+Route4_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+SaffronCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+SevenIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+SixIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+TwoIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+VermilionCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
+	.incbin "baserom.gba", 0x1BC05C, 0x4
+
+EventScript_1BC060:: @ 81BC060
+	.incbin "baserom.gba", 0x1BC060, 0x6E
+
+EventScript_1BC0CE:: @ 81BC0CE
+	.incbin "baserom.gba", 0x1BC0CE, 0x219
+
+TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7
+	.incbin "baserom.gba", 0x1BC2E7, 0x15
+
+TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC
+	.incbin "baserom.gba", 0x1BC2FC, 0x1B0
+
+gUnknown_81BC4AC:: @ 81BC4AC
+	.incbin "baserom.gba", 0x1BC4AC, 0x22
+
+gUnknown_81BC4CE:: @ 81BC4CE
+	.incbin "baserom.gba", 0x1BC4CE, 0x3F
+
+gUnknown_81BC50D:: @ 81BC50D
+	.incbin "baserom.gba", 0x1BC50D, 0x3F
+
+gUnknown_81BC54C:: @ 81BC54C
+	.incbin "baserom.gba", 0x1BC54C, 0x77E
+
+Text_1BCCCA:: @ 81BCCCA
+	.incbin "baserom.gba", 0x1BCCCA, 0x1249
+
+CeladonCity_EventScript_1BDF13:: @ 81BDF13
+CeladonCity_Gym_EventScript_1BDF13:: @ 81BDF13
+FiveIsland_Meadow_EventScript_1BDF13:: @ 81BDF13
+PewterCity_EventScript_1BDF13:: @ 81BDF13
+Route10_EventScript_1BDF13:: @ 81BDF13
+Route12_EventScript_1BDF13:: @ 81BDF13
+Route14_EventScript_1BDF13:: @ 81BDF13
+Route16_EventScript_1BDF13:: @ 81BDF13
+Route25_EventScript_1BDF13:: @ 81BDF13
+Route2_EventScript_1BDF13:: @ 81BDF13
+Route8_EventScript_1BDF13:: @ 81BDF13
+ThreeIsland_BerryForest_EventScript_1BDF13:: @ 81BDF13
+ThreeIsland_BondBridge_EventScript_1BDF13:: @ 81BDF13
+ThreeIsland_EventScript_1BDF13:: @ 81BDF13
+Route9_EventScript_1BDF13:: @ 81BDF13
+Route13_EventScript_1BDF13:: @ 81BDF13
+TwoIsland_EventScript_1BDF13:: @ 81BDF13
+FuchsiaCity_EventScript_1BDF13:: @ 81BDF13
+VermilionCity_EventScript_1BDF13:: @ 81BDF13
+VermilionCity_EventScript_1BDF13:: @ 81BDF13
+CeruleanCity_EventScript_1BDF13:: @ 81BDF13
+ViridianCity_EventScript_1BDF13:: @ 81BDF13
+	.incbin "baserom.gba", 0x1BDF13, 0x58
+
+gUnknown_81BDF6B:: @ 81BDF6B
+	.incbin "baserom.gba", 0x1BDF6B, 0xA1
+
+CeruleanCave_2F_EventScript_1BE00C:: @ 81BE00C
+MtEmber_Exterior_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B2F_EventScript_1BE00C:: @ 81BE00C
+MtEmber_SummitPath_2F_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_1F_EventScript_1BE00C:: @ 81BE00C
+SevenIsland_SevaultCanyon_EventScript_1BE00C:: @ 81BE00C
+FourIsland_EventScript_1BE00C:: @ 81BE00C
+OneIsland_KindleRoad_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B3F_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B1F_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B1F_EventScript_1BE00C:: @ 81BE00C
+RockTunnel_B1F_EventScript_1BE00C:: @ 81BE00C
+CeruleanCave_B1F_EventScript_1BE00C:: @ 81BE00C
+CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C
+	.incbin "baserom.gba", 0x1BE00C, 0x58
+
+gUnknown_81BE064:: @ 81BE064
+	.incbin "baserom.gba", 0x1BE064, 0xB9
+
+MtEmber_Exterior_EventScript_1BE11D:: @ 81BE11D
+MtEmber_RubyPath_B2F_EventScript_1BE11D:: @ 81BE11D
+MtEmber_Summit_EventScript_1BE11D:: @ 81BE11D
+SeafoamIslands_1F_EventScript_1BE11D:: @ 81BE11D
+SeafoamIslands_B2F_EventScript_1BE11D:: @ 81BE11D
+SevenIsland_SevaultCanyon_EventScript_1BE11D:: @ 81BE11D
+VictoryRoad_1F_EventScript_1BE11D:: @ 81BE11D
+VictoryRoad_3F_EventScript_1BE11D:: @ 81BE11D
+SixIsland_RuinValley_EventScript_1BE11D:: @ 81BE11D
+FuchsiaCity_Building1_EventScript_1BE11D:: @ 81BE11D
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D:: @ 81BE11D
+MtEmber_RubyPath_B3F_EventScript_1BE11D:: @ 81BE11D
+SeafoamIslands_B3F_EventScript_1BE11D:: @ 81BE11D
+SeafoamIslands_B3F_EventScript_1BE11D:: @ 81BE11D
+SeafoamIslands_B1F_EventScript_1BE11D:: @ 81BE11D
+VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D
+	.incbin "baserom.gba", 0x1BE11D, 0x51
+
+gUnknown_81BE16E:: @ 81BE16E
+	.incbin "baserom.gba", 0x1BE16E, 0x149
+
+gUnknown_81BE2B7:: @ 81BE2B7
+	.incbin "baserom.gba", 0x1BE2B7, 0x48
+
+gUnknown_81BE2FF:: @ 81BE2FF
+	.incbin "baserom.gba", 0x1BE2FF, 0x265
+
+gUnknown_81BE564:: @ 81BE564
+	.incbin "baserom.gba", 0x1BE564, 0x2A
+
+Route2_EventScript_1BE58E:: @ 81BE58E
+	.incbin "baserom.gba", 0x1BE58E, 0xD
+
+Route2_EventScript_1BE59B:: @ 81BE59B
+	.incbin "baserom.gba", 0x1BE59B, 0xD
+
+ViridianForest_EventScript_1BE5A8:: @ 81BE5A8
+	.incbin "baserom.gba", 0x1BE5A8, 0xD
+
+ViridianForest_EventScript_1BE5B5:: @ 81BE5B5
+	.incbin "baserom.gba", 0x1BE5B5, 0xD
+
+ViridianForest_EventScript_1BE5C2:: @ 81BE5C2
+	.incbin "baserom.gba", 0x1BE5C2, 0xD
+
+MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF
+	.incbin "baserom.gba", 0x1BE5CF, 0xD
+
+MtMoon_1F_EventScript_1BE5DC:: @ 81BE5DC
+	.incbin "baserom.gba", 0x1BE5DC, 0xD
+
+MtMoon_1F_EventScript_1BE5E9:: @ 81BE5E9
+	.incbin "baserom.gba", 0x1BE5E9, 0xD
+
+MtMoon_1F_EventScript_1BE5F6:: @ 81BE5F6
+	.incbin "baserom.gba", 0x1BE5F6, 0xD
+
+MtMoon_1F_EventScript_1BE603:: @ 81BE603
+	.incbin "baserom.gba", 0x1BE603, 0xD
+
+MtMoon_1F_EventScript_1BE610:: @ 81BE610
+	.incbin "baserom.gba", 0x1BE610, 0xD
+
+MtMoon_B2F_EventScript_1BE61D:: @ 81BE61D
+	.incbin "baserom.gba", 0x1BE61D, 0xD
+
+MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A
+	.incbin "baserom.gba", 0x1BE62A, 0xD
+
+Route4_EventScript_1BE637:: @ 81BE637
+	.incbin "baserom.gba", 0x1BE637, 0xD
+
+Route24_EventScript_1BE644:: @ 81BE644
+	.incbin "baserom.gba", 0x1BE644, 0xD
+
+Route25_EventScript_1BE651:: @ 81BE651
+	.incbin "baserom.gba", 0x1BE651, 0xD
+
+SSAnne_1F_Room2_EventScript_1BE65E:: @ 81BE65E
+	.incbin "baserom.gba", 0x1BE65E, 0xD
+
+SSAnne_2F_Room2_EventScript_1BE66B:: @ 81BE66B
+	.incbin "baserom.gba", 0x1BE66B, 0xD
+
+SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678
+	.incbin "baserom.gba", 0x1BE678, 0xD
+
+SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685
+	.incbin "baserom.gba", 0x1BE685, 0xD
+
+SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692
+	.incbin "baserom.gba", 0x1BE692, 0xD
+
+SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F
+	.incbin "baserom.gba", 0x1BE69F, 0xD
+
+SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC
+	.incbin "baserom.gba", 0x1BE6AC, 0xD
+
+Route9_EventScript_1BE6B9:: @ 81BE6B9
+	.incbin "baserom.gba", 0x1BE6B9, 0xD
+
+RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6
+	.incbin "baserom.gba", 0x1BE6C6, 0xD
+
+RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3
+	.incbin "baserom.gba", 0x1BE6D3, 0xD
+
+RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0
+	.incbin "baserom.gba", 0x1BE6E0, 0xD
+
+RocketHideout_B2F_EventScript_1BE6ED:: @ 81BE6ED
+	.incbin "baserom.gba", 0x1BE6ED, 0xD
+
+RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA
+	.incbin "baserom.gba", 0x1BE6FA, 0xD
+
+RocketHideout_B2F_EventScript_1BE707:: @ 81BE707
+	.incbin "baserom.gba", 0x1BE707, 0xD
+
+RocketHideout_B3F_EventScript_1BE714:: @ 81BE714
+	.incbin "baserom.gba", 0x1BE714, 0xD
+
+RocketHideout_B3F_EventScript_1BE721:: @ 81BE721
+	.incbin "baserom.gba", 0x1BE721, 0xD
+
+RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E
+	.incbin "baserom.gba", 0x1BE72E, 0xD
+
+RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B
+	.incbin "baserom.gba", 0x1BE73B, 0xD
+
+RocketHideout_B4F_EventScript_1BE748:: @ 81BE748
+	.incbin "baserom.gba", 0x1BE748, 0xD
+
+PokemonTower_3F_EventScript_1BE755:: @ 81BE755
+	.incbin "baserom.gba", 0x1BE755, 0xD
+
+PokemonTower_4F_EventScript_1BE762:: @ 81BE762
+	.incbin "baserom.gba", 0x1BE762, 0xD
+
+PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F
+	.incbin "baserom.gba", 0x1BE76F, 0xD
+
+PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C
+	.incbin "baserom.gba", 0x1BE77C, 0xD
+
+PokemonTower_5F_EventScript_1BE789:: @ 81BE789
+	.incbin "baserom.gba", 0x1BE789, 0xD
+
+PokemonTower_6F_EventScript_1BE796:: @ 81BE796
+	.incbin "baserom.gba", 0x1BE796, 0xD
+
+PokemonTower_6F_EventScript_1BE7A3:: @ 81BE7A3
+	.incbin "baserom.gba", 0x1BE7A3, 0xD
+
+Route12_EventScript_1BE7B0:: @ 81BE7B0
+	.incbin "baserom.gba", 0x1BE7B0, 0xD
+
+Route12_EventScript_1BE7BD:: @ 81BE7BD
+	.incbin "baserom.gba", 0x1BE7BD, 0xD
+
+Route15_EventScript_1BE7CA:: @ 81BE7CA
+	.incbin "baserom.gba", 0x1BE7CA, 0xD
+
+SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7
+	.incbin "baserom.gba", 0x1BE7D7, 0xD
+
+SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4
+	.incbin "baserom.gba", 0x1BE7E4, 0xD
+
+SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1
+	.incbin "baserom.gba", 0x1BE7F1, 0xD
+
+SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE
+	.incbin "baserom.gba", 0x1BE7FE, 0xD
+
+SafariZone_East_EventScript_1BE80B:: @ 81BE80B
+	.incbin "baserom.gba", 0x1BE80B, 0xD
+
+SafariZone_North_EventScript_1BE818:: @ 81BE818
+	.incbin "baserom.gba", 0x1BE818, 0xD
+
+SafariZone_North_EventScript_1BE825:: @ 81BE825
+	.incbin "baserom.gba", 0x1BE825, 0xD
+
+SafariZone_West_EventScript_1BE832:: @ 81BE832
+	.incbin "baserom.gba", 0x1BE832, 0xD
+
+SafariZone_West_EventScript_1BE83F:: @ 81BE83F
+	.incbin "baserom.gba", 0x1BE83F, 0xD
+
+SafariZone_West_EventScript_1BE84C:: @ 81BE84C
+	.incbin "baserom.gba", 0x1BE84C, 0xD
+
+SafariZone_West_EventScript_1BE859:: @ 81BE859
+	.incbin "baserom.gba", 0x1BE859, 0xD
+
+SilphCo_3F_EventScript_1BE866:: @ 81BE866
+	.incbin "baserom.gba", 0x1BE866, 0xD
+
+SilphCo_4F_EventScript_1BE873:: @ 81BE873
+	.incbin "baserom.gba", 0x1BE873, 0xD
+
+SilphCo_4F_EventScript_1BE880:: @ 81BE880
+	.incbin "baserom.gba", 0x1BE880, 0xD
+
+SilphCo_4F_EventScript_1BE88D:: @ 81BE88D
+	.incbin "baserom.gba", 0x1BE88D, 0xD
+
+SilphCo_5F_EventScript_1BE89A:: @ 81BE89A
+	.incbin "baserom.gba", 0x1BE89A, 0xD
+
+SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7
+	.incbin "baserom.gba", 0x1BE8A7, 0xD
+
+SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4
+	.incbin "baserom.gba", 0x1BE8B4, 0xD
+
+SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1
+	.incbin "baserom.gba", 0x1BE8C1, 0xD
+
+SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE
+	.incbin "baserom.gba", 0x1BE8CE, 0xD
+
+SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB
+	.incbin "baserom.gba", 0x1BE8DB, 0xD
+
+SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8
+	.incbin "baserom.gba", 0x1BE8E8, 0xD
+
+SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5
+	.incbin "baserom.gba", 0x1BE8F5, 0xD
+
+SilphCo_10F_EventScript_1BE902:: @ 81BE902
+	.incbin "baserom.gba", 0x1BE902, 0xD
+
+SilphCo_10F_EventScript_1BE90F:: @ 81BE90F
+	.incbin "baserom.gba", 0x1BE90F, 0xD
+
+PowerPlant_EventScript_1BE91C:: @ 81BE91C
+	.incbin "baserom.gba", 0x1BE91C, 0xD
+
+PowerPlant_EventScript_1BE929:: @ 81BE929
+	.incbin "baserom.gba", 0x1BE929, 0xD
+
+PowerPlant_EventScript_1BE936:: @ 81BE936
+	.incbin "baserom.gba", 0x1BE936, 0xD
+
+PowerPlant_EventScript_1BE943:: @ 81BE943
+	.incbin "baserom.gba", 0x1BE943, 0xD
+
+PowerPlant_EventScript_1BE950:: @ 81BE950
+	.incbin "baserom.gba", 0x1BE950, 0xD
+
+PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D
+	.incbin "baserom.gba", 0x1BE95D, 0xD
+
+PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A
+	.incbin "baserom.gba", 0x1BE96A, 0xD
+
+PokemonMansion_2F_EventScript_1BE977:: @ 81BE977
+	.incbin "baserom.gba", 0x1BE977, 0xD
+
+PokemonMansion_3F_EventScript_1BE984:: @ 81BE984
+	.incbin "baserom.gba", 0x1BE984, 0xD
+
+PokemonMansion_3F_EventScript_1BE991:: @ 81BE991
+	.incbin "baserom.gba", 0x1BE991, 0xD
+
+PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E
+	.incbin "baserom.gba", 0x1BE99E, 0xD
+
+PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB
+	.incbin "baserom.gba", 0x1BE9AB, 0xD
+
+PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8
+	.incbin "baserom.gba", 0x1BE9B8, 0xD
+
+PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5
+	.incbin "baserom.gba", 0x1BE9C5, 0xD
+
+VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2
+	.incbin "baserom.gba", 0x1BE9D2, 0xD
+
+VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF
+	.incbin "baserom.gba", 0x1BE9DF, 0xD
+
+VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC
+	.incbin "baserom.gba", 0x1BE9EC, 0xD
+
+VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9
+	.incbin "baserom.gba", 0x1BE9F9, 0xD
+
+VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06
+	.incbin "baserom.gba", 0x1BEA06, 0xD
+
+VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13
+	.incbin "baserom.gba", 0x1BEA13, 0xD
+
+VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20
+	.incbin "baserom.gba", 0x1BEA20, 0xD
+
+VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D
+	.incbin "baserom.gba", 0x1BEA2D, 0xD
+
+CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A
+	.incbin "baserom.gba", 0x1BEA3A, 0xD
+
+CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47
+	.incbin "baserom.gba", 0x1BEA47, 0xD
+
+CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54
+	.incbin "baserom.gba", 0x1BEA54, 0xD
+
+CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61
+	.incbin "baserom.gba", 0x1BEA61, 0xD
+
+CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E
+	.incbin "baserom.gba", 0x1BEA6E, 0xD
+
+CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B
+	.incbin "baserom.gba", 0x1BEA7B, 0xD
+
+CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88
+	.incbin "baserom.gba", 0x1BEA88, 0xD
+
+CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95
+	.incbin "baserom.gba", 0x1BEA95, 0xD
+
+FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2
+	.incbin "baserom.gba", 0x1BEAA2, 0xD
+
+TwoIsland_EventScript_1BEAAF:: @ 81BEAAF
+	.incbin "baserom.gba", 0x1BEAAF, 0xD
+
+ThreeIsland_EventScript_1BEABC:: @ 81BEABC
+	.incbin "baserom.gba", 0x1BEABC, 0xD
+
+ViridianForest_EventScript_1BEAC9:: @ 81BEAC9
+	.incbin "baserom.gba", 0x1BEAC9, 0xD
+
+MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6
+	.incbin "baserom.gba", 0x1BEAD6, 0xD
+
+MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3
+	.incbin "baserom.gba", 0x1BEAE3, 0xD
+
+Route11_EventScript_1BEAF0:: @ 81BEAF0
+	.incbin "baserom.gba", 0x1BEAF0, 0xD
+
+Route9_EventScript_1BEAFD:: @ 81BEAFD
+	.incbin "baserom.gba", 0x1BEAFD, 0xD
+
+RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A
+	.incbin "baserom.gba", 0x1BEB0A, 0xD
+
+RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17
+	.incbin "baserom.gba", 0x1BEB17, 0xD
+
+RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24
+	.incbin "baserom.gba", 0x1BEB24, 0xD
+
+RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31
+	.incbin "baserom.gba", 0x1BEB31, 0xD
+
+RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E
+	.incbin "baserom.gba", 0x1BEB3E, 0xD
+
+SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B
+	.incbin "baserom.gba", 0x1BEB4B, 0xD
+
+SilphCo_11F_EventScript_1BEB58:: @ 81BEB58
+	.incbin "baserom.gba", 0x1BEB58, 0xD
+
+PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65
+	.incbin "baserom.gba", 0x1BEB65, 0xD
+
+PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72
+	.incbin "baserom.gba", 0x1BEB72, 0xD
+
+PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F
+	.incbin "baserom.gba", 0x1BEB7F, 0xD
+
+ViridianCity_EventScript_1BEB8C:: @ 81BEB8C
+	.incbin "baserom.gba", 0x1BEB8C, 0xD
+
+Route11_EventScript_1BEB99:: @ 81BEB99
+	.incbin "baserom.gba", 0x1BEB99, 0xD
+
+Route11_EventScript_1BEBA6:: @ 81BEBA6
+	.incbin "baserom.gba", 0x1BEBA6, 0xD
+
+PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3
+	.incbin "baserom.gba", 0x1BEBB3, 0xD
+
+CeladonCity_EventScript_1BEBC0:: @ 81BEBC0
+	.incbin "baserom.gba", 0x1BEBC0, 0xD
+
+RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD
+	.incbin "baserom.gba", 0x1BEBCD, 0xD
+
+SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA
+	.incbin "baserom.gba", 0x1BEBDA, 0xD
+
+SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7
+	.incbin "baserom.gba", 0x1BEBE7, 0xD
+
+SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4
+	.incbin "baserom.gba", 0x1BEBF4, 0xD
+
+SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01
+	.incbin "baserom.gba", 0x1BEC01, 0xD
+
+SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E
+	.incbin "baserom.gba", 0x1BEC0E, 0xD
+
+SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B
+	.incbin "baserom.gba", 0x1BEC1B, 0xD
+
+FourIsland_EventScript_1BEC28:: @ 81BEC28
+	.incbin "baserom.gba", 0x1BEC28, 0xD
+
+FourIsland_EventScript_1BEC35:: @ 81BEC35
+	.incbin "baserom.gba", 0x1BEC35, 0xD
+
+OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42
+	.incbin "baserom.gba", 0x1BEC42, 0xD
+
+OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F
+	.incbin "baserom.gba", 0x1BEC4F, 0xD
+
+OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C
+	.incbin "baserom.gba", 0x1BEC5C, 0xD
+
+FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69
+	.incbin "baserom.gba", 0x1BEC69, 0xD
+
+FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76
+	.incbin "baserom.gba", 0x1BEC76, 0xD
+
+FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83
+	.incbin "baserom.gba", 0x1BEC83, 0xD
+
+SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90
+	.incbin "baserom.gba", 0x1BEC90, 0xD
+
+SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D
+	.incbin "baserom.gba", 0x1BEC9D, 0xD
+
+SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA
+	.incbin "baserom.gba", 0x1BECAA, 0xD
+
+SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7
+	.incbin "baserom.gba", 0x1BECB7, 0xD
+
+SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4
+	.incbin "baserom.gba", 0x1BECC4, 0xD
+
+SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1
+	.incbin "baserom.gba", 0x1BECD1, 0xD
+
+SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE
+	.incbin "baserom.gba", 0x1BECDE, 0xD
+
+SevenIsland_SevaultCanyon_EventScript_1BECEB:: @ 81BECEB
+	.incbin "baserom.gba", 0x1BECEB, 0xD
+
+SevenIsland_SevaultCanyon_EventScript_1BECF8:: @ 81BECF8
+	.incbin "baserom.gba", 0x1BECF8, 0xD
+
+ThreeIsland_BerryForest_EventScript_1BED05:: @ 81BED05
+	.incbin "baserom.gba", 0x1BED05, 0xD
+
+ThreeIsland_BerryForest_EventScript_1BED12:: @ 81BED12
+	.incbin "baserom.gba", 0x1BED12, 0xD
+
+ThreeIsland_BerryForest_EventScript_1BED1F:: @ 81BED1F
+	.incbin "baserom.gba", 0x1BED1F, 0xD
+
+MtEmber_Exterior_EventScript_1BED2C:: @ 81BED2C
+	.incbin "baserom.gba", 0x1BED2C, 0xD
+
+MtEmber_Exterior_EventScript_1BED39:: @ 81BED39
+	.incbin "baserom.gba", 0x1BED39, 0xD
+
+MtEmber_Exterior_EventScript_1BED46:: @ 81BED46
+	.incbin "baserom.gba", 0x1BED46, 0xD
+
+FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53
+	.incbin "baserom.gba", 0x1BED53, 0xD
+
+FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60
+	.incbin "baserom.gba", 0x1BED60, 0xD
+
+FourIsland_IcefallCave_B1F_EventScript_1BED6D:: @ 81BED6D
+	.incbin "baserom.gba", 0x1BED6D, 0xD
+
+FourIsland_IcefallCave_B1F_EventScript_1BED7A:: @ 81BED7A
+	.incbin "baserom.gba", 0x1BED7A, 0xD
+
+FiveIsland_RocketWarehouse_EventScript_1BED87:: @ 81BED87
+	.incbin "baserom.gba", 0x1BED87, 0xD
+
+FiveIsland_RocketWarehouse_EventScript_1BED94:: @ 81BED94
+	.incbin "baserom.gba", 0x1BED94, 0xD
+
+FiveIsland_RocketWarehouse_EventScript_1BEDA1:: @ 81BEDA1
+	.incbin "baserom.gba", 0x1BEDA1, 0xD
+
+FiveIsland_RocketWarehouse_EventScript_1BEDAE:: @ 81BEDAE
+	.incbin "baserom.gba", 0x1BEDAE, 0xD
+
+FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB
+	.incbin "baserom.gba", 0x1BEDBB, 0xD
+
+FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8
+	.incbin "baserom.gba", 0x1BEDC8, 0xD
+
+FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5
+	.incbin "baserom.gba", 0x1BEDD5, 0xD
+
+FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2
+	.incbin "baserom.gba", 0x1BEDE2, 0xD
+
+FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF
+	.incbin "baserom.gba", 0x1BEDEF, 0xD
+
+SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC
+	.incbin "baserom.gba", 0x1BEDFC, 0xD
+
+SilphCo_4F_EventScript_1BEE09:: @ 81BEE09
+	.incbin "baserom.gba", 0x1BEE09, 0xD
+
+PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16
+	.incbin "baserom.gba", 0x1BEE16, 0x582
+
+Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398
+	.incbin "baserom.gba", 0x1BF398, 0x1AE
+
+gUnknown_81BF546:: @ 81BF546
+	.incbin "baserom.gba", 0x1BF546, 0xF
+
+gUnknown_81BF555:: @ 81BF555
+	.incbin "baserom.gba", 0x1BF555, 0x8E
+
+gUnknown_81BF5E3:: @ 81BF5E3
+	.incbin "baserom.gba", 0x1BF5E3, 0xB7
+
+gUnknown_81BF69A:: @ 81BF69A
+	.incbin "baserom.gba", 0x1BF69A, 0x35
+
+gUnknown_81BF6CF:: @ 81BF6CF
+	.incbin "baserom.gba", 0x1BF6CF, 0x21
+
+gUnknown_81BF6F0:: @ 81BF6F0
+	.incbin "baserom.gba", 0x1BF6F0, 0x3A
+
+Text_1BF72A:: @ 81BF72A
+	.incbin "baserom.gba", 0x1BF72A, 0x2B
+
+gUnknown_81BF755:: @ 81BF755
+	.incbin "baserom.gba", 0x1BF755, 0x34
+
+gUnknown_81BF789:: @ 81BF789
+	.incbin "baserom.gba", 0x1BF789, 0x2D
+
+gUnknown_81BF7B6:: @ 81BF7B6
+	.incbin "baserom.gba", 0x1BF7B6, 0x2E
+
+gUnknown_81BF7E4:: @ 81BF7E4
+	.incbin "baserom.gba", 0x1BF7E4, 0x55
+
+gUnknown_81BF839:: @ 81BF839
+	.incbin "baserom.gba", 0x1BF839, 0x27
+
+gUnknown_81BF860:: @ 81BF860
+	.incbin "baserom.gba", 0x1BF860, 0x3F
+
+gUnknown_81BF89F:: @ 81BF89F
+	.incbin "baserom.gba", 0x1BF89F, 0x57
+
+gUnknown_81BF8F6:: @ 81BF8F6
+	.incbin "baserom.gba", 0x1BF8F6, 0x20
+
+gUnknown_81BF916:: @ 81BF916
+	.incbin "baserom.gba", 0x1BF916, 0x1C
+
+gUnknown_81BF932:: @ 81BF932
+	.incbin "baserom.gba", 0x1BF932, 0x1D
+
+gUnknown_81BF94F:: @ 81BF94F
+	.incbin "baserom.gba", 0x1BF94F, 0x27
+
+gUnknown_81BF976:: @ 81BF976
+	.incbin "baserom.gba", 0x1BF976, 0x12
+
+gUnknown_81BF988:: @ 81BF988
+	.incbin "baserom.gba", 0x1BF988, 0x44
+
+gUnknown_81BF9CC:: @ 81BF9CC
+	.incbin "baserom.gba", 0x1BF9CC, 0x23
+
+gUnknown_81BF9EF:: @ 81BF9EF
+	.incbin "baserom.gba", 0x1BF9EF, 0x4C
+
+gUnknown_81BFA3B:: @ 81BFA3B
+	.incbin "baserom.gba", 0x1BFA3B, 0x2C
+
+gUnknown_81BFA67:: @ 81BFA67
+	.incbin "baserom.gba", 0x1BFA67, 0x1E
+
+gUnknown_81BFA85:: @ 81BFA85
+	.incbin "baserom.gba", 0x1BFA85, 0x28
+
+gUnknown_81BFAAD:: @ 81BFAAD
+	.incbin "baserom.gba", 0x1BFAAD, 0x3B
+
+gUnknown_81BFAE8:: @ 81BFAE8
+	.incbin "baserom.gba", 0x1BFAE8, 0x21
+
+gUnknown_81BFB09:: @ 81BFB09
+	.incbin "baserom.gba", 0x1BFB09, 0x56
+
+gUnknown_81BFB5F:: @ 81BFB5F
+	.incbin "baserom.gba", 0x1BFB5F, 0x6
+
+gUnknown_81BFB65:: @ 81BFB65
+	.incbin "baserom.gba", 0x1BFB65, 0x22
+
+gUnknown_81BFB87:: @ 81BFB87
+	.incbin "baserom.gba", 0x1BFB87, 0x23
+
+gUnknown_81BFBAA:: @ 81BFBAA
+	.incbin "baserom.gba", 0x1BFBAA, 0x1B
+
+gUnknown_81BFBC5:: @ 81BFBC5
+	.incbin "baserom.gba", 0x1BFBC5, 0x12
+
+gUnknown_81BFBD7:: @ 81BFBD7
+	.incbin "baserom.gba", 0x1BFBD7, 0x2D5
+
+gUnknown_81BFEAC:: @ 81BFEAC
+	.incbin "baserom.gba", 0x1BFEAC, 0x1164
+
+gUnknown_81C1010:: @ 81C1010
+	.incbin "baserom.gba", 0x1C1010, 0xC
+
+gUnknown_81C101C:: @ 81C101C
+	.incbin "baserom.gba", 0x1C101C, 0x345
+
+gUnknown_81C1361:: @ 81C1361
+	.incbin "baserom.gba", 0x1C1361, 0x1B
+
+gUnknown_81C137C:: @ 81C137C
+	.incbin "baserom.gba", 0x1C137C, 0x5A
+
+gUnknown_81C13D6:: @ 81C13D6
+	.incbin "baserom.gba", 0x1C13D6, 0x53
+
+gUnknown_81C1429:: @ 81C1429
+	.incbin "baserom.gba", 0x1C1429, 0x3385
+
+VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE
+	.incbin "baserom.gba", 0x1C47AE, 0x68
+
+EventScript_1C4816:: @ 81C4816
+	.incbin "baserom.gba", 0x1C4816, 0x68
+
+RockTunnel_B1F_EventScript_1C487E:: @ 81C487E
+	.incbin "baserom.gba", 0x1C487E, 0x68
+
+MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6
+	.incbin "baserom.gba", 0x1C48E6, 0x68
+
+Route4_EventScript_1C494E:: @ 81C494E
+	.incbin "baserom.gba", 0x1C494E, 0x68
+
+Route4_EventScript_1C49B6:: @ 81C49B6
+	.incbin "baserom.gba", 0x1C49B6, 0x68
+
+EventScript_1C4A1E:: @ 81C4A1E
+	.incbin "baserom.gba", 0x1C4A1E, 0x68
+
+EventScript_1C4A86:: @ 81C4A86
+	.incbin "baserom.gba", 0x1C4A86, 0x68
+
+FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE
+	.incbin "baserom.gba", 0x1C4AEE, 0x68
+
+SevenIsland_EventScript_1C4B56:: @ 81C4B56
+	.incbin "baserom.gba", 0x1C4B56, 0x68
+
+PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE
+	.incbin "baserom.gba", 0x1C4BBE, 0x68
+
+EventScript_1C4C26:: @ 81C4C26
+	.incbin "baserom.gba", 0x1C4C26, 0x68
+
+EventScript_1C4C8E:: @ 81C4C8E
+	.incbin "baserom.gba", 0x1C4C8E, 0x68
+
+EventScript_1C4CF6:: @ 81C4CF6
+	.incbin "baserom.gba", 0x1C4CF6, 0x8E
+
+FourIsland_House1_EventScript_1C4D84:: @ 81C4D84
+	.incbin "baserom.gba", 0x1C4D84, 0x68
+
+TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
+	.incbin "baserom.gba", 0x1C4DEC, 0x168
+
+SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_3F_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_4F_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_5F_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_6F_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54
+SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54
+	.incbin "baserom.gba", 0x1C4F54, 0xE
+
+SevenIsland_TrainerTower_1F_MapScript2_1C4F62:: @ 81C4F62
+SevenIsland_TrainerTower_2F_MapScript2_1C4F62:: @ 81C4F62
+SevenIsland_TrainerTower_3F_MapScript2_1C4F62:: @ 81C4F62
+SevenIsland_TrainerTower_4F_MapScript2_1C4F62:: @ 81C4F62
+SevenIsland_TrainerTower_5F_MapScript2_1C4F62:: @ 81C4F62
+SevenIsland_TrainerTower_6F_MapScript2_1C4F62:: @ 81C4F62
+SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62
+SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62
+	.incbin "baserom.gba", 0x1C4F62, 0xE4
+
+SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_2F_MapScript3_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_3F_MapScript3_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_4F_MapScript3_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_5F_MapScript3_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_6F_MapScript3_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046
+SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046
+	.incbin "baserom.gba", 0x1C5046, 0x2AE
+
+EventScript_1C52F4:: @ 81C52F4
+	.incbin "baserom.gba", 0x1C52F4, 0x47
+
+EventScript_1C533B:: @ 81C533B
+	.incbin "baserom.gba", 0x1C533B, 0x47
+
+EventScript_1C5382:: @ 81C5382
+	.incbin "baserom.gba", 0x1C5382, 0xA
+
+EventScript_1C538C:: @ 81C538C
+	.incbin "baserom.gba", 0x1C538C, 0x1E
+
+EventScript_1C53AA:: @ 81C53AA
+	.incbin "baserom.gba", 0x1C53AA, 0xF2
+
+gUnknown_81C549C:: @ 81C549C
+	.incbin "baserom.gba", 0x1C549C, 0x13
+
+SevenIsland_TrainerTower_2F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_4F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_6F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_8F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_5F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_7F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_3F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_1F_EventScript_1C54AF:: @ 81C54AF
+	.incbin "baserom.gba", 0x1C54AF, 0x5
+
+SevenIsland_TrainerTower_2F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_4F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_6F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_8F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4
+	.incbin "baserom.gba", 0x1C54B4, 0x36
+
+SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_4F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_6F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_8F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
+	.incbin "baserom.gba", 0x1C54EA, 0x71
+
+gUnknown_81C555B:: @ 81C555B
+	.incbin "baserom.gba", 0x1C555B, 0x6E
+
+gUnknown_81C55C9:: @ 81C55C9
+	.incbin "baserom.gba", 0x1C55C9, 0x21
+
+gUnknown_81C55EA:: @ 81C55EA
+	.incbin "baserom.gba", 0x1C55EA, 0x3B
+
+gUnknown_81C5625:: @ 81C5625
+	.incbin "baserom.gba", 0x1C5625, 0x22
+
+gUnknown_81C5647:: @ 81C5647
+	.incbin "baserom.gba", 0x1C5647, 0x23
+
+@ 0xE5
+gUnknown_81C566A:: @ 81C566A
+	.incbin "baserom.gba", 0x1C566A, 0xE5
+
+gOtherText_NewName:: @ 81C574F
+	.string "NEW NAME$"
+
+gNameChoice_Green:: @ 81C5758
+	.string "GREEN$"
+
+gNameChoice_Red:: @ 81C575E
+	.string "RED$"
+
+gNameChoice_Leaf:: @ 81C5762
+	.string "LEAF$"
+
+gNameChoice_Fire:: @ 81C5767
+	.string "FIRE$"
+
+gNameChoice_Gary:: @ 81C576C
+	.string "GARY$"
+
+gNameChoice_Kaz:: @ 81C5771
+	.string "KAZ$"
+
+gNameChoice_Toru:: @ 81C5775
+	.string "TORU$"
+
+gNameChoice_Ash:: @ 81C577A
+	.string "ASH$"
+
+gNameChoice_Kene:: @ 81C577E
+	.string "KENE$"
+
+gNameChoice_Geki:: @ 81C5783
+	.string "GEKI$"
+
+gNameChoice_Jak:: @ 81C5788
+	.string "JAK$"
+
+gNameChoice_Janne:: @ 81C578C
+	.string "JANNE$"
+
+gNameChoice_Jonn:: @ 81C5792
+	.string "JONN$"
+
+gNameChoice_Kamon:: @ 81C5797
+	.string "KAMON$"
+
+gNameChoice_Karl:: @ 81C579D
+	.string "KARL$"
+
+gNameChoice_Taylor:: @ 81C57A2
+	.string "TAYLOR$"
+
+gNameChoice_Oscar:: @ 81C57A9
+	.string "OSCAR$"
+
+gNameChoice_Hiro:: @ 81C57AF
+	.string "HIRO$"
+
+gNameChoice_Max:: @ 81C57B4
+	.string "MAX$"
+
+gNameChoice_Jon:: @ 81C57B8
+	.string "JON$"
+
+gNameChoice_Ralph:: @ 81C57BC
+	.string "RALPH$"
+
+gNameChoice_Kay:: @ 81C57C2
+	.string "KAY$"
+
+gNameChoice_Tosh:: @ 81C57C6
+	.string "TOSH$"
+
+gNameChoice_Roak:: @ 81C57CB
+	.string "ROAK$"
+
+gNameChoice_Omi:: @ 81C57D0
+	.string "OMI$"
+
+gNameChoice_Jodi:: @ 81C57D4
+	.string "JODI$"
+
+gNameChoice_Amanda:: @ 81C57D9
+	.string "AMANDA$"
+
+gNameChoice_Hillary:: @ 81C57E0
+	.string "HILLARY$"
+
+gNameChoice_Makey:: @ 81C57E8
+	.string "MAKEY$"
+
+gNameChoice_Michi:: @ 81C57EE
+	.string "MICHI$"
+
+gNameChoice_Paula:: @ 81C57F4
+	.string "PAULA$"
+
+gNameChoice_June:: @ 81C57FA
+	.string "JUNE$"
+
+gNameChoice_Cassie:: @ 81C57FF
+	.string "CASSIE$"
+
+gNameChoice_Rey:: @ 81C5806
+	.string "REY$"
+
+gNameChoice_Seda:: @ 81C580A
+	.string "SEDA$"
+
+gNameChoice_Kiko:: @ 81C580F
+	.string "KIKO$"
+
+gNameChoice_Mina:: @ 81C5814
+	.string "MINA$"
+
+gNameChoice_Norie:: @ 81C5819
+	.string "NORIE$"
+
+gNameChoice_Sai:: @ 81C581F
+	.string "SAI$"
+
+gNameChoice_Momo:: @ 81C5823
+	.string "MOMO$"
+
+gNameChoice_Suzi:: @ 81C5828
+	.string "SUZI$"
+
+gNewGame_HelpDocs1:: @ 81C582D
+	.string "The various buttons will be explained in\n"
+	.string "the order of their importance.$"
+
+gNewGame_HelpDocs2:: @ 81C5875
+	.string "Moves the main character.\n"
+	.string "Also used to choose various data\n"
+	.string "headings.$"
+
+gNewGame_HelpDocs3:: @ 81C58BA
+	.string "Used to confirm a choice, check\n"
+	.string "things, chat, and scroll text.$"
+
+gNewGame_HelpDocs4:: @ 81C58F9
+	.string "Used to exit, cancel a choice,\n"
+	.string "and cancel a mode.$"
+
+gNewGame_HelpDocs5:: @ 81C592B
+	.string "Press this button to open the\n"
+	.string "MENU.$"
+
+gNewGame_HelpDocs6:: @ 81C594F
+	.string "Used to shift items and to use\n"
+	.string "a registered item.$"
+
+gNewGame_HelpDocs7:: @ 81C5981
+	.string "If you need help playing the\n"
+	.string "game, or on how to do things,\n"
+	.string "press the L or R Button.$"
+
+gOakText_AskPlayerGender:: @ 81C59D5
+	.string "Now tell me. Are you a boy?\n"
+	.string "Or are you a girl?$"
+
+gNewGameAdventureIntro1::
+	.string "In the world which you are about to\n"
+	.string "enter, you will embark on a grand\n"
+	.string "adventure with you as the hero.\n"
+	.string "\n"
+	.string "Speak to people and check things\n"
+	.string "wherever you go, be it towns, roads,\n"
+	.string "or caves. Gather information and\n"
+	.string "hints from every source.$"
+
+gNewGameAdventureIntro2::
+	.string "New paths will open to you by helping\n"
+	.string "people in need, overcoming challenges,\n"
+	.string "and solving mysteries.\n"
+	.string "\n"
+	.string "At times, you will be challenged by\n"
+	.string "others and attacked by wild creatures.\n"
+	.string "Be brave and keep pushing on.$"
+
+gNewGameAdventureIntro3::
+	.string "Through your adventure, we hope\n"
+	.string "that you will interact with all sorts\n"
+	.string "of people and achieve personal growth.\n"
+	.string "That is our biggest objective.\n"
+	.string "\n"
+	.string "Press the A Button, and let your\n"
+	.string "adventure begin!$"
+
+gOakText_WelcomeToTheWorld:: @ 81C5C78
+	.string "Hello, there!\n"
+	.string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n"
+	.string "as the POKéMON PROFESSOR.\p$"
+
+gOakText_WorldInhabited1:: @ 81C5D06
+	.string "This world…$"
+
+gOakText_WorldInhabited2:: @ 81C5D12
+	.string "…is inhabited far and wide by\n"
+	.string "creatures called POKéMON.\p$"
+
+gOakText_PetsBattlingStudy:: @ 81C5D4B
+	.string "For some people, POKéMON are pets.\n"
+	.string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$"
+
+gOakText_TellMeALittleAboutYourself:: @ 81C5DBD
+	.string "But first, tell me a little about\n"
+	.string "yourself.\p$"
+
+gOakText_AskPlayerName:: @ 81C5DEA
+	.string "Let's begin with your name.\n"
+	.string "What is it?\p$"
+
+gOakText_FinalizePlayerName:: @ 81C5E13
+	.string "Right…\n"
+	.string "So your name is {PLAYER}.$"
+
+gOakText_IntroduceRival:: @ 81C5E2E
+	.string "This is my grandson.\pHe's been your rival since you both\n"
+	.string "were babies.\p…Erm, what was his name now?$"
+
+gOakText_AskRivalName:: @ 81C5E91
+	.string "Your rival's name, what was it now?$"
+
+gOakText_ConfirmRivalName:: @ 81C5EB5
+	.string "…Er, was it {RIVAL}?$"
+
+gOakText_RememberRivalName:: @ 81C5EC5
+	.string "That's right! I remember now!\n"
+	.string "His name is {RIVAL}!\p$"
+
+gOakText_LegendAboutToUnfold:: @ 81C5EF4
+	.string "{PLAYER}!\pYour very own POKéMON legend is\n"
+	.string "about to unfold!\pA world of dreams and adventures\n"
+	.string "with POKéMON awaits! Let's go!$"
+
+@ pokedude data
+gUnknown_81C5F69::
+	.string "POKé DUDE: The speedier of the\n"
+	.string "battlers gets to attack first.$"
+
+gUnknown_81C5FA7::
+	.string "It looks like my RATTATA was\n"
+	.string "faster than the PIDGEY.$"
+
+gUnknown_81C5FDC::
+	.string "The battlers take turns attacking\n"
+	.string "and reducing each other's HP.$"
+
+gUnknown_81C601C::
+	.string "My RATTATA reduced the foe's HP\n"
+	.string "to zero, so it wins!\p"
+
+	.string "The POKéMON that took part in the\n"
+	.string "battle get EXP. Points.\p"
+
+	.string "When a POKéMON collects enough\n"
+	.string "EXP. Points, it levels up.\p"
+
+	.string "Leveling up makes your POKéMON\n"
+	.string "stronger than before.$"
+
+gUnknown_81C60FA::
+	.string "POKé DUDE: Uh-oh…\n"
+	.string "My RATTATA has been poisoned…\p"
+
+	.string "If a POKéMON is poisoned, it loses\n"
+	.string "HP steadily.$"
+
+gUnknown_81C615A::
+	.string "If a POKéMON develops a status\n"
+	.string "problem, heal it right away.$"
+
+gUnknown_81C6196::
+	.string "Using an item on a POKéMON uses\n"
+	.string "up one turn, though.\p"
+
+	.string "Now, it's the opponent's turn!$"
+
+gUnknown_81C61EA::
+	.string "Yay!\n"
+	.string "We managed to win!$"
+
+gUnknown_81C6202::
+	.string "POKé DUDE: The move BUBBLE is\n"
+	.string "a WATER-type attack.\p"
+
+	.string "The targeted ODDISH is a\n"
+	.string "GRASS/POISON-type POKéMON.\p"
+
+	.string "The WATER-type attack is absorbed\n"
+	.string "by the GRASS-type POKéMON…\p"
+
+	.string "As a result, the move becomes not\n"
+	.string "very effective, and inflicts only\l"
+	.string "half the usual damage.$"
+
+gUnknown_81C6301::
+	.string "Uh-oh, this is not good!\p"
+
+	.string "The ABSORB attack you just saw\n"
+	.string "is a GRASS-type move.\p"
+
+	.string "POLIWAG is a WATER-type POKéMON.\p"
+
+	.string "So, ABSORB becomes super\n"
+	.string "effective, doubling the damage.$"
+
+gUnknown_81C63A9::
+	.string "It's not going to be easy to win\n"
+	.string "with this matchup…\p"
+
+	.string "Let's try shifting POKéMON!$"
+
+gUnknown_81C63F9::
+	.string "Shifting POKéMON in and out uses\n"
+	.string "up one turn.\p"
+
+	.string "Now, it's the opponent's turn.$"
+
+gUnknown_81C6446::
+	.string "BUTTERFREE is a BUG/FLYING-type\n"
+	.string "POKéMON.\p"
+
+	.string "Against this POKéMON, a GRASS-\n"
+	.string "type attack…\p"
+
+	.string "…inflicts only half the usual\n"
+	.string "damage on a BUG-type POKéMON…\p"
+
+	.string "…And, it also causes only half the\n"
+	.string "damage on a FLYING-type POKéMON.\p"
+
+	.string "Therefore, BUTTERFREE, being a\n"
+	.string "BUG/FLYING POKéMON, only takes\l"
+	.string "one quarter of the usual damage.$"
+
+gUnknown_81C657A::
+	.string "ODDISH is a GRASS/POISON-type\n"
+	.string "POKéMON.\p"
+
+	.string "A FLYING- or PSYCHIC-type attack\n"
+	.string "is super effective against it.\p"
+
+	.string "One of those types of attacks will\n"
+	.string "inflict double the usual damage.\p"
+
+	.string "Okay, here we go!$"
+
+gUnknown_81C6637::
+	.string "Yeah!\n"
+	.string "We won!$"
+
+gUnknown_81C6645::
+	.string "POKé DUDE: When you're trying to\n"
+	.string "catch a POKéMON, don't throw any\l"
+	.string "POKé BALLS right away.\p"
+
+	.string "First, you need to weaken it by\n"
+	.string "reducing its HP.$"
+
+gUnknown_81C66CF::
+	.string "Okay, that should be good enough.\p"
+
+	.string "But, if it's possible, it would be\n"
+	.string "best if the target has a status\l"
+	.string "problem.\p"
+
+	.string "For instance, it would be easier\n"
+	.string "to catch if it were asleep or\l"
+	.string "paralyzed.$"
+
+gUnknown_81C6787::
+	.string "This will make the POKéMON a lot\n"
+	.string "easier to catch!\p"
+
+	.string "Oh, yes. If you paralyze a\n"
+	.string "POKéMON, you can't make it fall\l"
+	.string "asleep on top of paralysis.\p"
+
+	.string "In other words, you can't double\n"
+	.string "up status problems, okay?$"
+
+gUnknown_81C684B::
+	.string "Okay!\n"
+	.string "Let me throw my POKé BALL!$"
+
+gUnknown_81C686C::
+	.string "Before you throw a POKé BALL,\n"
+	.string "consider the condition and the\l"
+	.string "type of POKéMON, and pick the kind\l"
+	.string "of BALL that would work best.$"
diff --git a/data/map_events.s b/data/map_events.s
new file mode 100644
index 000000000..d5d0e2329
--- /dev/null
+++ b/data/map_events.s
@@ -0,0 +1,18 @@
+@#include "constants/bg_event_constants.h"
+@#include "constants/event_object_movement_constants.h"
+@#include "constants/event_objects.h"
+#include "constants/flags.h"
+#include "constants/items.h"
+@#include "constants/map_scripts.h"
+#include "constants/layouts.h"
+#include "constants/maps.h"
+@#include "constants/secret_bases.h"
+#include "constants/vars.h"
+#include "constants/weather.h"
+@#include "constants/trainer_hill.h"
+    .include "asm/macros.inc"
+    .include "constants/constants.inc"
+
+    .section .rodata
+
+    .include "data/maps/events.inc"
diff --git a/data/map_obj_80688E4.s b/data/map_obj_80688E4.s
new file mode 100644
index 000000000..9010be906
--- /dev/null
+++ b/data/map_obj_80688E4.s
@@ -0,0 +1,30 @@
+	.section .rodata
+	.align 2
+gUnknown_83A719C:: @ 83A719C
+	.incbin "baserom.gba", 0x3A719C, 0x14
+
+gUnknown_83A71B0:: @ 83A71B0
+	.incbin "baserom.gba", 0x3A71B0, 0x3C
+
+gUnknown_83A71EC:: @ 83A71EC
+	.incbin "baserom.gba", 0x3A71EC, 0xC
+
+gUnknown_83A71F8:: @ 83A71F8
+	.incbin "baserom.gba", 0x3A71F8, 0x6
+
+gUnknown_83A71FE:: @ 83A71FE
+	.incbin "baserom.gba", 0x3A71FE, 0x4
+
+gUnknown_83A7202:: @ 83A7202
+	.incbin "baserom.gba", 0x3A7202, 0x6
+
+gUnknown_83A7208:: @ 83A7208
+	.incbin "baserom.gba", 0x3A7208, 0x4
+
+	.align 2
+gUnknown_83A720C:: @ 83A720C
+	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/evobjmv.c"
+
+	.align 2
+gUnknown_83A7240:: @ 83A7240
+	.asciz "0"
diff --git a/data/maps.s b/data/maps.s
new file mode 100644
index 000000000..a0ff008cd
--- /dev/null
+++ b/data/maps.s
@@ -0,0 +1,17 @@
+#include "constants/layouts.h"
+@#include "constants/map_types.h"
+#include "constants/maps.h"
+#include "constants/region_map.h"
+#include "constants/songs.h"
+#include "constants/items.h"
+#include "constants/weather.h"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.include "data/layouts/layouts.inc"
+	.include "data/layouts/layouts_table.inc"
+	.include "data/maps/headers.inc"
+	.include "data/maps/groups.inc"
+	.include "data/maps/connections.inc"
diff --git a/data/maps/.gitignore b/data/maps/.gitignore
new file mode 100644
index 000000000..59405b176
--- /dev/null
+++ b/data/maps/.gitignore
@@ -0,0 +1,7 @@
+connections.inc
+events.inc
+groups.inc
+headers.inc
+**/connections.inc
+**/events.inc
+**/header.inc
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
new file mode 100644
index 000000000..5ee37131f
--- /dev/null
+++ b/data/maps/BirthIsland_Exterior/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_BIRTH_ISLAND_EXTERIOR",
+  "name": "BirthIsland_Exterior",
+  "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
+  "music": "0xFFFF",
+  "region_map_section": "MAPSEC_BIRTH_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "106",
+      "x": 15,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "BirthIsland_Exterior_EventScript_165271",
+      "flag": "154"
+    },
+    {
+      "graphics_id": "240",
+      "x": 15,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "153"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 24,
+      "elevation": 3,
+      "dest_map": "MAP_BIRTH_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
new file mode 100644
index 000000000..1d3fc4db6
--- /dev/null
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -0,0 +1,128 @@
+BirthIsland_Exterior_MapScripts:: @ 8165203
+	map_script 3, BirthIsland_Exterior_MapScript1_165217
+	map_script 5, BirthIsland_Exterior_MapScript2_165253
+	map_script 7, BirthIsland_Exterior_MapScript3_165213
+	.byte 0
+
+BirthIsland_Exterior_MapScript3_165213:: @ 8165213
+	special sub_80CD008
+	end
+
+BirthIsland_Exterior_MapScript1_165217:: @ 8165217
+	setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR
+	setvar VAR_0x4010, 150
+	setvar VAR_SECRET_BASE_MAP, 0
+	setvar VAR_ALTERING_CAVE_WILD_SET, 0
+	checkflag FLAG_0x2E4
+	call_if 1, EventScript_16523C
+	checkflag FLAG_0x2E4
+	call_if 0, EventScript_165243
+	end
+
+EventScript_16523C:: @ 816523C
+	setflag FLAG_0x099
+	setflag FLAG_0x09A
+	return
+
+EventScript_165243:: @ 8165243
+	checkflag FLAG_0x2F7
+	goto_if_eq EventScript_1A77A9
+	clearflag FLAG_0x09A
+	clearflag FLAG_0x848
+	return
+
+BirthIsland_Exterior_MapScript2_165253:: @ 8165253
+	checkflag FLAG_0x807
+	call_if 1, EventScript_16525D
+	end
+
+EventScript_16525D:: @ 816525D
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 7
+	goto_if 5, EventScript_1A77A9
+	removeobject 2
+	return
+
+BirthIsland_Exterior_EventScript_165271:: @ 8165271
+	lock
+	faceplayer
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	special sub_80CCDFC
+	waitstate
+	switch VAR_RESULT
+	case 0, EventScript_1652BA
+	case 1, EventScript_1652BC
+	case 2, EventScript_1652C0
+	case 3, EventScript_1652BE
+	end
+
+EventScript_1652BA:: @ 81652BA
+	release
+	end
+
+EventScript_1652BC:: @ 81652BC
+	release
+	end
+
+EventScript_1652BE:: @ 81652BE
+	release
+	end
+
+EventScript_1652C0:: @ 81652C0
+	addobject 2
+	waitse
+	setfieldeffectarg 0, 1
+	setfieldeffectarg 1, 56
+	setfieldeffectarg 2, 2
+	dofieldeffect 68
+	playbgm BGM_FRLG_DEOXYS_EYE, 0
+	waitfieldeffect 68
+	applymovement 2, Movement_165353
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_DEOXYS, 2
+	delay 40
+	waitmoncry
+	setvar VAR_LAST_TALKED, 2
+	setvar VAR_0x8004, SPECIES_DEOXYS
+	setvar VAR_0x8005, 30
+	setvar VAR_0x8006, 0
+	special sub_8044838
+	setflag FLAG_0x807
+	special sub_807F9D8
+	waitstate
+	clearflag FLAG_0x807
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16533A
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_165348
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_165348
+	setflag FLAG_0x2E4
+	release
+	end
+
+EventScript_16533A:: @ 816533A
+	setflag FLAG_0x2F7
+	setvar VAR_0x8004, SPECIES_DEOXYS
+	goto EventScript_1A9236
+	end
+
+EventScript_165348:: @ 8165348
+	setvar VAR_0x8004, SPECIES_DEOXYS
+	goto EventScript_1A9236
+	end
+
+Movement_165353:: @ 8165353
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
new file mode 100644
index 000000000..cecda6ec5
--- /dev/null
+++ b/data/maps/BirthIsland_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_BIRTH_ISLAND_HARBOR",
+  "name": "BirthIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "0xFFFF",
+  "region_map_section": "MAPSEC_BIRTH_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "BirthIsland_Harbor_EventScript_1653E7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..487cae2f1
--- /dev/null
+++ b/data/maps/BirthIsland_Harbor/scripts.inc
@@ -0,0 +1,31 @@
+BirthIsland_Harbor_MapScripts:: @ 81653E6
+	.byte 0
+
+BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 10
+	multichoice 20, 8, 61, 0
+	switch VAR_RESULT
+	case 0, EventScript_1A91D5
+	case 1, EventScript_1A90F6
+	case 127, EventScript_1A90F6
+	end
+
+NavelRock_Harbor_MapScripts:: @ 8165420
+	.byte 0
+
+NavelRock_Harbor_EventScript_165421:: @ 8165421
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 9
+	multichoice 20, 8, 61, 0
+	switch VAR_RESULT
+	case 0, EventScript_1A91D5
+	case 1, EventScript_1A90F6
+	case 127, EventScript_1A90F6
+	end
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
new file mode 100644
index 000000000..3c3483967
--- /dev/null
+++ b/data/maps/CeladonCity/map.json
@@ -0,0 +1,384 @@
+{
+  "id": "MAP_CELADON_CITY",
+  "name": "CeladonCity",
+  "layout": "LAYOUT_CELADON_CITY",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE16",
+      "offset": 10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE7",
+      "offset": 10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 48,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166CFA",
+      "flag": "95"
+    },
+    {
+      "graphics_id": "27",
+      "x": 38,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166CC5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "112",
+      "x": 36,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166CDC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 11,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "52",
+      "movement_range_x": 4,
+      "movement_range_y": 4,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166C99",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 18,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 5,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166CAD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 30,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166CB6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "33",
+      "x": 26,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166CBF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 38,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 5,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166D03",
+      "flag": "95"
+    },
+    {
+      "graphics_id": "32",
+      "x": 9,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166CA2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 52,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_1BDF13",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "95",
+      "x": 40,
+      "y": 35,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "19",
+      "x": 25,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166D0C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65375",
+      "x": 65529,
+      "y": 21,
+      "elevation": 7,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 34,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_1BEBC0",
+      "flag": "465"
+    },
+    {
+      "graphics_id": "55",
+      "x": 47,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_EventScript_166D15",
+      "flag": "95"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 34,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_GAME_CORNER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 30,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 48,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 39,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 30,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_GYM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 37,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_RESTAURANT",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 41,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_HOUSE1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 49,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_HOTEL",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 29,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 30,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 31,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 45,
+      "y": 23,
+      "elevation": 0,
+      "script": "CeladonCity_EventScript_166D5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 38,
+      "y": 23,
+      "elevation": 0,
+      "script": "CeladonCity_EventScript_166D63"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 33,
+      "y": 23,
+      "elevation": 0,
+      "script": "CeladonCity_EventScript_166D6C"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 22,
+      "y": 18,
+      "elevation": 3,
+      "script": "CeladonCity_EventScript_166D27"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 26,
+      "y": 11,
+      "elevation": 0,
+      "script": "CeladonCity_EventScript_166D48"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 33,
+      "y": 16,
+      "elevation": 0,
+      "script": "CeladonCity_EventScript_166D1E"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 18,
+      "y": 14,
+      "elevation": 3,
+      "script": "CeladonCity_EventScript_166D51"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 16,
+      "y": 31,
+      "elevation": 0,
+      "script": "CeladonCity_EventScript_166D30"
+    },
+    {
+      "type": "hidden_item",
+      "x": 55,
+      "y": 20,
+      "elevation": 3,
+      "item": "ITEM_PP_UP",
+      "flag": "47",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc
new file mode 100644
index 000000000..9f7dc58c2
--- /dev/null
+++ b/data/maps/CeladonCity/scripts.inc
@@ -0,0 +1,105 @@
+CeladonCity_MapScripts:: @ 8166C8F
+	map_script 3, CeladonCity_MapScript1_166C95
+	.byte 0
+
+CeladonCity_MapScript1_166C95:: @ 8166C95
+	setworldmapflag FLAG_WORLD_MAP_CELADON_CITY
+	end
+
+CeladonCity_EventScript_166C99:: @ 8166C99
+	msgbox gUnknown_817FEC3, 2
+	end
+
+CeladonCity_EventScript_166CA2:: @ 8166CA2
+	lock
+	msgbox gUnknown_817FF1C
+	release
+	end
+
+CeladonCity_EventScript_166CAD:: @ 8166CAD
+	msgbox gUnknown_817FF4A, 2
+	end
+
+CeladonCity_EventScript_166CB6:: @ 8166CB6
+	msgbox gUnknown_817FFC5, 2
+	end
+
+CeladonCity_EventScript_166CBF:: @ 8166CBF
+	goto EventScript_1C4A86
+	end
+
+CeladonCity_EventScript_166CC5:: @ 8166CC5
+	lock
+	faceplayer
+	msgbox gUnknown_818001B
+	closemessage
+	applymovement 2, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+CeladonCity_EventScript_166CDC:: @ 8166CDC
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_POLIWRATH, 0
+	msgbox gUnknown_8180075
+	closemessage
+	waitmoncry
+	applymovement 3, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+CeladonCity_EventScript_166CFA:: @ 8166CFA
+	msgbox gUnknown_81800C2, 2
+	end
+
+CeladonCity_EventScript_166D03:: @ 8166D03
+	msgbox gUnknown_818008C, 2
+	end
+
+CeladonCity_EventScript_166D0C:: @ 8166D0C
+	msgbox gUnknown_8180300, 2
+	end
+
+CeladonCity_EventScript_166D15:: @ 8166D15
+	msgbox gUnknown_81804E1, 2
+	end
+
+CeladonCity_EventScript_166D1E:: @ 8166D1E
+	msgbox gUnknown_81800E1, 3
+	end
+
+CeladonCity_EventScript_166D27:: @ 8166D27
+	msgbox gUnknown_818017A, 3
+	end
+
+CeladonCity_EventScript_166D30:: @ 8166D30
+	lockall
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_81801A2
+	releaseall
+	end
+
+CeladonCity_EventScript_166D48:: @ 8166D48
+	msgbox gUnknown_81801E5, 3
+	end
+
+CeladonCity_EventScript_166D51:: @ 8166D51
+	msgbox gUnknown_81801F5, 3
+	end
+
+CeladonCity_EventScript_166D5A:: @ 8166D5A
+	msgbox gUnknown_8180224, 3
+	end
+
+CeladonCity_EventScript_166D63:: @ 8166D63
+	msgbox gUnknown_81802A4, 3
+	end
+
+CeladonCity_EventScript_166D6C:: @ 8166D6C
+	msgbox gUnknown_81802CF, 3
+	end
diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc
new file mode 100644
index 000000000..f10516c9d
--- /dev/null
+++ b/data/maps/CeladonCity/text.inc
@@ -0,0 +1,114 @@
+gUnknown_817FEC3:: @ 817FEC3
+    .string "I got my KOFFING in CINNABAR.\p"
+    .string "It's usually nice, but it breathes\n"
+    .string "poison when it's angry.$"
+
+gUnknown_817FF1C:: @ 817FF1C
+    .string "Heheh! This GYM is great!\n"
+    .string "It's full of women!$"
+
+gUnknown_817FF4A:: @ 817FF4A
+    .string "CELADON takes pride in its efforts\n"
+    .string "to keep the city beautiful.\p"
+    .string "That's why the new GAME CORNER is\n"
+    .string "bad for our city's image.$"
+
+gUnknown_817FFC5:: @ 817FFC5
+    .string "Moan…\n"
+    .string "I blew it all at the slots!\p"
+    .string "I knew I should have cashed in my\n"
+    .string "COINS for prizes!$"
+
+gUnknown_818001B:: @ 818001B
+    .string "This is my trusted pal, POLIWRATH.\p"
+    .string "It evolved from a POLIWHIRL when\n"
+    .string "I used a WATER STONE.$"
+
+gUnknown_8180075:: @ 8180075
+    .string "POLIWRATH: Ribi ribit!$"
+
+gUnknown_818008C:: @ 818008C
+    .string "What are you staring at?\n"
+    .string "Get lost, or I'll punch you.$"
+
+gUnknown_81800C2:: @ 81800C2
+    .string "Keep out of TEAM ROCKET's way!$"
+
+gUnknown_81800E1:: @ 81800E1
+    .string "TRAINER TIPS\p"
+    .string "X ACCURACY boosts the accuracy of\n"
+    .string "techniques.\p"
+    .string "DIRE HIT jacks up the likelihood\n"
+    .string "of critical hits.\p"
+    .string "Get your items at the CELADON\n"
+    .string "DEPT. STORE!$"
+
+gUnknown_818017A:: @ 818017A
+    .string "CELADON CITY\n"
+    .string "The City of Rainbow Dreams$"
+
+gUnknown_81801A2:: @ 81801A2
+    .string "CELADON CITY POKéMON GYM\n"
+    .string "LEADER: ERIKA\l"
+    .string "The Nature-Loving Princess!$"
+
+gUnknown_81801E5:: @ 81801E5
+    .string "CELADON MANSION$"
+
+gUnknown_81801F5:: @ 81801F5
+    .string "Find what you need at the\n"
+    .string "CELADON DEPT. STORE!$"
+
+gUnknown_8180224:: @ 8180224
+    .string "TRAINER TIPS\p"
+    .string "GUARD SPEC. protects POKéMON\n"
+    .string "from status-reduction moves during\l"
+    .string "battle.\p"
+    .string "Get your items at the\n"
+    .string "CELADON DEPT. STORE!$"
+
+gUnknown_81802A4:: @ 81802A4
+    .string "COINS exchanged for prizes!\n"
+    .string "PRIZE EXCHANGE$"
+
+gUnknown_81802CF:: @ 81802CF
+    .string "ROCKET GAME CORNER\n"
+    .string "The playground for grown-ups!$"
+
+gUnknown_8180300:: @ 8180300
+    .string "Aaaagh, ow…\n"
+    .string "I scalded my tongue!\p"
+    .string "This nice old lady in the MANSION\n"
+    .string "gave me some TEA.\p"
+    .string "But it was boiling hot!\n"
+    .string "Gotta cool it to drink it.$"
+
+Text_180388:: @ 8180388
+    .string "Hello, there!\p"
+    .string "I've seen you about, but I never\n"
+    .string "had a chance to chat.\p"
+    .string "It must be good luck that brought\n"
+    .string "us together finally.\p"
+    .string "I'd like to celebrate by teaching\n"
+    .string "you the move SOFTBOILED.$"
+
+Text_18043F:: @ 818043F
+    .string "I'll always be keeping an eye out\n"
+    .string "for you.\p"
+    .string "I hope we can chat again.$"
+
+Text_180484:: @ 8180484
+    .string "So, who's the POKéMON that gets\n"
+    .string "the chance to learn SOFTBOILED?$"
+
+Text_1804C4:: @ 81804C4
+    .string "I wish you the best of luck!$"
+
+gUnknown_81804E1:: @ 81804E1
+    .string "Oh, what am I to do…\p"
+    .string "Someone stole our SILPH SCOPE.\p"
+    .string "The thief came running this way,\n"
+    .string "I'm sure of it.\p"
+    .string "But I lost sight of him!\n"
+    .string "Where'd he go?$"
+
diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json
new file mode 100644
index 000000000..5665a7f51
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_1F/map.json
@@ -0,0 +1,130 @@
+{
+  "id": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
+  "name": "CeladonCity_Condominiums_1F",
+  "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "125",
+      "x": 1,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_1F_EventScript_16C38E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "113",
+      "x": 5,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_1F_EventScript_16C3A1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "122",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_1F_EventScript_16C3B4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "35",
+      "x": 2,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_1F_EventScript_16C321",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 12,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 13,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 11
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
new file mode 100644
index 000000000..c9f358f44
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
@@ -0,0 +1,68 @@
+CeladonCity_Condominiums_1F_MapScripts:: @ 816C320
+	.byte 0
+
+CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
+	lock
+	faceplayer
+	checkflag FLAG_0x2F8
+	goto_if_eq EventScript_16C36A
+	checkflag FLAG_0x82C
+	goto_if_eq EventScript_16C374
+	checkflag FLAG_0x2A6
+	goto_if_eq EventScript_16C36A
+	msgbox gUnknown_81960C9
+	setflag FLAG_0x2A6
+	giveitem ITEM_TEA
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A6BF9
+	msgbox gUnknown_8196109
+	release
+	end
+
+EventScript_16C36A:: @ 816C36A
+	msgbox gUnknown_8196148
+	release
+	end
+
+EventScript_16C374:: @ 816C374
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	setflag FLAG_0x2F8
+	msgbox gUnknown_8196188
+	release
+	end
+
+CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_MEOWTH, 0
+	msgbox gUnknown_81960BB
+	waitmoncry
+	release
+	end
+
+CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_CLEFAIRY, 0
+	msgbox gUnknown_819625B
+	waitmoncry
+	release
+	end
+
+CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_NIDORAN_F, 0
+	msgbox gUnknown_8196272
+	waitmoncry
+	release
+	end
+
+CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7
+	msgbox gUnknown_8196287, 3
+	end
diff --git a/data/maps/CeladonCity_Condominiums_1F/text.inc b/data/maps/CeladonCity_Condominiums_1F/text.inc
new file mode 100644
index 000000000..7cfb9c2a1
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_1F/text.inc
@@ -0,0 +1,37 @@
+gUnknown_81960BB:: @ 81960BB
+    .string "MEOWTH: Meow!$"
+
+gUnknown_81960C9:: @ 81960C9
+    .string "You shouldn't spend all your money\n"
+    .string "on drinks.\p"
+    .string "Try this instead.$"
+
+gUnknown_8196109:: @ 8196109
+    .string "Nothing beats thirst like some hot\n"
+    .string "TEA.\p"
+    .string "It really is the best.$"
+
+gUnknown_8196148:: @ 8196148
+    .string "My dear POKéMON keep me company.\n"
+    .string "MEOWTH even brings money home!$"
+
+gUnknown_8196188:: @ 8196188
+    .string "Oh, hello, dearie.\n"
+    .string "Did you enjoy my TEA?\p"
+    .string "By the way, dear. Are you, by any\n"
+    .string "chance, from PALLET TOWN?\p"
+    .string "A girl from PALLET TOWN, DAISY,\n"
+    .string "she enjoys TEA every day.\p"
+    .string "She visits the CELADON DEPT. STORE\n"
+    .string "to buy some TEA.$"
+
+gUnknown_819625B:: @ 819625B
+    .string "CLEFAIRY: Pi pippippi!$"
+
+gUnknown_8196272:: @ 8196272
+    .string "NIDORAN♀: Kya kyaoo!$"
+
+gUnknown_8196287:: @ 8196287
+    .string "CELADON MANSION\n"
+    .string "Manager's Suite$"
+
diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json
new file mode 100644
index 000000000..1fdfd5746
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_2F/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
+  "name": "CeladonCity_Condominiums_2F",
+  "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "0",
+      "x": 6,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
+      "flag": "158"
+    },
+    {
+      "graphics_id": "0",
+      "x": 5,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
+      "flag": "158"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc
new file mode 100644
index 000000000..cab71a823
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc
@@ -0,0 +1,6 @@
+CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0
+	.byte 0
+
+CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1
+	msgbox gUnknown_81962A7, 3
+	end
diff --git a/data/maps/CeladonCity_Condominiums_2F/text.inc b/data/maps/CeladonCity_Condominiums_2F/text.inc
new file mode 100644
index 000000000..1913e1529
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_2F/text.inc
@@ -0,0 +1,3 @@
+gUnknown_81962A7:: @ 81962A7
+    .string "GAME FREAK Meeting Room$"
+
diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json
new file mode 100644
index 000000000..0a98c9d67
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_3F/map.json
@@ -0,0 +1,158 @@
+{
+  "id": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
+  "name": "CeladonCity_Condominiums_3F",
+  "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "26",
+      "x": 0,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C3DB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C3F6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C3E4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "27",
+      "x": 0,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C3ED",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C435"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 1,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C43E"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C447"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 1,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C450"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C435"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 0,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C450"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 0,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C43E"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_3F_EventScript_16C447"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc
new file mode 100644
index 000000000..350bc76d0
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc
@@ -0,0 +1,56 @@
+CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA
+	.byte 0
+
+CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB
+	msgbox gUnknown_81962BF, 2
+	end
+
+CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4
+	msgbox gUnknown_81962D7, 2
+	end
+
+CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED
+	msgbox gUnknown_81962FB, 2
+	end
+
+CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
+	lock
+	faceplayer
+	specialvar VAR_RESULT, sub_8088F58
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16C412
+	msgbox gUnknown_8196356
+	release
+	end
+
+EventScript_16C412:: @ 816C412
+	goto EventScript_16C418
+	end
+
+EventScript_16C418:: @ 816C418
+	message Text_1963CD
+	waitmessage
+	delay 60
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_80CA618
+	waitstate
+	release
+	end
+
+CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435
+	msgbox gUnknown_81964A8, 3
+	end
+
+CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E
+	msgbox gUnknown_819640C, 3
+	end
+
+CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447
+	msgbox gUnknown_819644B, 3
+	end
+
+CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450
+	msgbox gUnknown_8196478, 3
+	end
diff --git a/data/maps/CeladonCity_Condominiums_3F/text.inc b/data/maps/CeladonCity_Condominiums_3F/text.inc
new file mode 100644
index 000000000..3f7179dfe
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_3F/text.inc
@@ -0,0 +1,42 @@
+gUnknown_81962BF:: @ 81962BF
+    .string "Me?\n"
+    .string "I'm the programmer!$"
+
+gUnknown_81962D7:: @ 81962D7
+    .string "I'm the graphic artist!\n"
+    .string "I drew you!$"
+
+gUnknown_81962FB:: @ 81962FB
+    .string "I wrote the story!\n"
+    .string "Isn't ERIKA cute?\p"
+    .string "I like MISTY a lot, too!\n"
+    .string "Oh, and SABRINA, I like her!$"
+
+gUnknown_8196356:: @ 8196356
+    .string "Is that right?\p"
+    .string "I'm the game designer!\p"
+    .string "Filling up your POKéDEX is tough,\n"
+    .string "but don't quit!\p"
+    .string "When you finish, come tell me!$"
+
+Text_1963CD:: @ 81963CD
+    .string "Wow! Excellent!\n"
+    .string "You completed your POKéDEX!\l"
+    .string "Congratulations!\l"
+    .string "…$"
+
+gUnknown_819640C:: @ 819640C
+    .string "It's the game program! Messing with\n"
+    .string "it could bug out the game!$"
+
+gUnknown_819644B:: @ 819644B
+    .string "Someone's playing a game instead of\n"
+    .string "working!$"
+
+gUnknown_8196478:: @ 8196478
+    .string "It's the script!\n"
+    .string "Better not look at the ending!$"
+
+gUnknown_81964A8:: @ 81964A8
+    .string "GAME FREAK Development Room$"
+
diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json
new file mode 100644
index 000000000..cbbb754bb
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_Roof/map.json
@@ -0,0 +1,56 @@
+{
+  "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
+  "name": "CeladonCity_Condominiums_Roof",
+  "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 2,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 12,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc
new file mode 100644
index 000000000..a074d5778
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc
@@ -0,0 +1,6 @@
+CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459
+	.byte 0
+
+CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A
+	msgbox gUnknown_81964C4, 3
+	end
diff --git a/data/maps/CeladonCity_Condominiums_Roof/text.inc b/data/maps/CeladonCity_Condominiums_Roof/text.inc
new file mode 100644
index 000000000..02398e70b
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_Roof/text.inc
@@ -0,0 +1,3 @@
+gUnknown_81964C4:: @ 81964C4
+    .string "I KNOW EVERYTHING!$"
+
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
new file mode 100644
index 000000000..aa15b14a5
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
+  "name": "CeladonCity_Condominiums_RoofRoom",
+  "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "54",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C464",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 7,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D",
+      "flag": "87"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
new file mode 100644
index 000000000..8e8bb2b6b
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
@@ -0,0 +1,109 @@
+CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463
+	.byte 0
+
+CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464
+	msgbox gUnknown_81964D7, 2
+	end
+
+CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
+	lock
+	faceplayer
+	setvar VAR_0x4001, SPECIES_EEVEE
+	givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C4A6
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16C4DA
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A927C
+	release
+	end
+
+EventScript_16C4A6:: @ 816C4A6
+	removeobject 2
+	playfanfare MUS_FANFA1
+	message Text_196591
+	waitmessage
+	waitfanfare
+	getspeciesname 0, SPECIES_EEVEE
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C514
+	call EventScript_1A8C27
+	call EventScript_1A74EB
+	goto EventScript_16C514
+	end
+
+EventScript_16C4DA:: @ 816C4DA
+	removeobject 2
+	playfanfare MUS_FANFA1
+	message Text_196591
+	waitmessage
+	waitfanfare
+	getspeciesname 0, SPECIES_EEVEE
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C509
+	call EventScript_1A8C33
+	goto EventScript_16C509
+	end
+
+EventScript_16C509:: @ 816C509
+	call EventScript_1A8C3C
+	goto EventScript_16C514
+	end
+
+EventScript_16C514:: @ 816C514
+	setflag FLAG_0x263
+	release
+	end
+
+CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519
+	msgbox gUnknown_81967E3, 3
+	end
+
+CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522
+	lockall
+	msgbox gUnknown_81965C2
+	message Text_1965F4
+	waitmessage
+	setvar VAR_0x8004, 4
+	multichoice 0, 0, 43, 0
+	switch VAR_RESULT
+	case 0, EventScript_16C5C0
+	case 1, EventScript_16C5CE
+	case 2, EventScript_16C5DC
+	case 3, EventScript_16C5EA
+	case 127, EventScript_16C5EA
+	end
+
+EventScript_16C578:: @ 816C578
+	message Text_1965F4
+	waitmessage
+	multichoice 0, 0, 43, 0
+	switch VAR_RESULT
+	case 0, EventScript_16C5C0
+	case 1, EventScript_16C5CE
+	case 2, EventScript_16C5DC
+	case 3, EventScript_16C5EA
+	case 127, EventScript_16C5EA
+	end
+
+EventScript_16C5C0:: @ 816C5C0
+	msgbox gUnknown_8196617
+	goto EventScript_16C578
+	end
+
+EventScript_16C5CE:: @ 816C5CE
+	msgbox gUnknown_8196695
+	goto EventScript_16C578
+	end
+
+EventScript_16C5DC:: @ 816C5DC
+	msgbox gUnknown_819673C
+	goto EventScript_16C578
+	end
+
+EventScript_16C5EA:: @ 816C5EA
+	releaseall
+	end
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc
new file mode 100644
index 000000000..bb09c8ce3
--- /dev/null
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc
@@ -0,0 +1,52 @@
+gUnknown_81964D7:: @ 81964D7
+    .string "There is nothing that I don't know,\n"
+    .string "like I wrote on the blackboard.\p"
+    .string "I know about the world of POKéMON\n"
+    .string "in your GAME BOY ADVANCE!\p"
+    .string "Get together with your friends and\n"
+    .string "enjoy trading POKéMON!$"
+
+Text_196591:: @ 8196591
+    .string "{PLAYER} obtained an EEVEE!$"
+
+Text_1965A7:: @ 81965A7
+    .string "ポケモンが　いっぱいだ\n"
+    .string "ボックスを　かえて　きなさい$"
+
+gUnknown_81965C2:: @ 81965C2
+    .string "POKéMON Lecture\p"
+    .string "Playing with the Wireless Adapter$"
+
+Text_1965F4:: @ 81965F4
+    .string "Which heading do you want to read?$"
+
+gUnknown_8196617:: @ 8196617
+    .string "The POKéMON WIRELESS CLUB is\n"
+    .string "upstairs at any POKéMON CENTER.\p"
+    .string "Visit one to link up with friend(s)\n"
+    .string "using your Wireless Adapter.$"
+
+gUnknown_8196695:: @ 8196695
+    .string "To link only with a friend, go to\n"
+    .string "the DIRECT CORNER.\p"
+    .string "It is the right counter at the\n"
+    .string "POKéMON WIRELESS CLUB.\p"
+    .string "Go into the TRADE CORNER or the\n"
+    .string "COLOSSEUM with your friend.$"
+
+gUnknown_819673C:: @ 819673C
+    .string "To link and communicate with\n"
+    .string "anyone, go to the UNION ROOM.\p"
+    .string "It is the left counter at the\n"
+    .string "POKéMON WIRELESS CLUB.\p"
+    .string "Go to the UNION ROOM and enjoy\n"
+    .string "meeting other TRAINERS.$"
+
+gUnknown_81967E3:: @ 81967E3
+    .string "It's a pamphlet on TMs.\p"
+    .string "… …\p"
+    .string "There are fifty TMs in all.\p"
+    .string "There are also seven HMs that\n"
+    .string "can be used repeatedly.\p"
+    .string "SILPH CO.$"
+
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json
new file mode 100644
index 000000000..67badf749
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json
@@ -0,0 +1,105 @@
+{
+  "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
+  "name": "CeladonCity_DepartmentStore_1F",
+  "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 4,
+  "elevator_flag": 1,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "48",
+      "x": 6,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAD9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 10,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 11,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAE2"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc
new file mode 100644
index 000000000..593bf0016
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc
@@ -0,0 +1,14 @@
+CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8
+	.byte 0
+
+CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9
+	msgbox gUnknown_81954DD, 2
+	end
+
+CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2
+	msgbox gUnknown_8195537, 3
+	end
+
+CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB
+	msgbox gUnknown_81955B3, 3
+	end
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/text.inc b/data/maps/CeladonCity_DepartmentStore_1F/text.inc
new file mode 100644
index 000000000..e78a8c6d2
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_1F/text.inc
@@ -0,0 +1,17 @@
+gUnknown_81954DD:: @ 81954DD
+    .string "Hello!\n"
+    .string "Welcome to CELADON DEPT. STORE.\p"
+    .string "The board on the right describes\n"
+    .string "the store layout.$"
+
+gUnknown_8195537:: @ 8195537
+    .string "1F: SERVICE COUNTER\p"
+    .string "2F: TRAINER'S MARKET\p"
+    .string "3F: TV GAME SHOP\p"
+    .string "4F: WISE MAN GIFTS\p"
+    .string "5F: DRUGSTORE\p"
+    .string "ROOFTOP SQUARE: VENDING MACHINES$"
+
+gUnknown_81955B3:: @ 81955B3
+    .string "1F: SERVICE COUNTER$"
+
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
new file mode 100644
index 000000000..7363a2af5
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F",
+  "name": "CeladonCity_DepartmentStore_2F",
+  "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 4,
+  "elevator_flag": 2,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 5,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BAFE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "68",
+      "x": 1,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB10",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "68",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB4E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
new file mode 100644
index 000000000..8d859502e
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
@@ -0,0 +1,67 @@
+CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4
+	.byte 0
+
+CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5
+	msgbox gUnknown_81955C7, 2
+	end
+
+CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE
+	msgbox gUnknown_819560F, 2
+	end
+
+CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
+	msgbox gUnknown_8195638, 3
+	end
+
+CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16BB38
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16BB38:: @ 816BB38
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_SUPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_ANTIDOTE
+	.2byte ITEM_PARALYZE_HEAL
+	.2byte ITEM_AWAKENING
+	.2byte ITEM_BURN_HEAL
+	.2byte ITEM_ICE_HEAL
+	.2byte ITEM_SUPER_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16BB74
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16BB74:: @ 816BB74
+	.2byte ITEM_TM05
+	.2byte ITEM_TM15
+	.2byte ITEM_TM28
+	.2byte ITEM_TM31
+	.2byte ITEM_TM43
+	.2byte ITEM_TM45
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/text.inc b/data/maps/CeladonCity_DepartmentStore_2F/text.inc
new file mode 100644
index 000000000..22bf6b36c
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_2F/text.inc
@@ -0,0 +1,13 @@
+gUnknown_81955C7:: @ 81955C7
+    .string "SUPER REPEL keeps weak POKéMON at\n"
+    .string "bay…\p"
+    .string "Hmm, it's a more powerful REPEL.$"
+
+gUnknown_819560F:: @ 819560F
+    .string "For long outings, you should buy\n"
+    .string "REVIVE.$"
+
+gUnknown_8195638:: @ 8195638
+    .string "Top-Grade Items for TRAINERS!\p"
+    .string "2F: TRAINER'S MARKET$"
+
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
new file mode 100644
index 000000000..2c0cf0fbc
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json
@@ -0,0 +1,185 @@
+{
+  "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F",
+  "name": "CeladonCity_DepartmentStore_3F",
+  "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 4,
+  "elevator_flag": 3,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB85",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "51",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "51",
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB9D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "51",
+      "x": 1,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB94",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 9,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBA6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBDC"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBB8"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBC1"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 2,
+      "y": 11,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBCA"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 5,
+      "y": 11,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBD3"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 11,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 11,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 0,
+      "y": 4,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
new file mode 100644
index 000000000..0ce4515d2
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
@@ -0,0 +1,50 @@
+CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84
+	.byte 0
+
+CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85
+	goto EventScript_1C4C26
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B
+	msgbox gUnknown_81956E9, 2
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94
+	msgbox gUnknown_8195769, 2
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D
+	msgbox gUnknown_81957B0, 2
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6
+	msgbox gUnknown_8195823, 2
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF
+	msgbox gUnknown_8195863, 3
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8
+	msgbox gUnknown_8195875, 3
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1
+	msgbox gUnknown_8195897, 3
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA
+	msgbox gUnknown_81958B8, 3
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3
+	msgbox gUnknown_81958D8, 3
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC
+	msgbox gUnknown_81958F6, 3
+	end
+
+CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5
+	msgbox gUnknown_8195907, 3
+	end
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/text.inc b/data/maps/CeladonCity_DepartmentStore_3F/text.inc
new file mode 100644
index 000000000..7d4db12cc
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_3F/text.inc
@@ -0,0 +1,56 @@
+Text_19566B:: @ 819566B
+    .string "We have a customer, LANCE, who\n"
+    .string "occasionally comes.\p"
+    .string "He always buys capes.\p"
+    .string "I wonder… Does he have many\n"
+    .string "identical capes at home?$"
+
+gUnknown_81956E9:: @ 81956E9
+    .string "Captured POKéMON are registered\n"
+    .string "with an ID No. and the OT.\p"
+    .string "OT stands for “Original TRAINER” -\n"
+    .string "the TRAINER that caught it first.$"
+
+gUnknown_8195769:: @ 8195769
+    .string "All right!\p"
+    .string "My buddy's going to trade me his\n"
+    .string "KANGASKHAN for my HAUNTER!$"
+
+gUnknown_81957B0:: @ 81957B0
+    .string "Come on, HAUNTER!\p"
+    .string "I love HAUNTER!\n"
+    .string "I collect them!\p"
+    .string "Huh?\p"
+    .string "HAUNTER turned into a different\n"
+    .string "POKéMON while being traded!$"
+
+gUnknown_8195823:: @ 8195823
+    .string "You can identify POKéMON you get\n"
+    .string "in trades by their ID Numbers.$"
+
+gUnknown_8195863:: @ 8195863
+    .string "It's a Super NES.$"
+
+gUnknown_8195875:: @ 8195875
+    .string "An RPG!\n"
+    .string "There's no time for that!$"
+
+gUnknown_8195897:: @ 8195897
+    .string "A sports game!\n"
+    .string "Dad'll like that!$"
+
+gUnknown_81958B8:: @ 81958B8
+    .string "A puzzle game!\n"
+    .string "Looks addictive!$"
+
+gUnknown_81958D8:: @ 81958D8
+    .string "A fighting game!\n"
+    .string "Looks tough!$"
+
+gUnknown_81958F6:: @ 81958F6
+    .string "3F: TV GAME SHOP$"
+
+gUnknown_8195907:: @ 8195907
+    .string "Red and Green!\n"
+    .string "Both are POKéMON!$"
+
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json
new file mode 100644
index 000000000..37c0841f7
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json
@@ -0,0 +1,89 @@
+{
+  "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F",
+  "name": "CeladonCity_DepartmentStore_4F",
+  "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 4,
+  "elevator_flag": 4,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "25",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBEF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 10,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBF8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "68",
+      "x": 3,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "7",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC0A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
new file mode 100644
index 000000000..2aad6e02b
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
@@ -0,0 +1,39 @@
+CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE
+	.byte 0
+
+CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF
+	msgbox gUnknown_8195A68, 2
+	end
+
+CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8
+	msgbox gUnknown_8195AC9, 2
+	end
+
+CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
+	msgbox gUnknown_8195B5B, 3
+	end
+
+CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16BC30
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16BC30:: @ 816BC30
+	.2byte ITEM_POKE_DOLL
+	.2byte ITEM_RETRO_MAIL
+	.2byte ITEM_FIRE_STONE
+	.2byte ITEM_THUNDER_STONE
+	.2byte ITEM_WATER_STONE
+	.2byte ITEM_LEAF_STONE
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc
new file mode 100644
index 000000000..efe6c5835
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc
@@ -0,0 +1,41 @@
+Text_195928:: @ 8195928
+    .string "Oh, hi!\n"
+    .string "I finally finished POKéMON.\p"
+    .string "Not done yet? How about I teach\n"
+    .string "you a good move?\p"
+    .string "The move I have in mind is\n"
+    .string "COUNTER.\p"
+    .string "Not like the one I'm leaning on,\n"
+    .string "mind you!$"
+
+Text_1959CC:: @ 81959CC
+    .string "You're not interested? Come see\n"
+    .string "me if you change your mind.$"
+
+Text_195A08:: @ 8195A08
+    .string "Which POKéMON should I teach\n"
+    .string "COUNTER to?$"
+
+Text_195A31:: @ 8195A31
+    .string "Are you using that COUNTER move\n"
+    .string "I taught your POKéMON?$"
+
+gUnknown_8195A68:: @ 8195A68
+    .string "I'm getting a present for my\n"
+    .string "girlfriend.\p"
+    .string "I guess a POKé DOLL will be it.\n"
+    .string "It's the popular thing.$"
+
+gUnknown_8195AC9:: @ 8195AC9
+    .string "I heard something useful.\p"
+    .string "If a wild POKéMON appears, you can\n"
+    .string "distract it with a POKé DOLL.\p"
+    .string "You can run away while the wild\n"
+    .string "POKéMON is distracted.$"
+
+gUnknown_8195B5B:: @ 8195B5B
+    .string "Express yourself with gifts!\n"
+    .string "4F: WISE MAN GIFTS\p"
+    .string "Evolution Special!\n"
+    .string "Element STONES on sale now!$"
+
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json
new file mode 100644
index 000000000..691d9ff7c
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F",
+  "name": "CeladonCity_DepartmentStore_5F",
+  "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 4,
+  "elevator_flag": 5,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC41",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC4A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "68",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC5C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "68",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC96",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
new file mode 100644
index 000000000..05aff00cd
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
@@ -0,0 +1,65 @@
+CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40
+	.byte 0
+
+CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41
+	msgbox gUnknown_8195BBA, 2
+	end
+
+CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A
+	msgbox gUnknown_8195CA0, 2
+	end
+
+CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
+	msgbox gUnknown_8195D14, 3
+	end
+
+CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16BC84
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16BC84:: @ 816BC84
+	.2byte ITEM_X_ATTACK
+	.2byte ITEM_X_DEFEND
+	.2byte ITEM_X_SPEED
+	.2byte ITEM_X_SPECIAL
+	.2byte ITEM_X_ACCURACY
+	.2byte ITEM_GUARD_SPEC
+	.2byte ITEM_DIRE_HIT
+	.2byte ITEM_NONE
+	release
+	end
+
+CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16BCBC
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16BCBC:: @ 816BCBC
+	.2byte ITEM_HP_UP
+	.2byte ITEM_PROTEIN
+	.2byte ITEM_IRON
+	.2byte ITEM_CALCIUM
+	.2byte ITEM_ZINC
+	.2byte ITEM_CARBOS
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/text.inc b/data/maps/CeladonCity_DepartmentStore_5F/text.inc
new file mode 100644
index 000000000..b8cee5afa
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_5F/text.inc
@@ -0,0 +1,23 @@
+gUnknown_8195BBA:: @ 8195BBA
+    .string "POKéMON stat enhancers can be\n"
+    .string "bought only here.\p"
+    .string "HP UP increases the base HP of a\n"
+    .string "POKéMON.\p"
+    .string "CALCIUM raises the base SP. ATK\n"
+    .string "stat of one POKéMON.\p"
+    .string "ZINC boosts the base SP. DEF stat\n"
+    .string "of one POKéMON.\p"
+    .string "CARBOS enhances the base SPEED\n"
+    .string "stat.$"
+
+gUnknown_8195CA0:: @ 8195CA0
+    .string "I'm here for POKéMON stat\n"
+    .string "enhancers.\p"
+    .string "PROTEIN increases the base ATTACK\n"
+    .string "power.\p"
+    .string "IRON increases the base DEFENSE\n"
+    .string "stat.$"
+
+gUnknown_8195D14:: @ 8195D14
+    .string "5F: DRUGSTORE$"
+
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
new file mode 100644
index 000000000..7a2c88c84
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
+  "name": "CeladonCity_DepartmentStore_Elevator",
+  "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 2,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 0,
+      "y": 2,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
new file mode 100644
index 000000000..6f104041e
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
@@ -0,0 +1,123 @@
+CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
+	.byte 0
+
+CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
+	lockall
+	setvar VAR_0x8004, 3
+	checkflag FLAG_0x002
+	call_if 0, EventScript_1A7AB9
+	copyvar VAR_0x8005, VAR_0x403A
+	special sub_80CB580
+	message Text_1A535C
+	waitmessage
+	setvar VAR_0x8004, 3
+	specialvar VAR_RESULT, sub_80CB328
+	switch VAR_RESULT
+	case 0, EventScript_16C1B7
+	case 1, EventScript_16C1C3
+	case 2, EventScript_16C1CF
+	case 3, EventScript_16C1DB
+	case 4, EventScript_16C1E7
+	end
+
+EventScript_16C1B7:: @ 816C1B7
+	multichoicedefault 0, 0, 31, 0, 0
+	goto EventScript_16C1F3
+
+EventScript_16C1C2:: @ 816C1C2
+	end
+
+EventScript_16C1C3:: @ 816C1C3
+	multichoicedefault 0, 0, 31, 1, 0
+	goto EventScript_16C1F3
+	end
+
+EventScript_16C1CF:: @ 816C1CF
+	multichoicedefault 0, 0, 31, 2, 0
+	goto EventScript_16C1F3
+	end
+
+EventScript_16C1DB:: @ 816C1DB
+	multichoicedefault 0, 0, 31, 3, 0
+	goto EventScript_16C1F3
+	end
+
+EventScript_16C1E7:: @ 816C1E7
+	multichoicedefault 0, 0, 31, 4, 0
+	goto EventScript_16C1F3
+	end
+
+EventScript_16C1F3:: @ 816C1F3
+	switch VAR_RESULT
+	case 0, EventScript_16C2E6
+	case 1, EventScript_16C2BE
+	case 2, EventScript_16C296
+	case 3, EventScript_16C26E
+	case 4, EventScript_16C246
+	case 5, EventScript_16C30E
+	case 127, EventScript_16C30E
+	end
+
+EventScript_16C246:: @ 816C246
+	setvar VAR_0x8006, 4
+	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
+	compare_var_to_value VAR_0x403A, 4
+	goto_if_eq EventScript_16C30E
+	call EventScript_16C313
+	setvar VAR_0x403A, 4
+	goto EventScript_16C30E
+	end
+
+EventScript_16C26E:: @ 816C26E
+	setvar VAR_0x8006, 5
+	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
+	compare_var_to_value VAR_0x403A, 5
+	goto_if_eq EventScript_16C30E
+	call EventScript_16C313
+	setvar VAR_0x403A, 5
+	goto EventScript_16C30E
+	end
+
+EventScript_16C296:: @ 816C296
+	setvar VAR_0x8006, 6
+	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
+	compare_var_to_value VAR_0x403A, 6
+	goto_if_eq EventScript_16C30E
+	call EventScript_16C313
+	setvar VAR_0x403A, 6
+	goto EventScript_16C30E
+	end
+
+EventScript_16C2BE:: @ 816C2BE
+	setvar VAR_0x8006, 7
+	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
+	compare_var_to_value VAR_0x403A, 7
+	goto_if_eq EventScript_16C30E
+	call EventScript_16C313
+	setvar VAR_0x403A, 7
+	goto EventScript_16C30E
+	end
+
+EventScript_16C2E6:: @ 816C2E6
+	setvar VAR_0x8006, 8
+	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
+	compare_var_to_value VAR_0x403A, 8
+	goto_if_eq EventScript_16C30E
+	call EventScript_16C313
+	setvar VAR_0x403A, 8
+	goto EventScript_16C30E
+	end
+
+EventScript_16C30E:: @ 816C30E
+	special sub_80CB63C
+	releaseall
+	end
+
+EventScript_16C313:: @ 816C313
+	special sub_80CB63C
+	closemessage
+	waitse
+	special sub_80CB498
+	waitstate
+	setflag FLAG_0x002
+	return
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
new file mode 100644
index 000000000..470ea3dd1
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
@@ -0,0 +1,83 @@
+{
+  "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF",
+  "name": "CeladonCity_DepartmentStore_Roof",
+  "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 4,
+  "elevator_flag": 127,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "41",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C022",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16BCCD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 3,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C02B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 3,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 3,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 3,
+      "elevation": 0,
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
new file mode 100644
index 000000000..1c7ee50df
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
@@ -0,0 +1,304 @@
+CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
+	.byte 0
+
+CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	call EventScript_16BCF6
+	compare_var_to_value VAR_0x4001, 0
+	goto_if_eq EventScript_16C00E
+	goto EventScript_16BD3E
+	end
+
+EventScript_16BCF6:: @ 816BCF6
+	setvar VAR_0x4001, 0
+	checkitem ITEM_FRESH_WATER, 1
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_16BD2C
+	checkitem ITEM_SODA_POP, 1
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_16BD32
+	checkitem ITEM_LEMONADE, 1
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_16BD38
+	return
+
+EventScript_16BD2C:: @ 816BD2C
+	addvar VAR_0x4001, 1
+	return
+
+EventScript_16BD32:: @ 816BD32
+	addvar VAR_0x4001, 2
+	return
+
+EventScript_16BD38:: @ 816BD38
+	addvar VAR_0x4001, 4
+	return
+
+EventScript_16BD3E:: @ 816BD3E
+	msgbox gUnknown_8195D22, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C00C
+	textcolor 3
+	message Text_195D5F
+	waitmessage
+	textcolor 1
+	switch VAR_0x4001
+	case 1, EventScript_16BDAE
+	case 2, EventScript_16BDDA
+	case 3, EventScript_16BE06
+	case 4, EventScript_16BE3D
+	case 5, EventScript_16BE69
+	case 6, EventScript_16BEA0
+	case 7, EventScript_16BED7
+	end
+
+EventScript_16BDAE:: @ 816BDAE
+	multichoice 0, 0, 32, 0
+	switch VAR_RESULT
+	case 0, EventScript_16BF19
+	case 1, EventScript_16C00C
+	case 127, EventScript_16C00C
+	end
+
+EventScript_16BDDA:: @ 816BDDA
+	multichoice 0, 0, 33, 0
+	switch VAR_RESULT
+	case 0, EventScript_16BF3A
+	case 1, EventScript_16C00C
+	case 127, EventScript_16C00C
+	end
+
+EventScript_16BE06:: @ 816BE06
+	multichoice 0, 0, 34, 0
+	switch VAR_RESULT
+	case 0, EventScript_16BF19
+	case 1, EventScript_16BF3A
+	case 2, EventScript_16C00C
+	case 127, EventScript_16C00C
+	end
+
+EventScript_16BE3D:: @ 816BE3D
+	multichoice 0, 0, 35, 0
+	switch VAR_RESULT
+	case 0, EventScript_16BF5B
+	case 1, EventScript_16C00C
+	case 127, EventScript_16C00C
+	end
+
+EventScript_16BE69:: @ 816BE69
+	multichoice 0, 0, 36, 0
+	switch VAR_RESULT
+	case 0, EventScript_16BF19
+	case 1, EventScript_16BF5B
+	case 2, EventScript_16C00C
+	case 127, EventScript_16C00C
+	end
+
+EventScript_16BEA0:: @ 816BEA0
+	multichoice 0, 0, 37, 0
+	switch VAR_RESULT
+	case 0, EventScript_16BF3A
+	case 1, EventScript_16BF5B
+	case 2, EventScript_16C00C
+	case 127, EventScript_16C00C
+	end
+
+EventScript_16BED7:: @ 816BED7
+	multichoice 0, 0, 38, 0
+	switch VAR_RESULT
+	case 0, EventScript_16BF19
+	case 1, EventScript_16BF3A
+	case 2, EventScript_16BF5B
+	case 3, EventScript_16C00C
+	case 127, EventScript_16C00C
+	end
+
+EventScript_16BF19:: @ 816BF19
+	setvar VAR_0x8008, ITEM_FRESH_WATER
+	setvar VAR_0x8009, ITEM_TM16
+	checkflag FLAG_0x296
+	goto_if_eq EventScript_16C018
+	msgbox gUnknown_8195D75
+	goto EventScript_16BF7C
+	end
+
+EventScript_16BF3A:: @ 816BF3A
+	setvar VAR_0x8008, ITEM_SODA_POP
+	setvar VAR_0x8009, ITEM_TM20
+	checkflag FLAG_0x295
+	goto_if_eq EventScript_16C018
+	msgbox gUnknown_8195E33
+	goto EventScript_16BF7C
+	end
+
+EventScript_16BF5B:: @ 816BF5B
+	setvar VAR_0x8008, ITEM_LEMONADE
+	setvar VAR_0x8009, ITEM_TM33
+	checkflag FLAG_0x294
+	goto_if_eq EventScript_16C018
+	msgbox gUnknown_8195EBF
+	goto EventScript_16BF7C
+	end
+
+EventScript_16BF7C:: @ 816BF7C
+	getitemname 0, VAR_0x8008
+	getitemname 1, VAR_0x8009
+	removeitem VAR_0x8008, 1
+	checkitemspace VAR_0x8009, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C002
+	additem VAR_0x8009, 1
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message Text_195DAD
+	waitmessage
+	waitfanfare
+	giveitem VAR_0x8009, 1, 8
+	call EventScript_1A6675
+	compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER
+	call_if 1, EventScript_16BFDE
+	compare_var_to_value VAR_0x8008, ITEM_SODA_POP
+	call_if 1, EventScript_16BFEA
+	compare_var_to_value VAR_0x8008, ITEM_LEMONADE
+	call_if 1, EventScript_16BFF6
+	release
+	end
+
+EventScript_16BFDE:: @ 816BFDE
+	setflag FLAG_0x296
+	msgbox gUnknown_8195DD4
+	return
+
+EventScript_16BFEA:: @ 816BFEA
+	setflag FLAG_0x295
+	msgbox gUnknown_8195E68
+	return
+
+EventScript_16BFF6:: @ 816BFF6
+	setflag FLAG_0x294
+	msgbox gUnknown_8195EF4
+	return
+
+EventScript_16C002:: @ 816C002
+	msgbox gUnknown_8195F4F
+	release
+	end
+
+EventScript_16C00C:: @ 816C00C
+	release
+	end
+
+EventScript_16C00E:: @ 816C00E
+	msgbox gUnknown_8195FEF
+	release
+	end
+
+EventScript_16C018:: @ 816C018
+	msgbox gUnknown_8195F6E
+	release
+	end
+
+CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022
+	msgbox gUnknown_8195F98, 2
+	end
+
+CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B
+	msgbox gUnknown_8196017, 3
+	end
+
+CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034
+	lockall
+	message Text_196038
+	waitmessage
+	showmoneybox 0, 0, 0
+	goto EventScript_16C045
+	end
+
+EventScript_16C045:: @ 816C045
+	multichoice 12, 0, 26, 0
+	copyvar VAR_0x4001, VAR_RESULT
+	switch VAR_0x4001
+	case 0, EventScript_16C083
+	case 1, EventScript_16C094
+	case 2, EventScript_16C0A5
+	msgbox gUnknown_81960AE
+	goto EventScript_16C14D
+	end
+
+EventScript_16C083:: @ 816C083
+	setvar VAR_0x4000, ITEM_FRESH_WATER
+	checkmoney 200, 0
+	goto EventScript_16C0CB
+	end
+
+EventScript_16C094:: @ 816C094
+	setvar VAR_0x4000, ITEM_SODA_POP
+	checkmoney 300, 0
+	goto EventScript_16C0CB
+	end
+
+EventScript_16C0A5:: @ 816C0A5
+	setvar VAR_0x4000, ITEM_LEMONADE
+	checkmoney 350, 0
+	goto EventScript_16C0CB
+	end
+
+EventScript_16C0B6:: @ 816C0B6
+	takemoney 200, 0
+	return
+
+EventScript_16C0BD:: @ 816C0BD
+	takemoney 300, 0
+	return
+
+EventScript_16C0C4:: @ 816C0C4
+	takemoney 350, 0
+	return
+
+EventScript_16C0CB:: @ 816C0CB
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C131
+	checkitemspace VAR_0x4000, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C13F
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16C0B6
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16C0BD
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16C0C4
+	updatemoneybox 0, 0, 0
+	getitemname 0, VAR_0x4000
+	playse SE_C_PASI
+	msgbox gUnknown_8196076
+	additem VAR_0x4000, 1
+	goto EventScript_16C125
+	end
+
+EventScript_16C125:: @ 816C125
+	message Text_196038
+	waitmessage
+	goto EventScript_16C045
+	end
+
+EventScript_16C131:: @ 816C131
+	msgbox gUnknown_819605E
+	goto EventScript_16C14D
+	end
+
+EventScript_16C13F:: @ 816C13F
+	msgbox gUnknown_819608E
+	goto EventScript_16C14D
+	end
+
+EventScript_16C14D:: @ 816C14D
+	hidemoneybox
+	.byte 0
+	.byte 0
+	releaseall
+	end
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc
new file mode 100644
index 000000000..a03cfedaf
--- /dev/null
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc
@@ -0,0 +1,82 @@
+gUnknown_8195D22:: @ 8195D22
+    .string "I'm thirsty!\n"
+    .string "I want something to drink!\p"
+    .string "{SIZE}ÁGive her a drink?$"
+
+Text_195D5F:: @ 8195D5F
+    .string "Give her which drink?$"
+
+gUnknown_8195D75:: @ 8195D75
+    .string "Yay!\p"
+    .string "FRESH WATER!\p"
+    .string "Thank you!\n"
+    .string "You can have this from me!$"
+
+Text_195DAD:: @ 8195DAD
+    .string "{PLAYER} received a {STR_VAR_2}\n"
+    .string "from the little girl.$"
+
+gUnknown_8195DD4:: @ 8195DD4
+    .string "TM16 contains LIGHT SCREEN.\p"
+    .string "It's a move that weakens the power\n"
+    .string "of special attacks by your foe.$"
+
+gUnknown_8195E33:: @ 8195E33
+    .string "Yay!\p"
+    .string "SODA POP!\p"
+    .string "Thank you!\n"
+    .string "You can have this from me!$"
+
+gUnknown_8195E68:: @ 8195E68
+    .string "TM20 contains SAFEGUARD.\p"
+    .string "It's a move that prevents status\n"
+    .string "problems among your POKéMON.$"
+
+gUnknown_8195EBF:: @ 8195EBF
+    .string "Yay!\p"
+    .string "LEMONADE!\p"
+    .string "Thank you!\n"
+    .string "You can have this from me!$"
+
+gUnknown_8195EF4:: @ 8195EF4
+    .string "TM33 contains REFLECT.\p"
+    .string "It's a move that weakens the power\n"
+    .string "of physical attacks by your foe.$"
+
+gUnknown_8195F4F:: @ 8195F4F
+    .string "You don't have space for this!$"
+
+gUnknown_8195F6E:: @ 8195F6E
+    .string "No, thank you!\n"
+    .string "I'm not thirsty after all!$"
+
+gUnknown_8195F98:: @ 8195F98
+    .string "My sister is a TRAINER, believe it\n"
+    .string "or not.\p"
+    .string "But, she's so immature, she drives\n"
+    .string "me nuts!$"
+
+gUnknown_8195FEF:: @ 8195FEF
+    .string "I'm thirsty!\n"
+    .string "I want something to drink!$"
+
+gUnknown_8196017:: @ 8196017
+    .string "ROOFTOP SQUARE:\n"
+    .string "VENDING MACHINES$"
+
+Text_196038:: @ 8196038
+    .string "A vending machine!\n"
+    .string "What does it have?$"
+
+gUnknown_819605E:: @ 819605E
+    .string "Oops, not enough money!$"
+
+gUnknown_8196076:: @ 8196076
+    .string "A can of {STR_VAR_1} popped out!$"
+
+gUnknown_819608E:: @ 819608E
+    .string "There's no more room for stuff!$"
+
+gUnknown_81960AE:: @ 81960AE
+    .string "Not thirsty!$"
+
diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
new file mode 100644
index 000000000..a3b1df6f4
--- /dev/null
+++ b/data/maps/CeladonCity_GameCorner/map.json
@@ -0,0 +1,469 @@
+{
+  "id": "MAP_CELADON_CITY_GAME_CORNER",
+  "name": "CeladonCity_GameCorner",
+  "layout": "LAYOUT_CELADON_CITY_GAME_CORNER",
+  "music": "BGM_FRLG_GAMECORNER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "48",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C684",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C68D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C7BA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C7D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C7E7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C857",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C87E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "33",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C88E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C89E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 16,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C8FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CAF5",
+      "flag": "91"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "51",
+      "unknown": 10
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "52",
+      "unknown": 10
+    },
+    {
+      "type": "hidden_item",
+      "x": 2,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "53",
+      "unknown": 20
+    },
+    {
+      "type": "hidden_item",
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "54",
+      "unknown": 10
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "55",
+      "unknown": 10
+    },
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "56",
+      "unknown": 20
+    },
+    {
+      "type": "hidden_item",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "57",
+      "unknown": 10
+    },
+    {
+      "type": "hidden_item",
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "58",
+      "unknown": 10
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "59",
+      "unknown": 10
+    },
+    {
+      "type": "hidden_item",
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "60",
+      "unknown": 40
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "61",
+      "unknown": 100
+    },
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "item": "ITEM_NONE",
+      "flag": "62",
+      "unknown": 10
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 0,
+      "y": 7,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C95E"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 0,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C9A4"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 0,
+      "y": 10,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C9B0"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 5,
+      "y": 6,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C9BC"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CB5A"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C9D4"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C9E0"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 6,
+      "y": 6,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C9EC"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 6,
+      "y": 7,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16C9F8"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA04"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA10"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 11,
+      "y": 7,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA1C"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 11,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA28"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 11,
+      "y": 10,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA34"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 12,
+      "y": 6,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA40"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 12,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CB63"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 12,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA58"
+    },
+    {
+      "type": "bg_event_type_4",
+      "x": 12,
+      "y": 10,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA64"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 17,
+      "y": 6,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CB6C"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 17,
+      "y": 7,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA7C"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 17,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA88"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 17,
+      "y": 9,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CA94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_16CAAA"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 17,
+      "y": 13,
+      "elevation": 0,
+      "script": "CeladonCity_GameCorner_EventScript_1B2867"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
new file mode 100644
index 000000000..dca647299
--- /dev/null
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -0,0 +1,487 @@
+CeladonCity_GameCorner_MapScripts:: @ 816C646
+	map_script 1, CeladonCity_GameCorner_MapScript1_16C64C
+	.byte 0
+
+CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C
+	checkflag FLAG_0x26D
+	call_if 0, EventScript_16C656
+	end
+
+EventScript_16C656:: @ 816C656
+	setmetatile 15, 2, 658, 0
+	setmetatile 16, 2, 658, 0
+	setmetatile 17, 2, 658, 0
+	setmetatile 16, 3, 719, 1
+	setmetatile 17, 3, 719, 1
+	return
+
+CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
+	msgbox gUnknown_8196940, 2
+	end
+
+CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	showmoneybox 0, 0, 0
+	showcoinsbox 0, 5
+	message Text_196984
+	waitmessage
+	multichoice 13, 0, 27, 0
+	copyvar VAR_0x8009, VAR_RESULT
+	switch VAR_RESULT
+	case 0, EventScript_16C6E6
+	case 1, EventScript_16C6E6
+	case 2, EventScript_16C782
+	case 127, EventScript_16C782
+	end
+
+EventScript_16C6E6:: @ 816C6E6
+	checkflag FLAG_0x243
+	goto_if 0, EventScript_16C790
+	compare_var_to_value VAR_0x8009, 0
+	goto_if_eq EventScript_16C734
+	compare_var_to_value VAR_0x8009, 1
+	goto_if_eq EventScript_16C706
+	end
+
+EventScript_16C706:: @ 816C706
+	checkcoins VAR_0x4001
+	compare_var_to_value VAR_0x4001, 9500
+	goto_if 4, EventScript_16C79E
+	checkmoney 10000, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C7AC
+	givecoins 500
+	takemoney 10000, 0
+	goto EventScript_16C762
+	end
+
+EventScript_16C734:: @ 816C734
+	checkcoins VAR_0x4001
+	compare_var_to_value VAR_0x4001, 9950
+	goto_if 4, EventScript_16C79E
+	checkmoney 1000, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C7AC
+	givecoins 50
+	takemoney 1000, 0
+	goto EventScript_16C762
+	end
+
+EventScript_16C762:: @ 816C762
+	updatemoneybox 0, 0, 0
+	updatecoinsbox 0, 5
+	playse SE_CASHIER
+	msgbox gUnknown_8196A62
+	goto EventScript_16C77A
+	end
+
+EventScript_16C77A:: @ 816C77A
+	hidemoneybox
+	.byte 0
+	.byte 0
+	hidecoinsbox 0, 5
+	release
+	end
+
+EventScript_16C782:: @ 816C782
+	msgbox gUnknown_81969DC
+	goto EventScript_16C77A
+	end
+
+EventScript_16C790:: @ 816C790
+	msgbox gUnknown_81969FB
+	goto EventScript_16C77A
+	end
+
+EventScript_16C79E:: @ 816C79E
+	msgbox gUnknown_8196A26
+	goto EventScript_16C77A
+	end
+
+EventScript_16C7AC:: @ 816C7AC
+	msgbox gUnknown_8196A46
+	goto EventScript_16C77A
+	end
+
+CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA
+	lock
+	faceplayer
+	msgbox gUnknown_8196A82
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C7CA:: @ 816C7CA
+	closemessage
+	applymovement VAR_LAST_TALKED, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7
+	lock
+	faceplayer
+	msgbox gUnknown_8196AC7
+	goto EventScript_16C7CA
+	end
+
+CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
+	lock
+	faceplayer
+	checkflag FLAG_0x26E
+	goto_if_eq EventScript_16C849
+	msgbox gUnknown_8196AF3
+	checkflag FLAG_0x243
+	goto_if 0, EventScript_16C839
+	checkcoins VAR_0x4001
+	compare_var_to_value VAR_0x4001, 9990
+	goto_if 4, EventScript_16C82B
+	givecoins 10
+	textcolor 3
+	msgbox gUnknown_8196B0D
+	playse SE_CASHIER
+	waitse
+	setflag FLAG_0x26E
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C82B:: @ 816C82B
+	msgbox gUnknown_8196B30
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C839:: @ 816C839
+	textcolor 3
+	msgbox gUnknown_8196F26
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C849:: @ 816C849
+	msgbox gUnknown_8196B49
+	goto EventScript_16C7CA
+	end
+
+CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
+	lock
+	faceplayer
+	checkflag FLAG_0x4B3
+	goto_if_eq EventScript_16C870
+	msgbox gUnknown_8196BAD
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C870:: @ 816C870
+	msgbox gUnknown_8196CA1
+	goto EventScript_16C7CA
+	end
+
+CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E
+	lock
+	faceplayer
+	msgbox gUnknown_8196B7B
+	goto EventScript_16C7CA
+	end
+
+CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E
+	lock
+	faceplayer
+	msgbox gUnknown_8196CFE
+	goto EventScript_16C7CA
+	end
+
+CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
+	lock
+	faceplayer
+	checkflag FLAG_0x26F
+	goto_if_eq EventScript_16C8F0
+	msgbox gUnknown_8196D2B
+	checkflag FLAG_0x243
+	goto_if 0, EventScript_16C839
+	checkcoins VAR_0x4001
+	compare_var_to_value VAR_0x4001, 9980
+	goto_if 4, EventScript_16C8E2
+	givecoins 20
+	textcolor 3
+	msgbox gUnknown_8196D47
+	playse SE_CASHIER
+	waitse
+	setflag FLAG_0x26F
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C8E2:: @ 816C8E2
+	msgbox gUnknown_8196D6F
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C8F0:: @ 816C8F0
+	msgbox gUnknown_8196D87
+	goto EventScript_16C7CA
+	end
+
+CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
+	lock
+	faceplayer
+	checkflag FLAG_0x270
+	goto_if_eq EventScript_16C950
+	msgbox gUnknown_8196DB7
+	checkflag FLAG_0x243
+	goto_if 0, EventScript_16C839
+	checkcoins VAR_0x4001
+	compare_var_to_value VAR_0x4001, 9980
+	goto_if 4, EventScript_16C942
+	givecoins 20
+	textcolor 3
+	msgbox gUnknown_8196DF8
+	playse SE_CASHIER
+	waitse
+	setflag FLAG_0x270
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C942:: @ 816C942
+	msgbox gUnknown_8196E1B
+	goto EventScript_16C7CA
+	end
+
+EventScript_16C950:: @ 816C950
+	msgbox gUnknown_8196E40
+	goto EventScript_16C7CA
+	end
+
+CeladonCity_GameCorner_EventScript_16C95E:: @ 816C95E
+	lockall
+	setvar VAR_0x8004, 0
+	goto EventScript_16C96C
+	end
+
+EventScript_16C96A:: @ 816C96A
+	releaseall
+	end
+
+EventScript_16C96C:: @ 816C96C
+	checkflag FLAG_0x243
+	goto_if 0, EventScript_16CAA0
+	msgbox gUnknown_8196F46, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16C96A
+	setfieldeffectarg 0, 255
+	setfieldeffectarg 1, 10
+	setfieldeffectarg 2, 14
+	dofieldeffect 64
+	waitfieldeffect 64
+	specialvar VAR_RESULT, sub_80CAABC
+	playslotmachine VAR_RESULT
+	releaseall
+	end
+
+CeladonCity_GameCorner_EventScript_16C9A4:: @ 816C9A4
+	lockall
+	setvar VAR_0x8004, 1
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16C9B0:: @ 816C9B0
+	lockall
+	setvar VAR_0x8004, 2
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16C9BC:: @ 816C9BC
+	lockall
+	setvar VAR_0x8004, 3
+	goto EventScript_16C96C
+	end
+
+EventScript_16C9C8:: @ 816C9C8
+	lockall
+	setvar VAR_0x8004, 4
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16C9D4:: @ 816C9D4
+	lockall
+	setvar VAR_0x8004, 5
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16C9E0:: @ 816C9E0
+	lockall
+	setvar VAR_0x8004, 6
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16C9EC:: @ 816C9EC
+	lockall
+	setvar VAR_0x8004, 7
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16C9F8:: @ 816C9F8
+	lockall
+	setvar VAR_0x8004, 8
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA04:: @ 816CA04
+	lockall
+	setvar VAR_0x8004, 9
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA10:: @ 816CA10
+	lockall
+	setvar VAR_0x8004, 10
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA1C:: @ 816CA1C
+	lockall
+	setvar VAR_0x8004, 11
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA28:: @ 816CA28
+	lockall
+	setvar VAR_0x8004, 12
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA34:: @ 816CA34
+	lockall
+	setvar VAR_0x8004, 13
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA40:: @ 816CA40
+	lockall
+	setvar VAR_0x8004, 14
+	goto EventScript_16C96C
+	end
+
+EventScript_16CA4C:: @ 816CA4C
+	lockall
+	setvar VAR_0x8004, 15
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA58:: @ 816CA58
+	lockall
+	setvar VAR_0x8004, 16
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA64:: @ 816CA64
+	lockall
+	setvar VAR_0x8004, 17
+	goto EventScript_16C96C
+	end
+
+EventScript_16CA70:: @ 816CA70
+	lockall
+	setvar VAR_0x8004, 18
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA7C:: @ 816CA7C
+	lockall
+	setvar VAR_0x8004, 19
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA88:: @ 816CA88
+	lockall
+	setvar VAR_0x8004, 20
+	goto EventScript_16C96C
+	end
+
+CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94
+	lockall
+	setvar VAR_0x8004, 21
+	goto EventScript_16C96C
+	end
+
+EventScript_16CAA0:: @ 816CAA0
+	msgbox gUnknown_8196F0D
+	releaseall
+	end
+
+CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
+	lockall
+	msgbox gUnknown_8196EDC
+	checkflag FLAG_0x26D
+	call_if 0, EventScript_16CABE
+	releaseall
+	end
+
+EventScript_16CABE:: @ 816CABE
+	playse SE_FU_ZAKU2
+	setmetatile 15, 2, 669, 0
+	setmetatile 16, 2, 670, 1
+	setmetatile 17, 2, 671, 1
+	setmetatile 16, 3, 678, 1
+	setmetatile 17, 3, 679, 1
+	special DrawWholeMapView
+	setflag FLAG_0x26D
+	return
+
+CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
+	trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10
+	msgbox gUnknown_8196E9B, 6
+	end
+
+EventScript_16CB10:: @ 816CB10
+	msgbox gUnknown_8196E9B
+	closemessage
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_16CB34
+	compare_var_to_value VAR_FACING, 3
+	call_if 5, EventScript_16CB3F
+	removeobject 11
+	release
+	end
+
+EventScript_16CB34:: @ 816CB34
+	applymovement 11, Movement_16CB4A
+	waitmovement 0
+	return
+
+EventScript_16CB3F:: @ 816CB3F
+	applymovement 11, Movement_16CB53
+	waitmovement 0
+	return
+
+Movement_16CB4A:: @ 816CB4A
+	step_10
+	step_13
+	step_13
+	step_11
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_16CB53:: @ 816CB53
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A
+	msgbox gUnknown_8196F64, 3
+	end
+
+CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63
+	msgbox gUnknown_8196F81, 3
+	end
+
+CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C
+	msgbox gUnknown_8196FA0, 3
+	end
diff --git a/data/maps/CeladonCity_GameCorner/text.inc b/data/maps/CeladonCity_GameCorner/text.inc
new file mode 100644
index 000000000..a388a736f
--- /dev/null
+++ b/data/maps/CeladonCity_GameCorner/text.inc
@@ -0,0 +1,148 @@
+gUnknown_8196940:: @ 8196940
+    .string "Welcome!\p"
+    .string "You can exchange your COINS for\n"
+    .string "fabulous prizes next door.$"
+
+Text_196984:: @ 8196984
+    .string "Welcome to ROCKET GAME CORNER!\p"
+    .string "Do you need some game COINS?\n"
+    .string "Would you like to buy some?$"
+
+gUnknown_81969DC:: @ 81969DC
+    .string "No?\n"
+    .string "Please come play sometime!$"
+
+gUnknown_81969FB:: @ 81969FB
+    .string "Oh, I'm sorry.\n"
+    .string "You don't have a COIN CASE.$"
+
+gUnknown_8196A26:: @ 8196A26
+    .string "Whoops!\n"
+    .string "Your COIN CASE is full.$"
+
+gUnknown_8196A46:: @ 8196A46
+    .string "You can't afford the COINS.$"
+
+gUnknown_8196A62:: @ 8196A62
+    .string "Thank you.\n"
+    .string "Here are your COINS!$"
+
+gUnknown_8196A82:: @ 8196A82
+    .string "Keep this quiet.\p"
+    .string "It's rumored that this place is run\n"
+    .string "by TEAM ROCKET.$"
+
+gUnknown_8196AC7:: @ 8196AC7
+    .string "I think these machines have\n"
+    .string "different odds.$"
+
+gUnknown_8196AF3:: @ 8196AF3
+    .string "Kid, do you want to play?$"
+
+gUnknown_8196B0D:: @ 8196B0D
+    .string "{PLAYER} received 10 COINS\n"
+    .string "from the man.$"
+
+gUnknown_8196B30:: @ 8196B30
+    .string "You don't need my COINS!$"
+
+gUnknown_8196B49:: @ 8196B49
+    .string "Wins seem to come and go.\n"
+    .string "Nothing's a sure thing.$"
+
+gUnknown_8196B7B:: @ 8196B7B
+    .string "These slot games…\n"
+    .string "Win or lose, it's only by luck.$"
+
+gUnknown_8196BAD:: @ 8196BAD
+    .string "Hey!\p"
+    .string "You have better things to do,\n"
+    .string "champ in the making!\p"
+    .string "CELADON GYM's LEADER is ERIKA.\p"
+    .string "She is a user of GRASS-type\n"
+    .string "POKéMON, and at one with nature.\p"
+    .string "She might appear docile because of\n"
+    .string "her flower arranging…\p"
+    .string "But she's not one to be taken\n"
+    .string "lightly!$"
+
+gUnknown_8196CA1:: @ 8196CA1
+    .string "They offer rare POKéMON that can\n"
+    .string "be exchanged for your COINS.\p"
+    .string "But, I just can't seem to win!$"
+
+gUnknown_8196CFE:: @ 8196CFE
+    .string "Games are scary!\n"
+    .string "It's so easy to get hooked!$"
+
+gUnknown_8196D2B:: @ 8196D2B
+    .string "What's up?\n"
+    .string "Want some COINS?$"
+
+gUnknown_8196D47:: @ 8196D47
+    .string "{PLAYER} received 20 COINS\n"
+    .string "from the nice guy.$"
+
+gUnknown_8196D6F:: @ 8196D6F
+    .string "You have lots of COINS!$"
+
+gUnknown_8196D87:: @ 8196D87
+    .string "Darn! I need more COINS for the\n"
+    .string "POKéMON I want!$"
+
+gUnknown_8196DB7:: @ 8196DB7
+    .string "Hey, what? You're throwing me off!\n"
+    .string "Here are some COINS, so shoo!$"
+
+gUnknown_8196DF8:: @ 8196DF8
+    .string "{PLAYER} received 20 COINS\n"
+    .string "from the man.$"
+
+gUnknown_8196E1B:: @ 8196E1B
+    .string "You've got plenty of your own\n"
+    .string "COINS!$"
+
+gUnknown_8196E40:: @ 8196E40
+    .string "The trick is to watch the reels\n"
+    .string "closely.$"
+
+Text_196E69:: @ 8196E69
+    .string "I'm guarding this poster!\n"
+    .string "Go away, or else!$"
+
+Text_196E95:: @ 8196E95
+    .string "Dang!$"
+
+gUnknown_8196E9B:: @ 8196E9B
+    .string "The TEAM ROCKET HIDEOUT might\n"
+    .string "be discovered!\p"
+    .string "I better tell BOSS!$"
+
+gUnknown_8196EDC:: @ 8196EDC
+    .string "Hey!\p"
+    .string "A switch behind the poster!?\n"
+    .string "Let's push it!$"
+
+gUnknown_8196F0D:: @ 8196F0D
+    .string "A COIN CASE is required…$"
+
+gUnknown_8196F26:: @ 8196F26
+    .string "Oops!\n"
+    .string "Don't have the COIN CASE!$"
+
+gUnknown_8196F46:: @ 8196F46
+    .string "A slot machine!\n"
+    .string "Want to play?$"
+
+gUnknown_8196F64:: @ 8196F64
+    .string "OUT OF ORDER\n"
+    .string "This is broken.$"
+
+gUnknown_8196F81:: @ 8196F81
+    .string "OUT TO LUNCH\n"
+    .string "This is reserved.$"
+
+gUnknown_8196FA0:: @ 8196FA0
+    .string "Someone's keys!\n"
+    .string "They'll be back.$"
+
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
new file mode 100644
index 000000000..3e37651f5
--- /dev/null
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
@@ -0,0 +1,107 @@
+{
+  "id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
+  "name": "CeladonCity_GameCorner_PrizeRoom",
+  "layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "33",
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
new file mode 100644
index 000000000..911847541
--- /dev/null
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
@@ -0,0 +1,344 @@
+CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75
+	.byte 0
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76
+	msgbox gUnknown_8196FC1, 2
+	end
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F
+	msgbox gUnknown_8196FFF, 2
+	end
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
+	lock
+	faceplayer
+	checkflag FLAG_0x243
+	goto_if 0, EventScript_16CD99
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	showcoinsbox 0, 0
+	msgbox gUnknown_8197057
+	goto EventScript_16CBB2
+	end
+
+EventScript_16CBB2:: @ 816CBB2
+	message Text_19707A
+	waitmessage
+	multichoice 11, 0, 14, 0
+	switch VAR_RESULT
+	case 0, EventScript_16CC15
+	case 1, EventScript_16CC25
+	case 2, EventScript_16CC35
+	case 3, EventScript_16CC45
+	case 4, EventScript_16CC55
+	case 5, EventScript_16CC10
+	case 127, EventScript_16CC10
+	end
+
+EventScript_16CC10:: @ 816CC10
+	hidecoinsbox 0, 0
+	release
+	end
+
+EventScript_16CC15:: @ 816CC15
+	setvar VAR_0x4001, SPECIES_ABRA
+	setvar VAR_0x4002, 180
+	goto EventScript_16CC65
+	end
+
+EventScript_16CC25:: @ 816CC25
+	setvar VAR_0x4001, SPECIES_CLEFAIRY
+	setvar VAR_0x4002, 500
+	goto EventScript_16CC65
+	end
+
+EventScript_16CC35:: @ 816CC35
+	setvar VAR_0x4001, SPECIES_DRATINI
+	setvar VAR_0x4002, 2800
+	goto EventScript_16CC65
+	end
+
+EventScript_16CC45:: @ 816CC45
+	setvar VAR_0x4001, SPECIES_SCYTHER
+	setvar VAR_0x4002, 5500
+	goto EventScript_16CC65
+	end
+
+EventScript_16CC55:: @ 816CC55
+	setvar VAR_0x4001, SPECIES_PORYGON
+	setvar VAR_0x4002, 9999
+	goto EventScript_16CC65
+	end
+
+EventScript_16CC65:: @ 816CC65
+	getspeciesname 0, VAR_0x4001
+	msgbox gUnknown_819709D, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16CC10
+	checkcoins VAR_RESULT
+	compare_var_to_var VAR_RESULT, VAR_0x4002
+	goto_if 0, EventScript_16CDA5
+	textcolor 3
+	switch VAR_0x4001
+	case SPECIES_ABRA, EventScript_16CCD4
+	case SPECIES_CLEFAIRY, EventScript_16CCE9
+	case SPECIES_DRATINI, EventScript_16CCFE
+	case SPECIES_SCYTHER, EventScript_16CD13
+	case SPECIES_PORYGON, EventScript_16CD28
+	case SPECIES_PINSIR, EventScript_16CD3D
+	end
+
+EventScript_16CCD4:: @ 816CCD4
+	givemon VAR_0x4001, 9, ITEM_NONE, 0, 0, 0
+	goto EventScript_16CD52
+	end
+
+EventScript_16CCE9:: @ 816CCE9
+	givemon VAR_0x4001, 8, ITEM_NONE, 0, 0, 0
+	goto EventScript_16CD52
+	end
+
+EventScript_16CCFE:: @ 816CCFE
+	givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0
+	goto EventScript_16CD52
+	end
+
+EventScript_16CD13:: @ 816CD13
+	givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0
+	goto EventScript_16CD52
+	end
+
+EventScript_16CD28:: @ 816CD28
+	givemon VAR_0x4001, 26, ITEM_NONE, 0, 0, 0
+	goto EventScript_16CD52
+	end
+
+EventScript_16CD3D:: @ 816CD3D
+	givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0
+	goto EventScript_16CD52
+	end
+
+EventScript_16CD52:: @ 816CD52
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16CDB3
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16CDE0
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_16CD74
+	end
+
+EventScript_16CD74:: @ 816CD74
+	textcolor 3
+	msgbox gUnknown_81A5E31
+	hidecoinsbox 0, 0
+	release
+	end
+
+EventScript_16CD83:: @ 816CD83
+	countpokemon
+	subvar VAR_RESULT, 1
+	copyvar VAR_0x8004, VAR_RESULT
+	call EventScript_1A74EB
+	goto EventScript_16CC10
+	end
+
+EventScript_16CD99:: @ 816CD99
+	textcolor 3
+	msgbox gUnknown_819703E
+	release
+	end
+
+EventScript_16CDA5:: @ 816CDA5
+	msgbox gUnknown_81970D5
+	goto EventScript_16CC10
+	end
+
+EventScript_16CDB3:: @ 816CDB3
+	takecoins VAR_0x4002
+	updatecoinsbox 0, 5
+	getspeciesname 0, VAR_0x4001
+	playfanfare MUS_FANFA1
+	message Text_1A5DF1
+	waitmessage
+	waitfanfare
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16CD83
+	goto EventScript_16CC10
+	end
+
+EventScript_16CDE0:: @ 816CDE0
+	takecoins VAR_0x4002
+	updatecoinsbox 0, 5
+	getspeciesname 0, VAR_0x4001
+	playfanfare MUS_FANFA1
+	message Text_1A5DF1
+	waitmessage
+	waitfanfare
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16CE12
+	call EventScript_1A8C33
+	goto EventScript_16CE12
+	end
+
+EventScript_16CE12:: @ 816CE12
+	call EventScript_1A8C3C
+	goto EventScript_16CC10
+	end
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
+	lock
+	faceplayer
+	checkflag FLAG_0x243
+	goto_if 0, EventScript_16CD99
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	showcoinsbox 0, 0
+	msgbox gUnknown_8197057
+	goto EventScript_16CE47
+	end
+
+EventScript_16CE47:: @ 816CE47
+	message Text_19707A
+	waitmessage
+	multichoice 11, 0, 30, 0
+	switch VAR_RESULT
+	case 0, EventScript_16CEA5
+	case 1, EventScript_16CEB9
+	case 2, EventScript_16CECD
+	case 3, EventScript_16CEE1
+	case 4, EventScript_16CEF5
+	case 5, EventScript_16CC10
+	case 127, EventScript_16CC10
+	end
+
+EventScript_16CEA5:: @ 816CEA5
+	setvar VAR_0x4001, ITEM_TM13
+	setvar VAR_0x4002, 4000
+	getmovename 1, MOVE_ICE_BEAM
+	goto EventScript_16CF09
+	end
+
+EventScript_16CEB9:: @ 816CEB9
+	setvar VAR_0x4001, ITEM_TM23
+	setvar VAR_0x4002, 3500
+	getmovename 1, MOVE_IRON_TAIL
+	goto EventScript_16CF09
+	end
+
+EventScript_16CECD:: @ 816CECD
+	setvar VAR_0x4001, ITEM_TM24
+	setvar VAR_0x4002, 4000
+	getmovename 1, MOVE_THUNDERBOLT
+	goto EventScript_16CF09
+	end
+
+EventScript_16CEE1:: @ 816CEE1
+	setvar VAR_0x4001, ITEM_TM30
+	setvar VAR_0x4002, 4500
+	getmovename 1, MOVE_SHADOW_BALL
+	goto EventScript_16CF09
+	end
+
+EventScript_16CEF5:: @ 816CEF5
+	setvar VAR_0x4001, ITEM_TM35
+	setvar VAR_0x4002, 4000
+	getmovename 1, MOVE_FLAMETHROWER
+	goto EventScript_16CF09
+	end
+
+EventScript_16CF09:: @ 816CF09
+	msgbox gUnknown_81970B2, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16CC10
+	goto EventScript_16CF3F
+	end
+
+EventScript_16CF22:: @ 816CF22
+	getitemname 0, VAR_0x4001
+	msgbox gUnknown_819709D, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16CC10
+	goto EventScript_16CF3F
+	end
+
+EventScript_16CF3F:: @ 816CF3F
+	getitemname 0, VAR_0x4001
+	checkcoins VAR_RESULT
+	compare_var_to_var VAR_RESULT, VAR_0x4002
+	goto_if 0, EventScript_16CDA5
+	checkitemspace VAR_0x4001, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16CF79
+	takecoins VAR_0x4002
+	updatecoinsbox 0, 5
+	giveitem VAR_0x4001
+	goto EventScript_16CC10
+	end
+
+EventScript_16CF79:: @ 816CF79
+	textcolor 3
+	msgbox gUnknown_81A5242
+	hidecoinsbox 0, 0
+	release
+	end
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
+	lock
+	faceplayer
+	checkflag FLAG_0x243
+	goto_if 0, EventScript_16CD99
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	showcoinsbox 0, 0
+	msgbox gUnknown_8197057
+	goto EventScript_16CFB2
+	end
+
+EventScript_16CFB2:: @ 816CFB2
+	message Text_19707A
+	waitmessage
+	multichoice 10, 0, 41, 0
+	switch VAR_RESULT
+	case 0, EventScript_16D010
+	case 1, EventScript_16D020
+	case 2, EventScript_16D030
+	case 3, EventScript_16D040
+	case 4, EventScript_16D050
+	case 5, EventScript_16CC10
+	case 127, EventScript_16CC10
+	end
+
+EventScript_16D010:: @ 816D010
+	setvar VAR_0x4001, ITEM_SMOKE_BALL
+	setvar VAR_0x4002, 800
+	goto EventScript_16CF22
+	end
+
+EventScript_16D020:: @ 816D020
+	setvar VAR_0x4001, ITEM_MIRACLE_SEED
+	setvar VAR_0x4002, 1000
+	goto EventScript_16CF22
+	end
+
+EventScript_16D030:: @ 816D030
+	setvar VAR_0x4001, ITEM_CHARCOAL
+	setvar VAR_0x4002, 1000
+	goto EventScript_16CF22
+	end
+
+EventScript_16D040:: @ 816D040
+	setvar VAR_0x4001, ITEM_MYSTIC_WATER
+	setvar VAR_0x4002, 1000
+	goto EventScript_16CF22
+	end
+
+EventScript_16D050:: @ 816D050
+	setvar VAR_0x4001, ITEM_YELLOW_FLUTE
+	setvar VAR_0x4002, 1600
+	goto EventScript_16CF22
+	end
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
new file mode 100644
index 000000000..a5a21b9bc
--- /dev/null
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
@@ -0,0 +1,31 @@
+gUnknown_8196FC1:: @ 8196FC1
+    .string "I sure do fancy that PORYGON!\n"
+    .string "But, it's hard to win at slots!$"
+
+gUnknown_8196FFF:: @ 8196FFF
+    .string "Gahaha! I raked it in today!\n"
+    .string "If only every day were like this…$"
+
+gUnknown_819703E:: @ 819703E
+    .string "A COIN CASE is required…$"
+
+gUnknown_8197057:: @ 8197057
+    .string "We exchange your COINS for prizes.$"
+
+Text_19707A:: @ 819707A
+    .string "Which prize would you like?$"
+
+gUnknown_8197096:: @ 8197096
+    .string "はい どうぞ$"
+
+gUnknown_819709D:: @ 819709D
+    .string "So, you want the {STR_VAR_1}?$"
+
+gUnknown_81970B2:: @ 81970B2
+    .string "Okay, a TM of {STR_VAR_2}\n"
+    .string "is what you want?$"
+
+gUnknown_81970D5:: @ 81970D5
+    .string "Sorry, you'll need more COINS\n"
+    .string "than that.$"
+
diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
new file mode 100644
index 000000000..d294cb8eb
--- /dev/null
+++ b/data/maps/CeladonCity_Gym/map.json
@@ -0,0 +1,200 @@
+{
+  "id": "MAP_CELADON_CITY_GYM",
+  "name": "CeladonCity_Gym",
+  "layout": "LAYOUT_CELADON_CITY_GYM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "CeladonCity_Gym_EventScript_16D111",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "CeladonCity_Gym_EventScript_16D163",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "CeladonCity_Gym_EventScript_16D14C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "CeladonCity_Gym_EventScript_16D17A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "CeladonCity_Gym_EventScript_16D19E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "CeladonCity_Gym_EventScript_16D128",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "83",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Gym_EventScript_16D061",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "CeladonCity_Gym_EventScript_16D1B5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Gym_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "95",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Gym_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "95",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Gym_EventScript_1BDF13",
+      "flag": "20"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 6,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 7,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 16,
+      "elevation": 0,
+      "script": "CeladonCity_Gym_EventScript_16D1CC"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 16,
+      "elevation": 0,
+      "script": "CeladonCity_Gym_EventScript_16D1CC"
+    }
+  ]
+}
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc
new file mode 100644
index 000000000..9131602c2
--- /dev/null
+++ b/data/maps/CeladonCity_Gym/scripts.inc
@@ -0,0 +1,103 @@
+CeladonCity_Gym_MapScripts:: @ 816D060
+	.byte 0
+
+CeladonCity_Gym_EventScript_16D061:: @ 816D061
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0
+	checkflag FLAG_0x293
+	goto_if 0, EventScript_16D0C6
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_81972B8
+	release
+	end
+
+EventScript_16D0A0:: @ 816D0A0
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	clearflag FLAG_0x09E
+	setflag FLAG_0x4B3
+	setflag FLAG_0x823
+	setvar VAR_0x8008, 4
+	call EventScript_1A6B18
+	goto EventScript_16D0C6
+	end
+
+EventScript_16D0C6:: @ 816D0C6
+	msgbox gUnknown_8197327
+	checkitemspace ITEM_TM19, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16D107
+	additem ITEM_TM19, 1
+	loadword 0, gUnknown_81973BA
+	setorcopyvar VAR_0x8000, ITEM_TM19
+	setorcopyvar VAR_0x8001, 1
+	setorcopyvar VAR_0x8002, MUS_FANFA1
+	callstd 9 @ gStdScript_ItemMessageAndFanfare
+	setflag FLAG_0x293
+	msgbox gUnknown_81973D7
+	release
+	end
+
+EventScript_16D107:: @ 816D107
+	msgbox gUnknown_819745D
+	release
+	end
+
+CeladonCity_Gym_EventScript_16D111:: @ 816D111
+	trainerbattle 0, 132, 0, Text_19747C, Text_1974C4
+	msgbox gUnknown_81974D6, 6
+	end
+
+CeladonCity_Gym_EventScript_16D128:: @ 816D128
+	trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8197708, 6
+	end
+
+CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
+	trainerbattle 0, 160, 0, Text_197595, Text_1975BB
+	msgbox gUnknown_81975D1, 6
+	end
+
+CeladonCity_Gym_EventScript_16D163:: @ 816D163
+	trainerbattle 0, 265, 0, Text_1974FA, Text_19751C
+	msgbox gUnknown_8197527, 6
+	end
+
+CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
+	trainerbattle 0, 266, 0, Text_19760B, Text_197660
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 3
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8197664, 6
+	end
+
+CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
+	trainerbattle 0, 267, 0, Text_197747, Text_19777A
+	msgbox gUnknown_8197788, 6
+	end
+
+CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
+	trainerbattle 0, 402, 0, Text_1977E5, Text_197832
+	msgbox gUnknown_819783E, 6
+	end
+
+CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC
+	lockall
+	checkflag FLAG_0x823
+	goto_if_eq EventScript_16D1E0
+	msgbox gUnknown_8197874
+	releaseall
+	end
+
+EventScript_16D1E0:: @ 816D1E0
+	msgbox gUnknown_81978AB
+	releaseall
+	end
diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc
new file mode 100644
index 000000000..27d1a6a21
--- /dev/null
+++ b/data/maps/CeladonCity_Gym/text.inc
@@ -0,0 +1,170 @@
+gUnknown_81970FE:: @ 81970FE
+    .string "おきゃくさん もう もてないよ$" @ I'm sorry I don't have any more
+
+gUnknown_819710E:: @ 819710E
+    .string "あっ そう$" @ I see
+
+Text_197114:: @ 8197114
+    .string "Hello…\n"
+    .string "Lovely weather, isn't it?\l"
+    .string "It's so pleasant…\p"
+
+    .string "…Oh, dear…\n"
+    .string "I must have dozed off. Welcome.\p"
+
+    .string "My name is ERIKA.\n"
+    .string "I am the LEADER of CELADON GYM.\p"
+
+    .string "I am a student of the art of\n"
+    .string "flower arranging.\p"
+
+    .string "My POKéMON are solely of the\n"
+    .string "GRASS type.\p"
+
+    .string "…Oh, I'm sorry, I had no idea that\n"
+    .string "you wished to challenge me.\p"
+
+    .string "Very well, but I shall not lose.{PLAY_BGM BGM_FRLG_LEADER_EYE}$"
+
+Text_197260:: @ 8197260
+    .string "Oh!\n"
+    .string "I concede defeat.\l"
+    .string "You are remarkably strong.\p"
+
+    .string "I must confer on you the\n"
+    .string "RAINBOWBADGE.$"
+
+gUnknown_81972B8:: @ 81972B8
+    .string "You are cataloging POKéMON?\n"
+    .string "I must say I'm impressed.\p"
+
+    .string "I would never collect POKéMON if\n"
+    .string "they were unattractive.$"
+
+gUnknown_8197327:: @ 8197327
+    .string "The RAINBOWBADGE will make\n"
+    .string "POKéMON up to Lv. 50 obey.\p"
+
+    .string "It also allows POKéMON to use\n"
+    .string "STRENGTH in and out of battle.\p"
+
+    .string "Please also take this with you.$"
+
+gUnknown_81973BA:: @ 81973BA
+    .string "{PLAYER} received TM19\n"
+    .string "from ERIKA.$"
+
+gUnknown_81973D7:: @ 81973D7
+    .string "TM19 contains GIGA DRAIN.\p"
+
+    .string "Half the damage it inflicts is\n"
+    .string "drained to heal your POKéMON.\p"
+
+    .string "Wouldn't you agree that it's a\n"
+    .string "wonderful move?$"
+
+gUnknown_819745D:: @ 819745D
+    .string "You should make room for this.$"
+
+Text_19747C:: @ 819747C
+    .string "I should tell you about this GYM.\p"
+    .string "Only real ladies are allowed in\n"
+    .string "here!$"
+
+Text_1974C4:: @ 81974C4
+    .string "You're too rough!$"
+
+gUnknown_81974D6:: @ 81974D6
+    .string "Bleaah!\n"
+    .string "I hope ERIKA wipes you out!$"
+
+Text_1974FA:: @ 81974FA
+    .string "Oh, welcome.\n"
+    .string "I was getting bored.$"
+
+Text_19751C:: @ 819751C
+    .string "My makeup!$"
+
+gUnknown_8197527:: @ 8197527
+    .string "GRASS-type POKéMON are tough\n"
+    .string "against the WATER type.\p"
+    .string "They also have an edge on ROCK-\n"
+    .string "and GROUND-type POKéMON.$"
+
+Text_197595:: @ 8197595
+    .string "…Weren't you peeking in here\n"
+    .string "earlier?$"
+
+Text_1975BB:: @ 81975BB
+    .string "You're an eye-opener!$"
+
+gUnknown_81975D1:: @ 81975D1
+    .string "Oh, you were looking at ERIKA…\n"
+    .string "You weren't looking at me…$"
+
+Text_19760B:: @ 819760B
+    .string "Look, look!\n"
+    .string "See my POKéMON!\p"
+    .string "I like the GRASS type.\n"
+    .string "I like how they're easy to raise.$"
+
+Text_197660:: @ 8197660
+    .string "No!$"
+
+gUnknown_8197664:: @ 8197664
+    .string "We only use GRASS-type POKéMON at\n"
+    .string "our GYM.\p"
+    .string "Why? We also use them for making\n"
+    .string "flower arrangements!$"
+
+Text_1976C5:: @ 81976C5
+    .string "Oh, hey!\p"
+    .string "We don't like BUG- or FIRE-type\n"
+    .string "POKéMON in here!$"
+
+Text_1976FF:: @ 81976FF
+    .string "Oh!\n"
+    .string "You!$"
+
+gUnknown_8197708:: @ 8197708
+    .string "Our LEADER ERIKA might be quiet,\n"
+    .string "but she's famous around here.$"
+
+Text_197747:: @ 8197747
+    .string "Pleased to meet you.\n"
+    .string "My hobby is POKéMON training.$"
+
+Text_19777A:: @ 819777A
+    .string "Oh!\n"
+    .string "Splendid!$"
+
+gUnknown_8197788:: @ 8197788
+    .string "I have a blind date coming up.\n"
+    .string "I have to learn to be polite,\l"
+    .string "especially if I have to battle.$"
+
+Text_1977E5:: @ 81977E5
+    .string "Welcome to CELADON GYM!\p"
+    .string "You'd better not underestimate\n"
+    .string "the nice ladies here.$"
+
+Text_197832:: @ 8197832
+    .string "Oh!\n"
+    .string "Beaten!$"
+
+gUnknown_819783E:: @ 819783E
+    .string "I didn't bring my best POKéMON.\n"
+    .string "Wait until next time!$"
+
+gUnknown_8197874:: @ 8197874
+    .string "CELADON POKéMON GYM\n"
+    .string "LEADER: ERIKA\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}$"
+
+gUnknown_81978AB:: @ 81978AB
+    .string "CELADON POKéMON GYM\n"
+    .string "LEADER: ERIKA\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}, {PLAYER}$"
+
diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json
new file mode 100644
index 000000000..5959cc9aa
--- /dev/null
+++ b/data/maps/CeladonCity_Hotel/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_CELADON_CITY_HOTEL",
+  "name": "CeladonCity_Hotel",
+  "layout": "LAYOUT_CELADON_CITY_HOTEL",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "35",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Hotel_EventScript_16D284",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Hotel_EventScript_16D28D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Hotel_EventScript_16D296",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Hotel_EventScript_16D29F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc
new file mode 100644
index 000000000..39326647a
--- /dev/null
+++ b/data/maps/CeladonCity_Hotel/scripts.inc
@@ -0,0 +1,18 @@
+CeladonCity_Hotel_MapScripts:: @ 816D283
+	.byte 0
+
+CeladonCity_Hotel_EventScript_16D284:: @ 816D284
+	msgbox gUnknown_8197B77, 2
+	end
+
+CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D
+	msgbox gUnknown_8197BBE, 2
+	end
+
+CeladonCity_Hotel_EventScript_16D296:: @ 816D296
+	msgbox gUnknown_8197C0C, 2
+	end
+
+CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F
+	msgbox gUnknown_8197C30, 2
+	end
diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc
new file mode 100644
index 000000000..b1c989120
--- /dev/null
+++ b/data/maps/CeladonCity_Hotel/text.inc
@@ -0,0 +1,21 @@
+Text_197B6F:: @ 8197B6F
+    .string "ぶつだん　だ‥$"
+
+gUnknown_8197B77:: @ 8197B77
+    .string "POKéMON?\n"
+    .string "No, this is a hotel for people.\p"
+    .string "We're full up, unfortunately.$"
+
+gUnknown_8197BBE:: @ 8197BBE
+    .string "I'm on vacation with my brother and\n"
+    .string "boyfriend.\p"
+    .string "CELADON is such a pretty city!$"
+
+gUnknown_8197C0C:: @ 8197C0C
+    .string "Why?\n"
+    .string "Why did she bring her brother?$"
+
+gUnknown_8197C30:: @ 8197C30
+    .string "Yippee! I'm on vacation!\n"
+    .string "My sis brought me along! Awesome!$"
+
diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json
new file mode 100644
index 000000000..900c123a0
--- /dev/null
+++ b/data/maps/CeladonCity_House1/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_CELADON_CITY_HOUSE1",
+  "name": "CeladonCity_House1",
+  "layout": "LAYOUT_HOUSE5",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "33",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_House1_EventScript_16D268",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 5,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_House1_EventScript_16D271",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 5,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_House1_EventScript_16D27A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc
new file mode 100644
index 000000000..be1415217
--- /dev/null
+++ b/data/maps/CeladonCity_House1/scripts.inc
@@ -0,0 +1,14 @@
+CeladonCity_House1_MapScripts:: @ 816D267
+	.byte 0
+
+CeladonCity_House1_EventScript_16D268:: @ 816D268
+	msgbox gUnknown_8197A9F, 2
+	end
+
+CeladonCity_House1_EventScript_16D271:: @ 816D271
+	msgbox gUnknown_8197AD3, 2
+	end
+
+CeladonCity_House1_EventScript_16D27A:: @ 816D27A
+	msgbox gUnknown_8197B20, 2
+	end
diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc
new file mode 100644
index 000000000..df6acb986
--- /dev/null
+++ b/data/maps/CeladonCity_House1/text.inc
@@ -0,0 +1,16 @@
+gUnknown_8197A9F:: @ 8197A9F
+    .string "Hehehe!\p"
+    .string "The slots just reel in the dough,\n"
+    .string "big-time!$"
+
+gUnknown_8197AD3:: @ 8197AD3
+    .string "CHIEF!\p"
+    .string "We just shipped two thousand\n"
+    .string "more POKéMON as slot prizes\l"
+    .string "again today!$"
+
+gUnknown_8197B20:: @ 8197B20
+    .string "Don't touch the poster at the GAME\n"
+    .string "CORNER!\p"
+    .string "There's no secret switch behind it!$"
+
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..800dfbecf
--- /dev/null
+++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
+  "name": "CeladonCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C5FB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C604",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C60D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C616",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..92bde48ad
--- /dev/null
+++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,27 @@
+CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC
+	map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7
+	map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7
+	setrespawn SPAWN_CELADON_CITY
+	end
+
+CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604
+	msgbox gUnknown_819685B, 2
+	end
+
+CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D
+	msgbox gUnknown_81968C2, 2
+	end
+
+CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616
+	msgbox gUnknown_8196913, 2
+	end
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/text.inc b/data/maps/CeladonCity_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..098582351
--- /dev/null
+++ b/data/maps/CeladonCity_PokemonCenter_1F/text.inc
@@ -0,0 +1,15 @@
+gUnknown_819685B:: @ 819685B
+    .string "A POKé FLUTE awakens sleeping\n"
+    .string "POKéMON. You know that.\p"
+    .string "It does so with a sound that only\n"
+    .string "they can hear.$"
+
+gUnknown_81968C2:: @ 81968C2
+    .string "I rode here from FUCHSIA.\p"
+    .string "It's an uphill ride on CYCLING\n"
+    .string "ROAD, so I'm exhausted.$"
+
+gUnknown_8196913:: @ 8196913
+    .string "If I had a BIKE, I would go to\n"
+    .string "CYCLING ROAD!$"
+
diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..622a168d4
--- /dev/null
+++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_CELADON_CITY_POKEMON_CENTER_2F",
+  "name": "CeladonCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..1b07679eb
--- /dev/null
+++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F
+	map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634
+	call EventScript_1BB4A3
+	end
+
+EventScript_16C63A:: @ 816C63A
+	call EventScript_1BB6AB
+	end
+
+EventScript_16C640:: @ 816C640
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json
new file mode 100644
index 000000000..eb7afdbe2
--- /dev/null
+++ b/data/maps/CeladonCity_Restaurant/map.json
@@ -0,0 +1,107 @@
+{
+  "id": "MAP_CELADON_CITY_RESTAURANT",
+  "name": "CeladonCity_Restaurant",
+  "layout": "LAYOUT_CELADON_CITY_RESTAURANT",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_CELADON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "59",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Restaurant_EventScript_16D1EB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Restaurant_EventScript_16D1F4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "27",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Restaurant_EventScript_16D25E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Restaurant_EventScript_16D1FD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeladonCity_Restaurant_EventScript_16D255",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CELADON_CITY",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc
new file mode 100644
index 000000000..e52d88636
--- /dev/null
+++ b/data/maps/CeladonCity_Restaurant/scripts.inc
@@ -0,0 +1,43 @@
+CeladonCity_Restaurant_MapScripts:: @ 816D1EA
+	.byte 0
+
+CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB
+	msgbox gUnknown_81978E6, 2
+	end
+
+CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4
+	msgbox gUnknown_8197915, 2
+	end
+
+CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
+	lock
+	faceplayer
+	checkflag FLAG_0x243
+	goto_if_eq EventScript_16D24B
+	msgbox gUnknown_81979C1
+	checkitemspace ITEM_COIN_CASE, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16D241
+	additem ITEM_COIN_CASE, 1
+	giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE
+	setflag FLAG_0x243
+	release
+	end
+
+EventScript_16D241:: @ 816D241
+	msgbox gUnknown_8197A5E
+	release
+	end
+
+EventScript_16D24B:: @ 816D24B
+	msgbox gUnknown_8197A72
+	release
+	end
+
+CeladonCity_Restaurant_EventScript_16D255:: @ 816D255
+	msgbox gUnknown_8197952, 2
+	end
+
+CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E
+	msgbox gUnknown_819798A, 2
+	end
diff --git a/data/maps/CeladonCity_Restaurant/text.inc b/data/maps/CeladonCity_Restaurant/text.inc
new file mode 100644
index 000000000..87edeb186
--- /dev/null
+++ b/data/maps/CeladonCity_Restaurant/text.inc
@@ -0,0 +1,37 @@
+gUnknown_81978E6:: @ 81978E6
+    .string "Hi!\p"
+    .string "Sorry, but we're taking a break\n"
+    .string "right now.$"
+
+gUnknown_8197915:: @ 8197915
+    .string "My POKéMON are weak, so I often\n"
+    .string "have to go to the DRUGSTORE.$"
+
+gUnknown_8197952:: @ 8197952
+    .string "Psst! There's a basement under the\n"
+    .string "GAME CORNER, I hear.$"
+
+gUnknown_819798A:: @ 819798A
+    .string "Munch…\p"
+    .string "The man at that table lost it all\n"
+    .string "at the slots.$"
+
+gUnknown_81979C1:: @ 81979C1
+    .string "Go ahead! Laugh!\n"
+    .string "I'm flat-out busted!\p"
+    .string "No more slots for me!\n"
+    .string "I'm going straight!\p"
+    .string "Here!\n"
+    .string "I won't be needing this anymore!$"
+
+gUnknown_8197A38:: @ 8197A38
+    .string "{PLAYER} received a COIN CASE\n"
+    .string "from the man.$"
+
+gUnknown_8197A5E:: @ 8197A5E
+    .string "Make room for this!$"
+
+gUnknown_8197A72:: @ 8197A72
+    .string "I always thought I was going to\n"
+    .string "win it back…$"
+
diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json
new file mode 100644
index 000000000..64bf8c583
--- /dev/null
+++ b/data/maps/CeruleanCave_1F/map.json
@@ -0,0 +1,204 @@
+{
+  "id": "MAP_CERULEAN_CAVE_1F",
+  "name": "CeruleanCave_1F",
+  "layout": "LAYOUT_CERULEAN_CAVE_1F",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_CERULEAN_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BEA47",
+      "flag": "434"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BEA54",
+      "flag": "435"
+    },
+    {
+      "graphics_id": "92",
+      "x": 25,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BEA3A",
+      "flag": "433"
+    },
+    {
+      "graphics_id": "96",
+      "x": 7,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 13,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 5,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 14,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 11,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 9,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_1F_EventScript_1BE00C",
+      "flag": "23"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 33,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 34,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 30,
+      "y": 10,
+      "elevation": 4,
+      "dest_map": "MAP_CERULEAN_CAVE_2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 24,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_2F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_2F",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "39",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc
new file mode 100644
index 000000000..db76ddfd7
--- /dev/null
+++ b/data/maps/CeruleanCave_1F/scripts.inc
@@ -0,0 +1,7 @@
+CeruleanCave_1F_MapScripts:: @ 81624B3
+	map_script 3, CeruleanCave_1F_MapScript1_1624B9
+	.byte 0
+
+CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9
+	setworldmapflag FLAG_WORLD_MAP_CERULEAN_CAVE_1F
+	end
diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json
new file mode 100644
index 000000000..4b747735b
--- /dev/null
+++ b/data/maps/CeruleanCave_2F/map.json
@@ -0,0 +1,232 @@
+{
+  "id": "MAP_CERULEAN_CAVE_2F",
+  "name": "CeruleanCave_2F",
+  "layout": "LAYOUT_CERULEAN_CAVE_2F",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_CERULEAN_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 9,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BEA6E",
+      "flag": "437"
+    },
+    {
+      "graphics_id": "92",
+      "x": 29,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BEA7B",
+      "flag": "438"
+    },
+    {
+      "graphics_id": "92",
+      "x": 33,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BEA61",
+      "flag": "436"
+    },
+    {
+      "graphics_id": "96",
+      "x": 33,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 33,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 25,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 28,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 30,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "96",
+      "x": 23,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "24"
+    },
+    {
+      "graphics_id": "96",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "25"
+    },
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "26"
+    },
+    {
+      "graphics_id": "96",
+      "x": 10,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_2F_EventScript_1BE00C",
+      "flag": "27"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 33,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 26,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 23,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_1F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_1F",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeruleanCave_2F/scripts.inc b/data/maps/CeruleanCave_2F/scripts.inc
new file mode 100644
index 000000000..d80aaeca5
--- /dev/null
+++ b/data/maps/CeruleanCave_2F/scripts.inc
@@ -0,0 +1,2 @@
+CeruleanCave_2F_MapScripts:: @ 81624BD
+	.byte 0
diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json
new file mode 100644
index 000000000..0dd6edb8c
--- /dev/null
+++ b/data/maps/CeruleanCave_B1F/map.json
@@ -0,0 +1,184 @@
+{
+  "id": "MAP_CERULEAN_CAVE_B1F",
+  "name": "CeruleanCave_B1F",
+  "layout": "LAYOUT_CERULEAN_CAVE_B1F",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_CERULEAN_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 31,
+      "y": 9,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BEA95",
+      "flag": "440"
+    },
+    {
+      "graphics_id": "92",
+      "x": 32,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BEA88",
+      "flag": "439"
+    },
+    {
+      "graphics_id": "139",
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1624F5",
+      "flag": "129"
+    },
+    {
+      "graphics_id": "96",
+      "x": 37,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 38,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 35,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 37,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 35,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "24"
+    },
+    {
+      "graphics_id": "96",
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "25"
+    },
+    {
+      "graphics_id": "96",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCave_B1F_EventScript_1BE00C",
+      "flag": "26"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CAVE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc
new file mode 100644
index 000000000..f2ac16317
--- /dev/null
+++ b/data/maps/CeruleanCave_B1F/scripts.inc
@@ -0,0 +1,70 @@
+CeruleanCave_B1F_MapScripts:: @ 81624BE
+	map_script 5, CeruleanCave_B1F_MapScript1_1624C9
+	map_script 3, CeruleanCave_B1F_MapScript2_1624E7
+	.byte 0
+
+CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9
+	checkflag FLAG_0x807
+	call_if 1, EventScript_1624D3
+	end
+
+EventScript_1624D3:: @ 81624D3
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 7
+	goto_if 5, EventScript_1A77A9
+	removeobject VAR_LAST_TALKED
+	return
+
+CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7
+	checkflag FLAG_0x2BC
+	call_if 0, EventScript_1624F1
+	end
+
+EventScript_1624F1:: @ 81624F1
+	clearflag FLAG_0x081
+	return
+
+CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_MEWTWO, 2
+	message Text_177F9F
+	waitmessage
+	waitmoncry
+	delay 20
+	playbgm BGM_FRLG_LEADER_EYE, 0
+	waitbuttonpress
+	setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
+	setflag FLAG_0x807
+	special sub_807F9D8
+	waitstate
+	clearflag FLAG_0x807
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_162558
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_162561
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_162561
+	setflag FLAG_0x2BC
+	release
+	end
+
+EventScript_162558:: @ 8162558
+	setflag FLAG_0x2BC
+	goto EventScript_1A922D
+
+EventScript_162560:: @ 8162560
+	end
+
+EventScript_162561:: @ 8162561
+	setvar VAR_0x8004, SPECIES_MEWTWO
+	goto EventScript_1A9236
+
+EventScript_16256B:: @ 816256B
+	end
diff --git a/data/maps/CeruleanCave_B1F/text.inc b/data/maps/CeruleanCave_B1F/text.inc
new file mode 100644
index 000000000..2358efe24
--- /dev/null
+++ b/data/maps/CeruleanCave_B1F/text.inc
@@ -0,0 +1,3 @@
+Text_177F9F:: @ 8177F9F
+    .string "Mew!$"
+
diff --git a/data/maps/CeruleanCity/events_bad.inc b/data/maps/CeruleanCity/events_bad.inc
new file mode 100644
index 000000000..f523a18d5
--- /dev/null
+++ b/data/maps/CeruleanCity/events_bad.inc
@@ -0,0 +1,43 @@
+CeruleanCity_EventObjects:
+	object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0
+	object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0
+	object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0
+	object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0
+	object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0
+	object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0
+	object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0
+	object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0
+	object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0
+	object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0
+	object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0
+	object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0
+
+CeruleanCity_MapWarps:
+	warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1
+	warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2
+	warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3
+	warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F
+	warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM
+	warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP
+	warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART
+	warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F
+	warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1
+	warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2
+	warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2
+	warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP
+	warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4
+	warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5
+
+CeruleanCity_MapCoordEvents:
+	coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A
+	coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6
+	coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9
+	coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683
+	coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3
+
+CeruleanCity_MapBGEvents:
+	bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY, 
+
+CeruleanCity_MapEvents::
+	map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents
+
diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json
new file mode 100644
index 000000000..df48d28c0
--- /dev/null
+++ b/data/maps/CeruleanCity/map.json
@@ -0,0 +1,401 @@
+{
+  "id": "MAP_CERULEAN_CITY",
+  "name": "CeruleanCity",
+  "layout": "LAYOUT_CERULEAN_CITY",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE24",
+      "offset": 12,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE5",
+      "offset": 0,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE4",
+      "offset": 10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE9",
+      "offset": 10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 31,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_1666E7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 33,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_166603",
+      "flag": "59"
+    },
+    {
+      "graphics_id": "16",
+      "x": 16,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_1666FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 9,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_16671D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "129",
+      "x": 32,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_1667DD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 33,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_16674F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 34,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_166726",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "72",
+      "x": 22,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "60"
+    },
+    {
+      "graphics_id": "95",
+      "x": 26,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "65375",
+      "x": 50,
+      "y": 18,
+      "elevation": 10,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 27,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 12,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_166738",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 1,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_EventScript_16672F",
+      "flag": "92"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY_HOUSE1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 30,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY_HOUSE2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY_HOUSE3",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 22,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 31,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY_GYM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 13,
+      "y": 28,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 29,
+      "y": 28,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY_MART",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CAVE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY_HOUSE1",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 31,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY_HOUSE2",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 31,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY_HOUSE2",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 14,
+      "y": 28,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 23,
+      "y": 28,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY_HOUSE4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY_HOUSE5",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4052",
+      "var_value": 0,
+      "script": "CeruleanCity_EventScript_16649A"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4052",
+      "var_value": 0,
+      "script": "CeruleanCity_EventScript_1664A6"
+    },
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4052",
+      "var_value": 0,
+      "script": "CeruleanCity_EventScript_1664B9"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x407D",
+      "var_value": 0,
+      "script": "CeruleanCity_EventScript_166683"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x407D",
+      "var_value": 0,
+      "script": "CeruleanCity_EventScript_1666A3"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 20,
+      "y": 25,
+      "elevation": 0,
+      "script": "CeruleanCity_EventScript_166838"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 27,
+      "y": 21,
+      "elevation": 0,
+      "script": "CeruleanCity_EventScript_166853"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 28,
+      "elevation": 0,
+      "script": "CeruleanCity_EventScript_16684A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 19,
+      "y": 32,
+      "elevation": 0,
+      "script": "CeruleanCity_EventScript_166841"
+    },
+    {
+      "type": "hidden_item",
+      "x": 18,
+      "y": 7,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "49",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 25,
+      "elevation": 0,
+      "script": "CeruleanCity_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 27,
+      "elevation": 0,
+      "script": "CeruleanCity_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 26,
+      "elevation": 0,
+      "script": "CeruleanCity_EventScript_16AC94"
+    }
+  ]
+}
diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc
new file mode 100644
index 000000000..480a40ad0
--- /dev/null
+++ b/data/maps/CeruleanCity/scripts.inc
@@ -0,0 +1,383 @@
+CeruleanCity_MapScripts:: @ 8166471
+	map_script 3, CeruleanCity_MapScript1_166477
+	.byte 0
+
+CeruleanCity_MapScript1_166477:: @ 8166477
+	setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY
+	checkflag FLAG_0x234
+	call_if 0, EventScript_166484
+	end
+
+EventScript_166484:: @ 8166484
+	setobjectxyperm 1, 30, 12
+	setobjectxyperm 5, 26, 31
+	setobjectxyperm 6, 27, 31
+	return
+
+CeruleanCity_EventScript_16649A:: @ 816649A
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_1664CC
+	end
+
+CeruleanCity_EventScript_1664A6:: @ 81664A6
+	lockall
+	setvar VAR_0x4001, 1
+	setobjectxyperm 8, 23, 0
+	goto EventScript_1664CC
+	end
+
+CeruleanCity_EventScript_1664B9:: @ 81664B9
+	lockall
+	setvar VAR_0x4001, 2
+	setobjectxyperm 8, 24, 0
+	goto EventScript_1664CC
+	end
+
+EventScript_1664CC:: @ 81664CC
+	textcolor 0
+	setvar VAR_0x4054, 2
+	playbgm BGM_FRLG_RIVAL, 0
+	addobject 8
+	applymovement 8, Movement_1665D3
+	waitmovement 0
+	msgbox gUnknown_817EAD7
+	setvar VAR_LAST_TALKED, 8
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_166582
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_16658D
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_166598
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817EB95
+	closemessage
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_1665A3
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_1665A3
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1665B5
+	msgbox gUnknown_817ECD4
+	setvar VAR_0x4052, 1
+	setflag FLAG_0x29B
+	giveitem ITEM_FAME_CHECKER
+	msgbox gUnknown_817ED5D
+	closemessage
+	applymovement 8, Movement_1665FB
+	waitmovement 0
+	fadedefaultbgm
+	removeobject 8
+	releaseall
+	end
+
+EventScript_166582:: @ 8166582
+	trainerbattle 3, 332, 0, Text_17EB71
+	return
+
+EventScript_16658D:: @ 816658D
+	trainerbattle 3, 333, 0, Text_17EB71
+	return
+
+EventScript_166598:: @ 8166598
+	trainerbattle 3, 334, 0, Text_17EB71
+	return
+
+EventScript_1665A3:: @ 81665A3
+	applymovement 255, Movement_1665C7
+	applymovement 8, Movement_1665D9
+	waitmovement 0
+	return
+
+EventScript_1665B5:: @ 81665B5
+	applymovement 255, Movement_1665CD
+	applymovement 8, Movement_1665EA
+	waitmovement 0
+	return
+
+Movement_1665C7:: @ 81665C7
+	step_1c
+	step_1b
+	step_30
+	step_1c
+	step_2d
+	step_end
+
+Movement_1665CD:: @ 81665CD
+	step_1c
+	step_1b
+	step_2f
+	step_1c
+	step_2d
+	step_end
+
+Movement_1665D3:: @ 81665D3
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_1665D9:: @ 81665D9
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_1c
+	step_1c
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_1665EA:: @ 81665EA
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_1c
+	step_1c
+	step_13
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_1665FB:: @ 81665FB
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+CeruleanCity_EventScript_166603:: @ 8166603
+	lock
+	faceplayer
+	checktrainerflag FLAG_0x163
+	goto_if_eq EventScript_16662E
+	message Text_17EE0E
+	waitmessage
+	playbgm BGM_FRLG_SUSPICIOUS_EYE, 0
+	waitbuttonpress
+	trainerbattle 3, 355, 0, Text_17EE70
+	setvar VAR_0x407D, 1
+	goto EventScript_16662E
+	end
+
+EventScript_16662E:: @ 816662E
+	msgbox gUnknown_817EE9C
+	checkitemspace ITEM_TM28, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_166677
+	additem ITEM_TM28, 1
+	giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28
+	msgbox gUnknown_817EEED
+	closemessage
+	fadescreen 1
+	removeobject 2
+	fadescreen 0
+	setflag FLAG_0x23F
+	release
+	end
+
+EventScript_166677:: @ 8166677
+	textcolor 0
+	msgbox gUnknown_817EF07
+	release
+	end
+
+CeruleanCity_EventScript_166683:: @ 8166683
+	lockall
+	setvar VAR_0x4001, 0
+	applymovement 2, Movement_1A75E9
+	waitmovement 0
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	goto EventScript_1666C3
+	end
+
+CeruleanCity_EventScript_1666A3:: @ 81666A3
+	lockall
+	setvar VAR_0x4001, 1
+	applymovement 2, Movement_1A75ED
+	waitmovement 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	goto EventScript_1666C3
+	end
+
+EventScript_1666C3:: @ 81666C3
+	textcolor 0
+	msgbox Text_17EE0E
+	setvar VAR_LAST_TALKED, 2
+	trainerbattle 3, 355, 0, Text_17EE70
+	setvar VAR_0x407D, 1
+	goto EventScript_16662E
+	end
+
+CeruleanCity_EventScript_1666E7:: @ 81666E7
+	lock
+	faceplayer
+	msgbox gUnknown_817F0F1
+	closemessage
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+CeruleanCity_EventScript_1666FE:: @ 81666FE
+	lock
+	faceplayer
+	checkflag FLAG_0x234
+	goto_if_eq EventScript_166713
+	msgbox gUnknown_817F01D
+	release
+	end
+
+EventScript_166713:: @ 8166713
+	msgbox gUnknown_817EF89
+	release
+	end
+
+CeruleanCity_EventScript_16671D:: @ 816671D
+	msgbox gUnknown_817F0B2, 2
+	end
+
+CeruleanCity_EventScript_166726:: @ 8166726
+	msgbox gUnknown_817EF3F, 2
+	end
+
+CeruleanCity_EventScript_16672F:: @ 816672F
+	msgbox gUnknown_817F319, 2
+	end
+
+CeruleanCity_EventScript_166738:: @ 8166738
+	lock
+	faceplayer
+	msgbox gUnknown_817F2CF
+	closemessage
+	applymovement 11, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+CeruleanCity_EventScript_16674F:: @ 816674F
+	lock
+	random 3
+	copyvar VAR_0x8008, VAR_RESULT
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, EventScript_1667B0
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_1667B6
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, EventScript_1667BC
+	waitmessage
+	delay 40
+	playse SE_PIN
+	applymovement 5, Movement_1A75D9
+	waitmovement 0
+	delay 30
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, EventScript_1667C2
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_1667CB
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, EventScript_1667D4
+	release
+	end
+
+EventScript_1667B0:: @ 81667B0
+	message Text_17F183
+	return
+
+EventScript_1667B6:: @ 81667B6
+	message Text_17F1C2
+	return
+
+EventScript_1667BC:: @ 81667BC
+	message Text_17F1E9
+	return
+
+EventScript_1667C2:: @ 81667C2
+	msgbox gUnknown_817F1A1
+	return
+
+EventScript_1667CB:: @ 81667CB
+	msgbox gUnknown_817F1D2
+	return
+
+EventScript_1667D4:: @ 81667D4
+	msgbox gUnknown_817F1FC
+	return
+
+CeruleanCity_EventScript_1667DD:: @ 81667DD
+	lock
+	random 4
+	copyvar VAR_0x8008, VAR_RESULT
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, EventScript_166814
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_16681D
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, EventScript_166826
+	compare_var_to_value VAR_0x8008, 3
+	call_if 1, EventScript_16682F
+	release
+	end
+
+EventScript_166814:: @ 8166814
+	msgbox gUnknown_817F270
+	return
+
+EventScript_16681D:: @ 816681D
+	msgbox gUnknown_817F287
+	return
+
+EventScript_166826:: @ 8166826
+	msgbox gUnknown_817F2A2
+	return
+
+EventScript_16682F:: @ 816682F
+	msgbox gUnknown_817F2B7
+	return
+
+CeruleanCity_EventScript_166838:: @ 8166838
+	msgbox gUnknown_817F420, 3
+	end
+
+CeruleanCity_EventScript_166841:: @ 8166841
+	msgbox gUnknown_817F453, 3
+	end
+
+CeruleanCity_EventScript_16684A:: @ 816684A
+	msgbox gUnknown_817F4C5, 3
+	end
+
+CeruleanCity_EventScript_166853:: @ 8166853
+	lockall
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817F4EF
+	releaseall
+	end
diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc
new file mode 100644
index 000000000..9a6c42035
--- /dev/null
+++ b/data/maps/CeruleanCity/text.inc
@@ -0,0 +1,181 @@
+gUnknown_817EAD7:: @ 817EAD7
+    .string "{RIVAL}: Yo! {PLAYER}!\p"
+    .string "You're still struggling along back\n"
+    .string "here?\p"
+    .string "I'm doing great! I caught a bunch\n"
+    .string "of strong and smart POKéMON!\p"
+    .string "Here, let me see what you caught,\n"
+    .string "{PLAYER}!$"
+
+Text_17EB71:: @ 817EB71
+    .string "Hey!\n"
+    .string "Take it easy!\l"
+    .string "You won already!$"
+
+gUnknown_817EB95:: @ 817EB95
+    .string "{RIVAL}: Hey, guess what?\p"
+    .string "I went to BILL's and got him to\n"
+    .string "show me his rare POKéMON.\p"
+    .string "That added a lot of pages to my\n"
+    .string "POKéDEX!\p"
+    .string "After all, BILL's world famous as a\n"
+    .string "POKéMANIAC.\p"
+    .string "He invented the POKéMON Storage\n"
+    .string "System on PC, too.\p"
+    .string "Since you're using his system,\n"
+    .string "you should go thank him.\p"
+    .string "Well, I better get rolling!\n"
+    .string "Smell ya later!$"
+
+gUnknown_817ECD4:: @ 817ECD4
+    .string "Oh, yeah, right.\p"
+    .string "I feel sorry for you. No, really.\n"
+    .string "You're always plodding behind me.\p"
+    .string "So here, I'll give you a little\n"
+    .string "present as a favor.$"
+
+gUnknown_817ED5D:: @ 817ED5D
+    .string "A chatty gossip like you…\n"
+    .string "That thing's perfect.\p"
+    .string "I don't need it because I don't\n"
+    .string "give a hoot about others.\p"
+    .string "All right, this time I really am\n"
+    .string "gone. Smell ya!$"
+
+Text_17EDF8:: @ 817EDF8
+    .string "なんたって！\n"
+    .string "おれは　てんさい　だからよ！$"
+
+Text_17EE0E:: @ 817EE0E
+    .string "Hey! Stay out!\n"
+    .string "It's not your yard!\p"
+    .string "…Huh?\n"
+    .string "Me?\p"
+    .string "I'm an innocent bystander!\n"
+    .string "Don't you believe me?{PLAY_BGM}{BGM_FRLG_SUSPICIOUS_EYE}$"
+
+Text_17EE70:: @ 817EE70
+    .string "GRUNT: Stop! I give up!\n"
+    .string "I'll leave quietly!$"
+
+gUnknown_817EE9C:: @ 817EE9C
+    .string "…Okay.\n"
+    .string "I'll return the TM I stole.$"
+
+gUnknown_817EEBF:: @ 817EEBF
+    .string "{PLAYER} recovered TM28 from\n"
+    .string "the TEAM ROCKET GRUNT.$"
+
+gUnknown_817EEED:: @ 817EEED
+    .string "I better get moving!\n"
+    .string "Bye!$"
+
+gUnknown_817EF07:: @ 817EF07
+    .string "Make room for this!\n"
+    .string "I can't run until I give it to you!$"
+
+gUnknown_817EF3F:: @ 817EF3F
+    .string "You're a TRAINER, too?\p"
+    .string "Collecting, battling…\n"
+    .string "It's a tough life, isn't it?$"
+
+gUnknown_817EF89:: @ 817EF89
+    .string "Did you know that you can CUT down\n"
+    .string "small trees?\p"
+    .string "Even that small tree in front of\n"
+    .string "the shop can be CUT down.\p"
+    .string "I think there's a way around it,\n"
+    .string "though.$"
+
+gUnknown_817F01D:: @ 817F01D
+    .string "If that SLOWBRO wasn't there, you\n"
+    .string "could CUT down the small tree.\p"
+    .string "That way, you could get to the\n"
+    .string "other side.\p"
+    .string "I think there's a way around it,\n"
+    .string "though.$"
+
+gUnknown_817F0B2:: @ 817F0B2
+    .string "You're making an encyclopedia on\n"
+    .string "POKéMON? That sounds amusing.$"
+
+gUnknown_817F0F1:: @ 817F0F1
+    .string "The people here were robbed.\p"
+    .string "It's obvious that TEAM ROCKET is\n"
+    .string "behind this most heinous crime!\p"
+    .string "Even our POLICE FORCE has\n"
+    .string "trouble with the ROCKETS!$"
+
+Text_17F183:: @ 817F183
+    .string "Okay! SLOWBRO!\n"
+    .string "Use SONICBOOM!$"
+
+gUnknown_817F1A1:: @ 817F1A1
+    .string "Come on, SLOWBRO, pay attention!$"
+
+Text_17F1C2:: @ 817F1C2
+    .string "SLOWBRO, punch!$"
+
+gUnknown_817F1D2:: @ 817F1D2
+    .string "No!\n"
+    .string "You blew it again!$"
+
+Text_17F1E9:: @ 817F1E9
+    .string "SLOWBRO, WITHDRAW!$"
+
+gUnknown_817F1FC:: @ 817F1FC
+    .string "No! That's wrong!\n"
+    .string "It's so hard to control POKéMON!\p"
+    .string "Your POKéMON's obedience depends\n"
+    .string "on your abilities as a TRAINER.$"
+
+gUnknown_817F270:: @ 817F270
+    .string "SLOWBRO took a snooze…$"
+
+gUnknown_817F287:: @ 817F287
+    .string "SLOWBRO is loafing around…$"
+
+gUnknown_817F2A2:: @ 817F2A2
+    .string "SLOWBRO turned away…$"
+
+gUnknown_817F2B7:: @ 817F2B7
+    .string "SLOWBRO ignored orders…$"
+
+gUnknown_817F2CF:: @ 817F2CF
+    .string "I want a bright red bicycle.\p"
+    .string "I'll keep it at home, so it won't\n"
+    .string "get dirty.$"
+
+gUnknown_817F319:: @ 817F319
+    .string "This is CERULEAN CAVE.\p"
+    .string "Horribly strong POKéMON live inside\n"
+    .string "there.\p"
+    .string "It takes a very special TRAINER to\n"
+    .string "be allowed inside there.\p"
+    .string "You'd have to be strong enough to\n"
+    .string "become the POKéMON LEAGUE\l"
+    .string "CHAMPION for starters.\p"
+    .string "And, you would have to have\n"
+    .string "made a great achievement.$"
+
+gUnknown_817F420:: @ 817F420
+    .string "CERULEAN CITY\n"
+    .string "A Mysterious, Blue Aura Surrounds\l"
+    .string "It$"
+
+gUnknown_817F453:: @ 817F453
+    .string "TRAINER TIPS\p"
+    .string "A POKéMON can be made to hold\n"
+    .string "an item.\p"
+    .string "Some items can even be used by\n"
+    .string "the holding POKéMON in battle.$"
+
+gUnknown_817F4C5:: @ 817F4C5
+    .string "Grass and caves handled easily!\n"
+    .string "BIKE SHOP$"
+
+gUnknown_817F4EF:: @ 817F4EF
+    .string "CERULEAN CITY POKéMON GYM\n"
+    .string "LEADER: MISTY\l"
+    .string "The Tomboyish Mermaid!$"
+
diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json
new file mode 100644
index 000000000..51ac0c1a6
--- /dev/null
+++ b/data/maps/CeruleanCity_BikeShop/map.json
@@ -0,0 +1,138 @@
+{
+  "id": "MAP_CERULEAN_CITY_BIKE_SHOP",
+  "name": "CeruleanCity_BikeShop",
+  "layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "25",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16ABBD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC75",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC6C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 3,
+      "elevation": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 4,
+      "elevation": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 5,
+      "elevation": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC94"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "script": "CeruleanCity_BikeShop_EventScript_16AC94"
+    }
+  ]
+}
diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc
new file mode 100644
index 000000000..51b7ba5bd
--- /dev/null
+++ b/data/maps/CeruleanCity_BikeShop/scripts.inc
@@ -0,0 +1,75 @@
+CeruleanCity_BikeShop_MapScripts:: @ 816ABBC
+	.byte 0
+
+CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
+	lock
+	faceplayer
+	checkflag FLAG_0x271
+	goto_if_eq EventScript_16AC58
+	checkflag FLAG_0x241
+	goto_if_eq EventScript_16AC22
+	showmoneybox 0, 0, 0
+	message Text_192755
+	waitmessage
+	multichoice 11, 0, 13, 0
+	switch VAR_RESULT
+	case 0, EventScript_16AC07
+	case 1, EventScript_16AC15
+	case 127, EventScript_16AC15
+	end
+
+EventScript_16AC07:: @ 816AC07
+	msgbox gUnknown_8192796
+	goto EventScript_16AC15
+	end
+
+EventScript_16AC15:: @ 816AC15
+	msgbox gUnknown_819280E
+	hidemoneybox
+	.byte 0
+	.byte 0
+	release
+	end
+
+EventScript_16AC22:: @ 816AC22
+	msgbox gUnknown_81927B2
+	giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, BGM_FRLG_ME_KEYITEM
+	setflag FLAG_0x271
+	additem ITEM_BICYCLE, 1
+	removeitem ITEM_BIKE_VOUCHER, 1
+	msgbox gUnknown_819280E
+	release
+	end
+
+EventScript_16AC58:: @ 816AC58
+	msgbox gUnknown_8192833
+	release
+	end
+
+EventScript_16AC62:: @ 816AC62
+	msgbox gUnknown_81928A8
+	release
+	end
+
+CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C
+	msgbox gUnknown_81928CF, 2
+	end
+
+CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
+	lock
+	faceplayer
+	checkflag FLAG_0x271
+	goto_if_eq EventScript_16AC8A
+	msgbox gUnknown_8192937
+	release
+	end
+
+EventScript_16AC8A:: @ 816AC8A
+	msgbox gUnknown_8192968
+	release
+	end
+
+CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94
+CeruleanCity_EventScript_16AC94:: @ 816AC94
+	msgbox gUnknown_81929AD, 3
+	end
diff --git a/data/maps/CeruleanCity_BikeShop/text.inc b/data/maps/CeruleanCity_BikeShop/text.inc
new file mode 100644
index 000000000..18fc8aaef
--- /dev/null
+++ b/data/maps/CeruleanCity_BikeShop/text.inc
@@ -0,0 +1,56 @@
+Text_192755:: @ 8192755
+    .string "Hi!\n"
+    .string "Welcome to our BIKE SHOP.\p"
+    .string "Have we got just the BIKE for\n"
+    .string "you!$"
+
+gUnknown_8192796:: @ 8192796
+    .string "Sorry!\n"
+    .string "You can't afford it!$"
+
+gUnknown_81927B2:: @ 81927B2
+    .string "Oh, that's…\p"
+    .string "A BIKE VOUCHER!\p"
+    .string "Okay!\n"
+    .string "Here you go!$"
+
+gUnknown_81927E1:: @ 81927E1
+    .string "{PLAYER} exchanged the\n"
+    .string "BIKE VOUCHER for a BICYCLE.$"
+
+gUnknown_819280E:: @ 819280E
+    .string "Thank you!\n"
+    .string "Come back again sometime!$"
+
+gUnknown_8192833:: @ 8192833
+    .string "How do you like your new BICYCLE?\n"
+    .string "Do you like how it rides?\p"
+    .string "You can take it out on CYCLING\n"
+    .string "ROAD and even into caves!$"
+
+gUnknown_81928A8:: @ 81928A8
+    .string "You better make room for your\n"
+    .string "BICYCLE!$"
+
+gUnknown_81928CF:: @ 81928CF
+    .string "A plain city bike is good enough\n"
+    .string "for me.\p"
+    .string "After all, you can't put a shopping\n"
+    .string "basket on a mountain bike.$"
+
+gUnknown_8192937:: @ 8192937
+    .string "These bikes are cool, but they're\n"
+    .string "way expensive!$"
+
+gUnknown_8192968:: @ 8192968
+    .string "Wow.\n"
+    .string "Your BIKE is really cool!$"
+
+Text_192987:: @ 8192987
+    .string "ついに　はつばい！\p"
+    .string "ドイツ　せい　さいこうきゅう\n"
+    .string "おりたたみ　じてんしゃ！$"
+
+gUnknown_81929AD:: @ 81929AD
+    .string "A shiny new BICYCLE!$"
+
diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json
new file mode 100644
index 000000000..a662cdf74
--- /dev/null
+++ b/data/maps/CeruleanCity_Gym/map.json
@@ -0,0 +1,109 @@
+{
+  "id": "MAP_CERULEAN_CITY_GYM",
+  "name": "CeruleanCity_Gym",
+  "layout": "LAYOUT_CERULEAN_CITY_GYM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "43",
+      "x": 10,
+      "y": 12,
+      "elevation": 0,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "CeruleanCity_Gym_EventScript_16AB5B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "CeruleanCity_Gym_EventScript_16AB44",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "81",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_Gym_EventScript_16AAA1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 7,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_Gym_EventScript_16AB7F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 8,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 9,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 17,
+      "elevation": 0,
+      "script": "CeruleanCity_Gym_EventScript_16AB9E"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 17,
+      "elevation": 0,
+      "script": "CeruleanCity_Gym_EventScript_16AB9E"
+    }
+  ]
+}
diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc
new file mode 100644
index 000000000..d8fe70407
--- /dev/null
+++ b/data/maps/CeruleanCity_Gym/scripts.inc
@@ -0,0 +1,82 @@
+CeruleanCity_Gym_MapScripts:: @ 816AAA0
+	.byte 0
+
+CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
+	checkflag FLAG_0x297
+	goto_if 0, EventScript_16AAF9
+	msgbox gUnknown_81922BF
+	release
+	end
+
+EventScript_16AAD3:: @ 816AAD3
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	setflag FLAG_0x4B1
+	setflag FLAG_0x821
+	setrespawn SPAWN_CERULEAN_CITY
+	setvar VAR_0x8008, 2
+	call EventScript_1A6B18
+	goto EventScript_16AAF9
+	end
+
+EventScript_16AAF9:: @ 816AAF9
+	msgbox gUnknown_81922F7
+	checkitemspace ITEM_TM03, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16AB3A
+	additem ITEM_TM03, 1
+	giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03
+	setflag FLAG_0x297
+	msgbox gUnknown_81922BF
+	release
+	end
+
+EventScript_16AB3A:: @ 816AB3A
+	msgbox gUnknown_819240E
+	release
+	end
+
+CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
+	trainerbattle 0, 150, 0, Text_192481, Text_1924D0
+	msgbox gUnknown_81924E4, 6
+	end
+
+CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
+	trainerbattle 0, 234, 0, Text_192524, Text_192547
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8192556, 6
+	end
+
+CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F
+	lock
+	faceplayer
+	checkflag FLAG_0x4B1
+	goto_if_eq EventScript_16AB94
+	msgbox gUnknown_81925AC
+	release
+	end
+
+EventScript_16AB94:: @ 816AB94
+	msgbox gUnknown_8192688
+	release
+	end
+
+CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E
+	lockall
+	checkflag FLAG_0x821
+	goto_if_eq EventScript_16ABB2
+	msgbox gUnknown_81926E1
+	releaseall
+	end
+
+EventScript_16ABB2:: @ 816ABB2
+	msgbox gUnknown_8192719
+	releaseall
+	end
diff --git a/data/maps/CeruleanCity_Gym/text.inc b/data/maps/CeruleanCity_Gym/text.inc
new file mode 100644
index 000000000..5f253b875
--- /dev/null
+++ b/data/maps/CeruleanCity_Gym/text.inc
@@ -0,0 +1,92 @@
+Text_1921EF:: @ 81921EF
+    .string "Hi, you're a new face!\p"
+    .string "Only those TRAINERS who have a\n"
+    .string "policy about POKéMON can turn pro.\p"
+    .string "What is your approach when you\n"
+    .string "catch and train POKéMON?\p"
+    .string "My policy is an all-out offensive\n"
+    .string "with WATER-type POKéMON!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+gUnknown_81922BF:: @ 81922BF
+    .string "TM03 teaches WATER PULSE.\p"
+    .string "Use it on an aquatic POKéMON!$"
+
+gUnknown_81922F7:: @ 81922F7
+    .string "The CASCADEBADGE makes all\n"
+    .string "POKéMON up to Lv. 30 obey.\p"
+    .string "That includes even outsiders you\n"
+    .string "got in trades.\p"
+    .string "There's more. You can now use CUT\n"
+    .string "anytime, even out of battle.\p"
+    .string "You can CUT down small trees to\n"
+    .string "open new pathways.\p"
+    .string "You can also have my favorite TM.$"
+
+gUnknown_81923F1:: @ 81923F1
+    .string "{PLAYER} received TM03\n"
+    .string "from MISTY.$"
+
+gUnknown_819240E:: @ 819240E
+    .string "You better make room for this!$"
+
+Text_19242D:: @ 819242D
+    .string "Wow!\n"
+    .string "You're too much!\p"
+    .string "All right!\p"
+    .string "You can have the CASCADEBADGE to\n"
+    .string "show you beat me.$"
+
+Text_192481:: @ 8192481
+    .string "What? You?\n"
+    .string "I'm more than good enough for you!\p"
+    .string "MISTY won't have to be bothered.$"
+
+Text_1924D0:: @ 81924D0
+    .string "You overwhelmed me!$"
+
+gUnknown_81924E4:: @ 81924E4
+    .string "You have to face other TRAINERS\n"
+    .string "to see how good you really are.$"
+
+Text_192524:: @ 8192524
+    .string "Splash!\p"
+    .string "I'm first up!\n"
+    .string "Let's do it!$"
+
+Text_192547:: @ 8192547
+    .string "That can't be!$"
+
+gUnknown_8192556:: @ 8192556
+    .string "MISTY is a TRAINER who's going to\n"
+    .string "keep improving.\p"
+    .string "She won't lose to someone like you!$"
+
+gUnknown_81925AC:: @ 81925AC
+    .string "Yo!\n"
+    .string "Champ in the making!\p"
+    .string "Let me give you some advice!\p"
+    .string "The LEADER, MISTY, is a pro who\n"
+    .string "uses WATER-type POKéMON.\p"
+    .string "You can drain all their water with\n"
+    .string "GRASS-type POKéMON.\p"
+    .string "Or, you might use ELECTRIC-type\n"
+    .string "POKéMON and zap them!$"
+
+gUnknown_8192688:: @ 8192688
+    .string "You beat MISTY!\n"
+    .string "See, what'd I tell ya?\p"
+    .string "You and me, kid, we make a pretty\n"
+    .string "darn-good team!$"
+
+gUnknown_81926E1:: @ 81926E1
+    .string "CERULEAN POKéMON GYM\n"
+    .string "LEADER: MISTY\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}$"
+
+gUnknown_8192719:: @ 8192719
+    .string "CERULEAN POKéMON GYM\n"
+    .string "LEADER: MISTY\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}, {PLAYER}$"
+
diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json
new file mode 100644
index 000000000..248ba5b3f
--- /dev/null
+++ b/data/maps/CeruleanCity_House1/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_CERULEAN_CITY_HOUSE1",
+  "name": "CeruleanCity_House1",
+  "layout": "LAYOUT_CERULEAN_CITY_HOUSE1",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_House1_EventScript_16A7F0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc
new file mode 100644
index 000000000..18bc90fb6
--- /dev/null
+++ b/data/maps/CeruleanCity_House1/scripts.inc
@@ -0,0 +1,91 @@
+CeruleanCity_House1_MapScripts:: @ 816A7EF
+	.byte 0
+
+CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0
+	lock
+	faceplayer
+	msgbox gUnknown_81918E7
+	message Text_191967
+	waitmessage
+	setvar VAR_0x8004, 0
+	special sub_80CB7C4
+	waitstate
+	switch VAR_RESULT
+	case 0, EventScript_16A8FB
+	case 1, EventScript_16A909
+	case 2, EventScript_16A917
+	case 3, EventScript_16A925
+	case 4, EventScript_16A933
+	case 5, EventScript_16A941
+	case 6, EventScript_16A94F
+	case 7, EventScript_16A95D
+	case 8, EventScript_16A96B
+	case 127, EventScript_16A96B
+	end
+
+EventScript_16A87D:: @ 816A87D
+	message Text_191967
+	waitmessage
+	special sub_80CBC5C
+	waitstate
+	switch VAR_RESULT
+	case 0, EventScript_16A8FB
+	case 1, EventScript_16A909
+	case 2, EventScript_16A917
+	case 3, EventScript_16A925
+	case 4, EventScript_16A933
+	case 5, EventScript_16A941
+	case 6, EventScript_16A94F
+	case 7, EventScript_16A95D
+	case 8, EventScript_16A96B
+	case 127, EventScript_16A96B
+	end
+
+EventScript_16A8FB:: @ 816A8FB
+	msgbox gUnknown_81919BE
+	goto EventScript_16A87D
+	end
+
+EventScript_16A909:: @ 816A909
+	msgbox gUnknown_8191A31
+	goto EventScript_16A87D
+	end
+
+EventScript_16A917:: @ 816A917
+	msgbox gUnknown_8191AF9
+	goto EventScript_16A87D
+	end
+
+EventScript_16A925:: @ 816A925
+	msgbox gUnknown_8191B69
+	goto EventScript_16A87D
+	end
+
+EventScript_16A933:: @ 816A933
+	msgbox gUnknown_8191C36
+	goto EventScript_16A87D
+	end
+
+EventScript_16A941:: @ 816A941
+	msgbox gUnknown_8191CA9
+	goto EventScript_16A87D
+	end
+
+EventScript_16A94F:: @ 816A94F
+	msgbox gUnknown_8191D78
+	goto EventScript_16A87D
+
+EventScript_16A95C:: @ 816A95C
+	end
+
+EventScript_16A95D:: @ 816A95D
+	msgbox gUnknown_8191DF8
+	goto EventScript_16A87D
+
+EventScript_16A96A:: @ 816A96A
+	end
+
+EventScript_16A96B:: @ 816A96B
+	msgbox gUnknown_819199E
+	release
+	end
diff --git a/data/maps/CeruleanCity_House1/text.inc b/data/maps/CeruleanCity_House1/text.inc
new file mode 100644
index 000000000..1e4ceceda
--- /dev/null
+++ b/data/maps/CeruleanCity_House1/text.inc
@@ -0,0 +1,72 @@
+gUnknown_81918E7:: @ 81918E7
+    .string "Only skilled TRAINERS can collect\n"
+    .string "POKéMON BADGES.\p"
+    .string "I see you have at least one.\p"
+    .string "Those BADGES have amazing secrets,\n"
+    .string "did you know?$"
+
+Text_191967:: @ 8191967
+    .string "Now then…\p"
+    .string "Which of the eight BADGES should\n"
+    .string "I describe?$"
+
+gUnknown_819199E:: @ 819199E
+    .string "Come visit me anytime you wish.$"
+
+gUnknown_81919BE:: @ 81919BE
+    .string "The ATTACK stat of all your\n"
+    .string "POKéMON increases a little bit.\p"
+    .string "It also lets you use the move\n"
+    .string "FLASH outside of battle.$"
+
+gUnknown_8191A31:: @ 8191A31
+    .string "POKéMON up to Lv. 30 will obey\n"
+    .string "you.\p"
+    .string "That includes even outsiders you\n"
+    .string "obtain in trades.\p"
+    .string "POKéMON of higher levels will\n"
+    .string "be unruly in battle, however.\p"
+    .string "It also lets you use the move\n"
+    .string "CUT outside of battle.$"
+
+gUnknown_8191AF9:: @ 8191AF9
+    .string "The SPEED stat of all your\n"
+    .string "POKéMON increases a little bit.\p"
+    .string "It also lets you use the move\n"
+    .string "FLY outside of battle.$"
+
+gUnknown_8191B69:: @ 8191B69
+    .string "POKéMON up to Lv. 50 will obey\n"
+    .string "you.\p"
+    .string "That includes even outsiders you\n"
+    .string "obtain in trades.\p"
+    .string "POKéMON of higher levels will\n"
+    .string "be unruly in battle, however.\p"
+    .string "It also lets you use the move\n"
+    .string "STRENGTH outside of battle.$"
+
+gUnknown_8191C36:: @ 8191C36
+    .string "The DEFENSE stat of all your\n"
+    .string "POKéMON increases a little bit.\p"
+    .string "It also lets you use the move\n"
+    .string "SURF outside of battle.$"
+
+gUnknown_8191CA9:: @ 8191CA9
+    .string "POKéMON up to Lv. 70 will obey\n"
+    .string "you.\p"
+    .string "That includes even outsiders you\n"
+    .string "obtain in trades.\p"
+    .string "POKéMON of higher levels will\n"
+    .string "be unruly in battle, however.\p"
+    .string "It also lets you use the move\n"
+    .string "ROCK SMASH outside of battle.$"
+
+gUnknown_8191D78:: @ 8191D78
+    .string "The SP. ATK and SP. DEF stats of\n"
+    .string "all your POKéMON rise a little bit.\p"
+    .string "It also lets you use the move\n"
+    .string "WATERFALL outside of battle.$"
+
+gUnknown_8191DF8:: @ 8191DF8
+    .string "All POKéMON will obey you!$"
+
diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json
new file mode 100644
index 000000000..207ca1f40
--- /dev/null
+++ b/data/maps/CeruleanCity_House2/map.json
@@ -0,0 +1,83 @@
+{
+  "id": "MAP_CERULEAN_CITY_HOUSE2",
+  "name": "CeruleanCity_House2",
+  "layout": "LAYOUT_CERULEAN_CITY_HOUSE2",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "56",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_House2_EventScript_16A976",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_House2_EventScript_16A995",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 1,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeruleanCity_House2_EventScript_16A99E"
+    }
+  ]
+}
diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc
new file mode 100644
index 000000000..092e7d1a6
--- /dev/null
+++ b/data/maps/CeruleanCity_House2/scripts.inc
@@ -0,0 +1,24 @@
+CeruleanCity_House2_MapScripts:: @ 816A975
+	.byte 0
+
+CeruleanCity_House2_EventScript_16A976:: @ 816A976
+	lock
+	faceplayer
+	checkflag FLAG_0x23F
+	goto_if_eq EventScript_16A98B
+	msgbox gUnknown_8191E13
+	release
+	end
+
+EventScript_16A98B:: @ 816A98B
+	msgbox gUnknown_8191ED8
+	release
+	end
+
+CeruleanCity_House2_EventScript_16A995:: @ 816A995
+	msgbox gUnknown_8191F2A, 2
+	end
+
+CeruleanCity_House2_EventScript_16A99E:: @ 816A99E
+	msgbox gUnknown_8191F64, 3
+	end
diff --git a/data/maps/CeruleanCity_House2/text.inc b/data/maps/CeruleanCity_House2/text.inc
new file mode 100644
index 000000000..291a0ee46
--- /dev/null
+++ b/data/maps/CeruleanCity_House2/text.inc
@@ -0,0 +1,22 @@
+gUnknown_8191E13:: @ 8191E13
+    .string "Those miserable ROCKETS!\p"
+    .string "Look what they've done to my\n"
+    .string "house!\p"
+    .string "They stole a TM for teaching\n"
+    .string "POKéMON how to DIG holes!\p"
+    .string "I was going to use it on a\n"
+    .string "MANKEY or a SANDSHREW…\p"
+    .string "That cost me a bundle, it did!$"
+
+gUnknown_8191ED8:: @ 8191ED8
+    .string "I figure what's lost is lost.\p"
+    .string "I decided to teach DIGLETT how to\n"
+    .string "DIG without a TM.$"
+
+gUnknown_8191F2A:: @ 8191F2A
+    .string "TEAM ROCKET must be trying to DIG\n"
+    .string "their way into no good!$"
+
+gUnknown_8191F64:: @ 8191F64
+    .string "TEAM ROCKET left a way out!$"
+
diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json
new file mode 100644
index 000000000..e74a6a675
--- /dev/null
+++ b/data/maps/CeruleanCity_House3/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_CERULEAN_CITY_HOUSE3",
+  "name": "CeruleanCity_House3",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_House3_EventScript_16A9B1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "35",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_House3_EventScript_16A9A8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc
new file mode 100644
index 000000000..5bcdb0bea
--- /dev/null
+++ b/data/maps/CeruleanCity_House3/scripts.inc
@@ -0,0 +1,44 @@
+CeruleanCity_House3_MapScripts:: @ 816A9A7
+	.byte 0
+
+CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8
+	msgbox gUnknown_8191F80, 2
+	end
+
+CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
+	lock
+	faceplayer
+	setvar VAR_0x8008, 1
+	call EventScript_1A8CAD
+	checkflag FLAG_0x24A
+	goto_if_eq EventScript_16AA23
+	msgbox gUnknown_81A59FE, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16AA0B
+	call EventScript_1A8CBD
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16AA0B
+	call EventScript_1A8CC9
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_16AA15
+	call EventScript_1A8CD9
+	msgbox gUnknown_81A5A9D
+	setflag FLAG_0x24A
+	release
+	end
+
+EventScript_16AA0B:: @ 816AA0B
+	msgbox gUnknown_81A5A4E
+	release
+	end
+
+EventScript_16AA15:: @ 816AA15
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_81A5A6A
+	release
+	end
+
+EventScript_16AA23:: @ 816AA23
+	msgbox gUnknown_81A5AA5
+	release
+	end
diff --git a/data/maps/CeruleanCity_House3/text.inc b/data/maps/CeruleanCity_House3/text.inc
new file mode 100644
index 000000000..e2859798a
--- /dev/null
+++ b/data/maps/CeruleanCity_House3/text.inc
@@ -0,0 +1,6 @@
+gUnknown_8191F80:: @ 8191F80
+    .string "My husband likes trading POKéMON.\p"
+    .string "You're collecting POKéMON for your\n"
+    .string "POKéDEX, aren't you?\p"
+    .string "Would you please trade with him?$"
+
diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json
new file mode 100644
index 000000000..2fdf6ad1e
--- /dev/null
+++ b/data/maps/CeruleanCity_House4/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_CERULEAN_CITY_HOUSE4",
+  "name": "CeruleanCity_House4",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_House4_EventScript_16ACEF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 12
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc
new file mode 100644
index 000000000..bbc762b3f
--- /dev/null
+++ b/data/maps/CeruleanCity_House4/scripts.inc
@@ -0,0 +1,96 @@
+CeruleanCity_House4_MapScripts:: @ 816ACEE
+	.byte 0
+
+CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	specialvar VAR_0x8004, sub_8146CE8
+	copyvar VAR_0x8008, VAR_RESULT
+	compare_var_to_value VAR_0x8004, 0
+	goto_if_eq EventScript_16AD59
+	compare_var_to_value VAR_0x8004, 1
+	goto_if_eq EventScript_16AD63
+	compare_var_to_value VAR_0x8004, 2
+	goto_if_eq EventScript_16AD89
+	compare_var_to_value VAR_0x8004, 3
+	goto_if_eq EventScript_16ADAF
+	compare_var_to_value VAR_0x8004, 4
+	goto_if_eq EventScript_16ADC3
+	compare_var_to_value VAR_0x8004, 5
+	goto_if_eq EventScript_16ADE9
+	compare_var_to_value VAR_0x8004, 6
+	goto_if_eq EventScript_16AE0F
+	end
+
+EventScript_16AD59:: @ 816AD59
+	msgbox gUnknown_8192AF0
+	release
+	end
+
+EventScript_16AD63:: @ 816AD63
+	call EventScript_16AE23
+	msgbox gUnknown_8192B43
+	giveitem VAR_0x8008
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16AE45
+	release
+	end
+
+EventScript_16AD89:: @ 816AD89
+	call EventScript_16AE23
+	msgbox gUnknown_8192C07
+	giveitem VAR_0x8008, 4
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16AE45
+	release
+	end
+
+EventScript_16ADAF:: @ 816ADAF
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_8192CD5
+	release
+	end
+
+EventScript_16ADC3:: @ 816ADC3
+	call EventScript_16AE23
+	msgbox gUnknown_8192D4B
+	giveitem VAR_0x8008
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16AE45
+	release
+	end
+
+EventScript_16ADE9:: @ 816ADE9
+	call EventScript_16AE23
+	msgbox gUnknown_8192DE3
+	giveitem VAR_0x8008, 4
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16AE45
+	release
+	end
+
+EventScript_16AE0F:: @ 816AE0F
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_8192EC5
+	release
+	end
+
+EventScript_16AE23:: @ 816AE23
+	playse SE_PIN
+	applymovement 1, Movement_1A75DB
+	waitmovement 0
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	applymovement 1, Movement_1A75DD
+	waitmovement 0
+	return
+
+EventScript_16AE45:: @ 816AE45
+	msgbox gUnknown_8192F2A
+	release
+	end
diff --git a/data/maps/CeruleanCity_House4/text.inc b/data/maps/CeruleanCity_House4/text.inc
new file mode 100644
index 000000000..7e7e5eb88
--- /dev/null
+++ b/data/maps/CeruleanCity_House4/text.inc
@@ -0,0 +1,62 @@
+gUnknown_8192AF0:: @ 8192AF0
+    .string "Sigh…\n"
+    .string "Too much time, too little to do…\p"
+    .string "Is nothing entertaining happening\n"
+    .string "anywhere?$"
+
+gUnknown_8192B43:: @ 8192B43
+    .string "Ah!\n"
+    .string "A new news report!\p"
+    .string "Hmm…\p"
+    .string "I see!\n"
+    .string "That was quite informative!\p"
+    .string "I applaud you for taking interest\n"
+    .string "in the news at your young age.\p"
+    .string "As my thanks for sharing the news\n"
+    .string "with me, I want you to have this.$"
+
+gUnknown_8192C07:: @ 8192C07
+    .string "Oh, oh!\n"
+    .string "Th-this news report!\p"
+    .string "Hmm…\p"
+    .string "Amazing!\n"
+    .string "What an incredible piece of news!\p"
+    .string "I haven't seen a news story this\n"
+    .string "incredible in too long a time!\p"
+    .string "Thanks for sharing this fantastic\n"
+    .string "news. Have a bunch of BERRIES!$"
+
+gUnknown_8192CD5:: @ 8192CD5
+    .string "It seems such a shame to not share\n"
+    .string "this news with other folks…\p"
+    .string "I wish I could tell someone…\n"
+    .string "Let others know the news…$"
+
+gUnknown_8192D4B:: @ 8192D4B
+    .string "Ah, you've spread the news for me?\p"
+    .string "Good news becomes worthwhile when\n"
+    .string "all sorts of people share it.\p"
+    .string "As my thanks for your spreading\n"
+    .string "the news, take this!$"
+
+gUnknown_8192DE3:: @ 8192DE3
+    .string "You've spread the news some more?\n"
+    .string "Magnificent!\p"
+    .string "That piece of news must be\n"
+    .string "delighted to be passed around so.\p"
+    .string "Yes, indeed!\p"
+    .string "Consider this a show of\n"
+    .string "appreciation from me and the news.\p"
+    .string "I'll give you more BERRIES than\n"
+    .string "I usually do.$"
+
+gUnknown_8192EC5:: @ 8192EC5
+    .string "I'm quite enjoying myself with all\n"
+    .string "sorts of news.\p"
+    .string "Yes, I am satisfied!\n"
+    .string "I won't be bored for a while.$"
+
+gUnknown_8192F2A:: @ 8192F2A
+    .string "Hm? Your BERRY POUCH is full.\n"
+    .string "My gift remains ungiven, then.$"
+
diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json
new file mode 100644
index 000000000..c96495d4a
--- /dev/null
+++ b/data/maps/CeruleanCity_House5/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_CERULEAN_CITY_HOUSE5",
+  "name": "CeruleanCity_House5",
+  "layout": "LAYOUT_CERULEAN_CITY_HOUSE5",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "33",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_House5_EventScript_16AE50",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 13
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "script": "CeruleanCity_House5_EventScript_16B0DA"
+    }
+  ]
+}
diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc
new file mode 100644
index 000000000..d7d3e0222
--- /dev/null
+++ b/data/maps/CeruleanCity_House5/scripts.inc
@@ -0,0 +1,185 @@
+CeruleanCity_House5_MapScripts:: @ 816AE4F
+	.byte 0
+
+CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
+	lock
+	faceplayer
+	checkflag FLAG_0x2BB
+	goto_if_eq EventScript_16AEB7
+	msgbox gUnknown_8192F67, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16AEAD
+	checkflag FLAG_0x847
+	goto_if 0, EventScript_16AEA3
+	msgbox gUnknown_8193003
+	setflag FLAG_0x2BB
+	giveitem ITEM_POWDER_JAR
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A6BF9
+	msgbox gUnknown_8193033
+	release
+	end
+
+EventScript_16AEA3:: @ 816AEA3
+	msgbox gUnknown_819321D
+	release
+	end
+
+EventScript_16AEAD:: @ 816AEAD
+	msgbox gUnknown_819325E
+	release
+	end
+
+EventScript_16AEB7:: @ 816AEB7
+	special sub_815F094
+	msgbox gUnknown_81932C5
+	goto EventScript_16AEC8
+	end
+
+EventScript_16AEC8:: @ 816AEC8
+	message Text_1932F4
+	waitmessage
+	setvar VAR_0x8004, 5
+	special sub_80CB7C4
+	waitstate
+	switch VAR_RESULT
+	case 0, EventScript_16AF6C
+	case 1, EventScript_16AF80
+	case 2, EventScript_16AF94
+	case 3, EventScript_16AFA8
+	case 4, EventScript_16AFBC
+	case 5, EventScript_16AFD0
+	case 6, EventScript_16AFE4
+	case 7, EventScript_16AFF8
+	case 8, EventScript_16B00C
+	case 9, EventScript_16B020
+	case 10, EventScript_16B034
+	case 11, EventScript_16B048
+	case 127, EventScript_16B048
+	end
+
+EventScript_16AF6C:: @ 816AF6C
+	getitemname 0, ITEM_ENERGY_POWDER
+	setvar VAR_0x8008, ITEM_ENERGY_POWDER
+	setvar VAR_0x8009, 50
+	goto EventScript_16B055
+	end
+
+EventScript_16AF80:: @ 816AF80
+	getitemname 0, ITEM_ENERGY_ROOT
+	setvar VAR_0x8008, ITEM_ENERGY_ROOT
+	setvar VAR_0x8009, 80
+	goto EventScript_16B055
+	end
+
+EventScript_16AF94:: @ 816AF94
+	getitemname 0, ITEM_HEAL_POWDER
+	setvar VAR_0x8008, ITEM_HEAL_POWDER
+	setvar VAR_0x8009, 50
+	goto EventScript_16B055
+	end
+
+EventScript_16AFA8:: @ 816AFA8
+	getitemname 0, ITEM_REVIVAL_HERB
+	setvar VAR_0x8008, ITEM_REVIVAL_HERB
+	setvar VAR_0x8009, 300
+	goto EventScript_16B055
+	end
+
+EventScript_16AFBC:: @ 816AFBC
+	getitemname 0, ITEM_PROTEIN
+	setvar VAR_0x8008, ITEM_PROTEIN
+	setvar VAR_0x8009, 1000
+	goto EventScript_16B055
+	end
+
+EventScript_16AFD0:: @ 816AFD0
+	getitemname 0, ITEM_IRON
+	setvar VAR_0x8008, ITEM_IRON
+	setvar VAR_0x8009, 1000
+	goto EventScript_16B055
+	end
+
+EventScript_16AFE4:: @ 816AFE4
+	getitemname 0, ITEM_CARBOS
+	setvar VAR_0x8008, ITEM_CARBOS
+	setvar VAR_0x8009, 1000
+	goto EventScript_16B055
+	end
+
+EventScript_16AFF8:: @ 816AFF8
+	getitemname 0, ITEM_CALCIUM
+	setvar VAR_0x8008, ITEM_CALCIUM
+	setvar VAR_0x8009, 1000
+	goto EventScript_16B055
+	end
+
+EventScript_16B00C:: @ 816B00C
+	getitemname 0, ITEM_ZINC
+	setvar VAR_0x8008, ITEM_ZINC
+	setvar VAR_0x8009, 1000
+	goto EventScript_16B055
+	end
+
+EventScript_16B020:: @ 816B020
+	getitemname 0, ITEM_HP_UP
+	setvar VAR_0x8008, ITEM_HP_UP
+	setvar VAR_0x8009, 1000
+	goto EventScript_16B055
+	end
+
+EventScript_16B034:: @ 816B034
+	getitemname 0, ITEM_PP_UP
+	setvar VAR_0x8008, ITEM_PP_UP
+	setvar VAR_0x8009, 3000
+	goto EventScript_16B055
+	end
+
+EventScript_16B048:: @ 816B048
+	msgbox gUnknown_819342F
+	special sub_815F114
+	release
+	end
+
+EventScript_16B055:: @ 816B055
+	msgbox gUnknown_819331E, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16AEC8
+	copyvar VAR_0x8004, VAR_0x8009
+	specialvar VAR_RESULT, sub_815EEB0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B0CC
+	giveitem VAR_0x8008
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B0BF
+	copyvar VAR_0x8004, VAR_0x8009
+	special sub_815EF5C
+	special sub_815F070
+	msgbox gUnknown_819337A, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16AEC8
+	msgbox gUnknown_81933FB
+	special sub_815F114
+	release
+	end
+
+EventScript_16B0BF:: @ 816B0BF
+	msgbox gUnknown_81A5207
+	special sub_815F114
+	release
+	end
+
+EventScript_16B0CC:: @ 816B0CC
+	msgbox gUnknown_8193352
+	goto EventScript_16AEC8
+	end
+
+CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA
+	lockall
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_814EA7C
+	waitstate
+	releaseall
+	end
diff --git a/data/maps/CeruleanCity_House5/text.inc b/data/maps/CeruleanCity_House5/text.inc
new file mode 100644
index 000000000..2e3add5a1
--- /dev/null
+++ b/data/maps/CeruleanCity_House5/text.inc
@@ -0,0 +1,70 @@
+gUnknown_8192F67:: @ 8192F67
+    .string "I concoct a variety of medicine\n"
+    .string "from BERRY POWDER.\p"
+    .string "Using good BERRY POWDER, I can\n"
+    .string "make any kind of medicine.\p"
+    .string "Now tell me, have you any interest\n"
+    .string "in BERRIES?$"
+
+gUnknown_8193003:: @ 8193003
+    .string "Ah, good! For you, then, I have\n"
+    .string "just the thing.$"
+
+gUnknown_8193033:: @ 8193033
+    .string "There's something new on the second\n"
+    .string "floor of POKéMON CENTERS, at the\l"
+    .string "DIRECT CORNER.\p"
+    .string "They installed a Wireless Adapter\n"
+    .string "machine for crushing BERRIES.\p"
+    .string "This is where you come in.\p"
+    .string "I have a favor to ask, one that\n"
+    .string "I can entrust only to you.\p"
+    .string "Could you make BERRY POWDER for\n"
+    .string "me using that machine?\p"
+    .string "Don't forget, the machine is at the\n"
+    .string "DIRECT CORNER of POKéMON CENTERS.\p"
+    .string "I'll concoct medicine for you if\n"
+    .string "you bring me some BERRY POWDER.\p"
+    .string "Don't forget, crush BERRIES into\n"
+    .string "BERRY POWDER and bring it to me.$"
+
+gUnknown_819321D:: @ 819321D
+    .string "Why must you lie to me?\p"
+    .string "How many BERRIES do you have?\n"
+    .string "Not a one!$"
+
+gUnknown_819325E:: @ 819325E
+    .string "You have no interest in BERRIES?\p"
+    .string "Young one, it's important to take an\n"
+    .string "interest in all sorts of things.$"
+
+gUnknown_81932C5:: @ 81932C5
+    .string "Er-hem! Have you brought me some\n"
+    .string "BERRY POWDER?$"
+
+Text_1932F4:: @ 81932F4
+    .string "With what would you like to \n"
+    .string "exchange it?$"
+
+gUnknown_819331E:: @ 819331E
+    .string "Fine, you'll exchange your BERRY\n"
+    .string "POWDER for one {STR_VAR_1}?$"
+
+gUnknown_8193352:: @ 8193352
+    .string "Hm? You don't have enough\n"
+    .string "BERRY POWDER.$"
+
+gUnknown_819337A:: @ 819337A
+    .string "This is fine BERRY POWDER indeed.\n"
+    .string "It will make excellent medicine.\p"
+    .string "Would you like to trade more BERRY\n"
+    .string "POWDER for something else?$"
+
+gUnknown_81933FB:: @ 81933FB
+    .string "That's fine, then.\n"
+    .string "I'll hope to see you back again.$"
+
+gUnknown_819342F:: @ 819342F
+    .string "Come see me if you'd like to trade\n"
+    .string "your BERRY POWDER.$"
+
diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json
new file mode 100644
index 000000000..7f3076e12
--- /dev/null
+++ b/data/maps/CeruleanCity_Mart/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_CERULEAN_CITY_MART",
+  "name": "CeruleanCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_Mart_EventScript_16ACB0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_Mart_EventScript_16ACA7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_Mart_EventScript_16AC9E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc
new file mode 100644
index 000000000..6f05c3e80
--- /dev/null
+++ b/data/maps/CeruleanCity_Mart/scripts.inc
@@ -0,0 +1,38 @@
+CeruleanCity_Mart_MapScripts:: @ 816AC9D
+	.byte 0
+
+CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E
+	msgbox gUnknown_81929C2, 2
+	end
+
+CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7
+	msgbox gUnknown_8192A79, 2
+	end
+
+CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16ACD8
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16ACD8:: @ 816ACD8
+	.2byte ITEM_POKE_BALL
+	.2byte ITEM_SUPER_POTION
+	.2byte ITEM_POTION
+	.2byte ITEM_ANTIDOTE
+	.2byte ITEM_PARALYZE_HEAL
+	.2byte ITEM_AWAKENING
+	.2byte ITEM_BURN_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_REPEL
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/CeruleanCity_Mart/text.inc b/data/maps/CeruleanCity_Mart/text.inc
new file mode 100644
index 000000000..e2106bbe5
--- /dev/null
+++ b/data/maps/CeruleanCity_Mart/text.inc
@@ -0,0 +1,14 @@
+gUnknown_81929C2:: @ 81929C2
+    .string "REPEL not only keeps bugs away,\n"
+    .string "it also works on weak POKéMON.\p"
+    .string "Put your strongest POKéMON at the\n"
+    .string "left of the POKéMON LIST.\p"
+    .string "If your first POKéMON is strong,\n"
+    .string "REPEL's effect is boosted.$"
+
+gUnknown_8192A79:: @ 8192A79
+    .string "Do you know about RARE CANDY?\n"
+    .string "They don't sell it in shops.\p"
+    .string "I think it makes POKéMON grow\n"
+    .string "very quickly all of a sudden.$"
+
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..16132e565
--- /dev/null
+++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
@@ -0,0 +1,140 @@
+{
+  "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
+  "name": "CeruleanCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA3C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA45",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA4E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA57",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA70",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CERULEAN_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..dcace7aee
--- /dev/null
+++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,37 @@
+CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D
+	map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38
+	map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38
+	setrespawn SPAWN_CERULEAN_CITY
+	end
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45
+	msgbox gUnknown_8192079, 2
+	end
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E
+	msgbox gUnknown_8191FFB, 2
+	end
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
+	lock
+	faceplayer
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8192116
+	release
+	end
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70
+	msgbox gUnknown_819214C, 2
+	end
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/text.inc b/data/maps/CeruleanCity_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..2b60409d2
--- /dev/null
+++ b/data/maps/CeruleanCity_PokemonCenter_1F/text.inc
@@ -0,0 +1,27 @@
+gUnknown_8191FFB:: @ 8191FFB
+    .string "That BILL!\p"
+    .string "I heard that he'll do whatever it\n"
+    .string "takes to get rare POKéMON.\p"
+    .string "He's not above doing all sorts\n"
+    .string "of things, I've heard.$"
+
+gUnknown_8192079:: @ 8192079
+    .string "Have you heard about BILL?\p"
+    .string "Everyone calls him a POKéMANIAC!\p"
+    .string "I think people are just jealous of\n"
+    .string "BILL, though.\p"
+    .string "Who wouldn't want to boast about\n"
+    .string "their POKéMON?$"
+
+gUnknown_8192116:: @ 8192116
+    .string "BILL has lots of POKéMON!\n"
+    .string "He collects rare ones, too!$"
+
+gUnknown_819214C:: @ 819214C
+    .string "Why don't you go upstairs and try\n"
+    .string "trading POKéMON with your friends?\p"
+    .string "You could get a lot more variety\n"
+    .string "by trading.\p"
+    .string "The POKéMON you get in trades grow\n"
+    .string "quickly, too.$"
+
diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..d5460e28f
--- /dev/null
+++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F",
+  "name": "CeruleanCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CERULEAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..3778c494d
--- /dev/null
+++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79
+	map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E
+	call EventScript_1BB4A3
+	end
+
+EventScript_16AA94:: @ 816AA94
+	call EventScript_1BB6AB
+	end
+
+EventScript_16AA9A:: @ 816AA9A
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json
new file mode 100644
index 000000000..4b680f47f
--- /dev/null
+++ b/data/maps/CinnabarIsland/map.json
@@ -0,0 +1,158 @@
+{
+  "id": "MAP_CINNABAR_ISLAND",
+  "name": "CinnabarIsland",
+  "layout": "LAYOUT_CINNABAR_ISLAND",
+  "music": "BGM_FRLG_CINNABAR_ISLAND",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE21_SOUTH",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE20",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_EventScript_1671EF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_EventScript_167208",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "73",
+      "x": 20,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "98"
+    },
+    {
+      "graphics_id": "108",
+      "x": 23,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "107"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_MANSION_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND_GYM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND_MART",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 20,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "CinnabarIsland_EventScript_1671CA"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 3,
+      "elevation": 0,
+      "script": "CinnabarIsland_EventScript_167211"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 9,
+      "elevation": 0,
+      "script": "CinnabarIsland_EventScript_16721A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 22,
+      "y": 5,
+      "elevation": 0,
+      "script": "CinnabarIsland_EventScript_167223"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 9,
+      "elevation": 0,
+      "script": "CinnabarIsland_EventScript_16721A"
+    }
+  ]
+}
diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc
new file mode 100644
index 000000000..90d564eff
--- /dev/null
+++ b/data/maps/CinnabarIsland/scripts.inc
@@ -0,0 +1,372 @@
+CinnabarIsland_MapScripts:: @ 8166ED6
+	map_script 3, CinnabarIsland_MapScript1_166EE1
+	map_script 2, CinnabarIsland_MapScript2_166F6E
+	.byte 0
+
+CinnabarIsland_MapScript1_166EE1:: @ 8166EE1
+	setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
+	call EventScript_166F5E
+	compare_var_to_value VAR_0x4071, 1
+	call_if 1, EventScript_166F24
+	compare_var_to_value VAR_0x4071, 3
+	call_if 1, EventScript_166F52
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1
+	call_if 1, EventScript_166F0B
+	end
+
+EventScript_166F0B:: @ 8166F0B
+	savebgm BGM_FRLG_FOLLOW_ME
+	setflag FLAG_0x002
+	setobjectxyperm 3, 15, 12
+	setobjectmovementtype 3, 9
+	setobjectxyperm 4, 30, 12
+	return
+
+EventScript_166F24:: @ 8166F24
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare_var_to_value VAR_0x8004, 18
+	goto_if 4, EventScript_166F4A
+	setflag FLAG_0x002
+	setobjectxyperm 3, 18, 12
+	setobjectmovementtype 3, 7
+	setobjectxyperm 4, 30, 12
+	return
+
+EventScript_166F4A:: @ 8166F4A
+	setobjectxyperm 4, 30, 8
+	return
+
+EventScript_166F52:: @ 8166F52
+	setobjectxyperm 3, 21, 8
+	setobjectmovementtype 3, 7
+	return
+
+EventScript_166F5E:: @ 8166F5E
+	checkflag FLAG_0x1A8
+	goto_if_eq EventScript_166F68
+	return
+
+EventScript_166F68:: @ 8166F68
+	setvar VAR_0x4001, 1
+	return
+
+CinnabarIsland_MapScript2_166F6E:: @ 8166F6E
+	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166F88
+	map_script_2 VAR_0x4071, 1, EventScript_166FCD
+	map_script_2 VAR_0x4071, 3, EventScript_166FA0
+	.2byte 0
+
+EventScript_166F88:: @ 8166F88
+	lockall
+	clearflag FLAG_SPECIAL_FLAG_0x4001
+	savebgm MUS_DUMMY
+	textcolor 0
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
+	delay 20
+	call EventScript_1670E6
+	releaseall
+	end
+
+EventScript_166FA0:: @ 8166FA0
+	lockall
+	textcolor 0
+	msgbox gUnknown_8180F09
+	closemessage
+	applymovement 3, Movement_166FC6
+	waitmovement 0
+	removeobject 3
+	setvar VAR_0x4071, 4
+	setflag FLAG_0x075
+	clearflag FLAG_0x076
+	releaseall
+	end
+
+Movement_166FC6:: @ 8166FC6
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+EventScript_166FCD:: @ 8166FCD
+	lockall
+	textcolor 0
+	checkflag FLAG_0x002
+	call_if 0, EventScript_167032
+	checkflag FLAG_0x002
+	call_if 1, EventScript_16703D
+	playse SE_PIN
+	applymovement 3, Movement_1A75DB
+	waitmovement 0
+	applymovement 3, Movement_1A75DD
+	waitmovement 0
+	checkflag FLAG_0x002
+	call_if 0, EventScript_167048
+	checkflag FLAG_0x002
+	call_if 1, EventScript_167053
+	msgbox gUnknown_8180C90
+	msgbox gUnknown_8180CAA, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_167068
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_167078
+	end
+
+EventScript_167032:: @ 8167032
+	applymovement 3, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_16703D:: @ 816703D
+	applymovement 3, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_167048:: @ 8167048
+	applymovement 3, Movement_1671A4
+	waitmovement 0
+	return
+
+EventScript_167053:: @ 8167053
+	applymovement 3, Movement_1671A6
+	waitmovement 0
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	return
+
+EventScript_167068:: @ 8167068
+	msgbox gUnknown_8180DDD
+	closemessage
+	call EventScript_1670E6
+	releaseall
+	end
+
+EventScript_167078:: @ 8167078
+	msgbox gUnknown_8180DF8
+	closemessage
+	checkflag FLAG_0x002
+	call_if 0, EventScript_1670A0
+	checkflag FLAG_0x002
+	call_if 1, EventScript_1670B3
+	removeobject 3
+	setvar VAR_0x4071, 2
+	clearflag FLAG_0x0A2
+	releaseall
+	end
+
+EventScript_1670A0:: @ 81670A0
+	applymovement 3, Movement_1670AB
+	waitmovement 0
+	return
+
+Movement_1670AB:: @ 81670AB
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+EventScript_1670B3:: @ 81670B3
+	applymovement 255, Movement_1670DB
+	applymovement 3, Movement_1670DE
+	waitmovement 0
+	opendoor 14, 11
+	waitdooranim
+	applymovement 3, Movement_1670E2
+	waitmovement 0
+	closedoor 14, 11
+	waitdooranim
+	return
+
+Movement_1670DB:: @ 81670DB
+	step_12
+	step_30
+	step_end
+
+Movement_1670DE:: @ 81670DE
+	step_1c
+	step_12
+	step_2e
+	step_end
+
+Movement_1670E2:: @ 81670E2
+	step_11
+	step_1a
+	step_60
+	step_end
+
+EventScript_1670E6:: @ 81670E6
+	checkflag FLAG_0x002
+	call_if 1, EventScript_167142
+	addobject 4
+	checkflag FLAG_0x002
+	call_if 0, EventScript_167154
+	checkflag FLAG_0x002
+	call_if 1, EventScript_167166
+	msgbox gUnknown_8180EAD
+	closemessage
+	checkflag FLAG_0x002
+	call_if 0, EventScript_167171
+	checkflag FLAG_0x002
+	call_if 1, EventScript_167183
+	setvar VAR_0x4071, 2
+	removeobject 3
+	delay 40
+	setflag FLAG_0x06B
+	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8006, 1
+	goto EventScript_1A90DA
+	end
+
+EventScript_167142:: @ 8167142
+	applymovement 3, Movement_1671AF
+	applymovement 255, Movement_1671AF
+	waitmovement 0
+	return
+
+EventScript_167154:: @ 8167154
+	applymovement 3, Movement_1671AA
+	applymovement 4, Movement_167195
+	waitmovement 0
+	return
+
+EventScript_167166:: @ 8167166
+	applymovement 4, Movement_167195
+	waitmovement 0
+	return
+
+EventScript_167171:: @ 8167171
+	applymovement 3, Movement_16719D
+	applymovement 255, Movement_1671BA
+	waitmovement 0
+	return
+
+EventScript_167183:: @ 8167183
+	applymovement 3, Movement_1671B6
+	applymovement 255, Movement_1671C4
+	waitmovement 0
+	return
+
+Movement_167195:: @ 8167195
+	step_1c
+	step_1c
+	step_1f
+	step_1f
+	step_12
+	step_left
+	step_left
+	step_end
+
+Movement_16719D:: @ 816719D
+	step_13
+	step_10
+	step_10
+	step_13
+	step_1a
+	step_60
+	step_end
+
+Movement_1671A4:: @ 81671A4
+	step_11
+	step_end
+
+Movement_1671A6:: @ 81671A6
+	step_12
+	step_12
+	step_12
+	step_end
+
+Movement_1671AA:: @ 81671AA
+	step_1c
+	step_1c
+	step_1b
+	step_30
+	step_end
+
+Movement_1671AF:: @ 81671AF
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_1671B6:: @ 81671B6
+	step_13
+	step_1a
+	step_60
+	step_end
+
+Movement_1671BA:: @ 81671BA
+	step_10
+	step_13
+	step_10
+	step_10
+	step_30
+	step_1a
+	step_13
+	step_1a
+	step_60
+	step_end
+
+Movement_1671C4:: @ 81671C4
+	step_13
+	step_1a
+	step_13
+	step_1a
+	step_60
+	step_end
+
+CinnabarIsland_EventScript_1671CA:: @ 81671CA
+	lockall
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	delay 20
+	msgbox gUnknown_8180B20
+	closemessage
+	applymovement 255, Movement_1671ED
+	waitmovement 0
+	releaseall
+	end
+
+Movement_1671ED:: @ 81671ED
+	step_10
+	step_end
+
+CinnabarIsland_EventScript_1671EF:: @ 81671EF
+	lock
+	faceplayer
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 3
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8180B34
+	release
+	end
+
+CinnabarIsland_EventScript_167208:: @ 8167208
+	msgbox gUnknown_8180BA0, 2
+	end
+
+CinnabarIsland_EventScript_167211:: @ 8167211
+	msgbox gUnknown_8180C0D, 3
+	end
+
+CinnabarIsland_EventScript_16721A:: @ 816721A
+	msgbox gUnknown_8180C3E, 3
+	end
+
+CinnabarIsland_EventScript_167223:: @ 8167223
+	lockall
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8180C4A
+	releaseall
+	end
diff --git a/data/maps/CinnabarIsland/text.inc b/data/maps/CinnabarIsland/text.inc
new file mode 100644
index 000000000..26ce19f09
--- /dev/null
+++ b/data/maps/CinnabarIsland/text.inc
@@ -0,0 +1,75 @@
+gUnknown_8180B20:: @ 8180B20
+    .string "The door is locked…$"
+
+gUnknown_8180B34:: @ 8180B34
+    .string "CINNABAR GYM's BLAINE is quite the\n"
+    .string "odd fellow.\p"
+    .string "He's lived on the island since way\n"
+    .string "before the LAB was built.$"
+
+gUnknown_8180BA0:: @ 8180BA0
+    .string "Scientists conduct experiments \n"
+    .string "in the burned-out building.\p"
+    .string "You know, the one they call the\n"
+    .string "POKéMON MANSION.$"
+
+gUnknown_8180C0D:: @ 8180C0D
+    .string "CINNABAR ISLAND\n"
+    .string "The Fiery Town of Burning Desire$"
+
+gUnknown_8180C3E:: @ 8180C3E
+    .string "POKéMON LAB$"
+
+gUnknown_8180C4A:: @ 8180C4A
+    .string "CINNABAR ISLAND POKéMON GYM\n"
+    .string "LEADER: BLAINE\l"
+    .string "The Hotheaded Quiz Master!$"
+
+gUnknown_8180C90:: @ 8180C90
+    .string "Huh?\n"
+    .string "Hey, if it isn't {PLAYER}!$"
+
+gUnknown_8180CAA:: @ 8180CAA
+    .string "Look, it's me, BILL.\n"
+    .string "Long time no see!\p"
+    .string "I hope you're still using my\n"
+    .string "PC system.\p"
+    .string "Well, listen, since we met up here,\n"
+    .string "how about spending time with me?\p"
+    .string "There's this little island in the far\n"
+    .string "south called ONE ISLAND.\p"
+    .string "A friend invited me, so I'm on my\n"
+    .string "way out there.\p"
+    .string "How about it?\n"
+    .string "Do you feel like coming with me?$"
+
+gUnknown_8180DDD:: @ 8180DDD
+    .string "All right, then.\n"
+    .string "Let's go!$"
+
+gUnknown_8180DF8:: @ 8180DF8
+    .string "What, are you too busy?\p"
+    .string "Well, all right.\n"
+    .string "The boat hasn't arrived yet anyway.\p"
+    .string "I'll be waiting at the POKéMON\n"
+    .string "CENTER over there.\p"
+    .string "Come see me when you're done with\n"
+    .string "your business here.$"
+
+gUnknown_8180EAD:: @ 8180EAD
+    .string "Looks like my pal's boat arrived,\n"
+    .string "too.\p"
+    .string "He sent it specially here to\n"
+    .string "CINNABAR to pick me up.$"
+
+gUnknown_8180F09:: @ 8180F09
+    .string "Hey, wasn't that a long cruise?\p"
+    .string "My buddy CELIO seemed to enjoy\n"
+    .string "your company.\p"
+    .string "I'm sure he'd welcome you if you\n"
+    .string "were to visit him again.\p"
+    .string "If you have a TRI-PASS, you can\n"
+    .string "always take a ferry there from\l"
+    .string "VERMILION PORT.\p"
+    .string "All right, thanks for your company!$"
+
diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json
new file mode 100644
index 000000000..c583ac2f9
--- /dev/null
+++ b/data/maps/CinnabarIsland_Gym/map.json
@@ -0,0 +1,265 @@
+{
+  "id": "MAP_CINNABAR_ISLAND_GYM",
+  "name": "CinnabarIsland_Gym",
+  "layout": "LAYOUT_CINNABAR_ISLAND_GYM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "52",
+      "x": 25,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DB27",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 25,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DA7F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DA96",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 16,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DB53",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 16,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DAC2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 4,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DB7F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 4,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DAFB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "86",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16D9D4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 24,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DBAB",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 24,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 25,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 26,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 23,
+      "y": 20,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DBCA"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 27,
+      "y": 20,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DBCA"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 22,
+      "y": 10,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DBE8"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 23,
+      "y": 10,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DBF4"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 15,
+      "y": 2,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DCDD"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 16,
+      "y": 2,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DCE9"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 13,
+      "y": 10,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DDBB"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 14,
+      "y": 10,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DDC7"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 13,
+      "y": 17,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DE92"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 14,
+      "y": 17,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DE9E"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 1,
+      "y": 18,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DF69"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 2,
+      "y": 18,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16DF75"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 1,
+      "y": 10,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16E040"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 2,
+      "y": 10,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_16E04C"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "script": "CinnabarIsland_Gym_EventScript_1ACF07"
+    }
+  ]
+}
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
new file mode 100644
index 000000000..87461a536
--- /dev/null
+++ b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -0,0 +1,777 @@
+CinnabarIsland_Gym_MapScripts:: @ 816D94B
+	map_script 1, CinnabarIsland_Gym_MapScript1_16D951
+	.byte 0
+
+CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951
+	checkflag FLAG_0x4B6
+	goto_if_eq EventScript_16D991
+	checkflag FLAG_0x265
+	call_if 1, EventScript_16D9B0
+	checkflag FLAG_0x267
+	call_if 1, EventScript_16D9B6
+	checkflag FLAG_0x268
+	call_if 1, EventScript_16D9BC
+	checkflag FLAG_0x269
+	call_if 1, EventScript_16D9C2
+	checkflag FLAG_0x26A
+	call_if 1, EventScript_16D9C8
+	checkflag FLAG_0x26B
+	call_if 1, EventScript_16D9CE
+	end
+
+EventScript_16D991:: @ 816D991
+	call EventScript_16E117
+	call EventScript_16E157
+	call EventScript_16E197
+	call EventScript_16E1D7
+	call EventScript_16E1F3
+	call EventScript_16E233
+	end
+
+EventScript_16D9B0:: @ 816D9B0
+	call EventScript_16E117
+	return
+
+EventScript_16D9B6:: @ 816D9B6
+	call EventScript_16E157
+	return
+
+EventScript_16D9BC:: @ 816D9BC
+	call EventScript_16E197
+	return
+
+EventScript_16D9C2:: @ 816D9C2
+	call EventScript_16E1D7
+	return
+
+EventScript_16D9C8:: @ 816D9C8
+	call EventScript_16E1F3
+	return
+
+EventScript_16D9CE:: @ 816D9CE
+	call EventScript_16E233
+	return
+
+CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06
+	checkflag FLAG_0x24E
+	goto_if 0, EventScript_16DA34
+	msgbox gUnknown_819971D
+	release
+	end
+
+EventScript_16DA06:: @ 816DA06
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	setflag FLAG_0x4B6
+	setflag FLAG_UNK826
+	setrespawn SPAWN_CINNABAR_ISLAND
+	setvar VAR_0x4071, 1
+	clearflag FLAG_0x062
+	setvar VAR_0x8008, 7
+	call EventScript_1A6B18
+	goto EventScript_16DA34
+	end
+
+EventScript_16DA34:: @ 816DA34
+	msgbox gUnknown_819969E
+	checkitemspace ITEM_TM38, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16DA75
+	additem ITEM_TM38, 1
+	giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38
+	setflag FLAG_0x24E
+	msgbox gUnknown_8199652
+	release
+	end
+
+EventScript_16DA75:: @ 816DA75
+	msgbox gUnknown_8199789
+	release
+	end
+
+CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F
+	trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6
+	msgbox gUnknown_81997EA, 6
+	end
+
+CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96
+	trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
+	msgbox gUnknown_8199911, 6
+	end
+
+EventScript_16DAB1:: @ 816DAB1
+	checkflag FLAG_0x267
+	call_if 0, EventScript_16DABC
+	release
+	end
+
+EventScript_16DABC:: @ 816DABC
+	call EventScript_16DD31
+	return
+
+CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
+	trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_81999DF, 6
+	end
+
+EventScript_16DAEA:: @ 816DAEA
+	checkflag FLAG_0x269
+	call_if 0, EventScript_16DAF5
+	release
+	end
+
+EventScript_16DAF5:: @ 816DAF5
+	call EventScript_16DEE6
+	return
+
+CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB
+	trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16
+	msgbox gUnknown_8199B27, 6
+	end
+
+EventScript_16DB16:: @ 816DB16
+	checkflag FLAG_0x26B
+	call_if 0, EventScript_16DB21
+	release
+	end
+
+EventScript_16DB21:: @ 816DB21
+	call EventScript_16E094
+	return
+
+CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27
+	trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42
+	msgbox gUnknown_819987D, 6
+	end
+
+EventScript_16DB42:: @ 816DB42
+	checkflag FLAG_0x265
+	call_if 0, EventScript_16DB4D
+	release
+	end
+
+EventScript_16DB4D:: @ 816DB4D
+	call EventScript_16DC58
+	return
+
+CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53
+	trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E
+	msgbox gUnknown_8199986, 6
+	end
+
+EventScript_16DB6E:: @ 816DB6E
+	checkflag FLAG_0x268
+	call_if 0, EventScript_16DB79
+	release
+	end
+
+EventScript_16DB79:: @ 816DB79
+	call EventScript_16DE0F
+	return
+
+CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F
+	trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
+	msgbox gUnknown_8199AC9, 6
+	end
+
+EventScript_16DB9A:: @ 816DB9A
+	checkflag FLAG_0x26A
+	call_if 0, EventScript_16DBA5
+	release
+	end
+
+EventScript_16DBA5:: @ 816DBA5
+	call EventScript_16DFBD
+	return
+
+CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB
+	lock
+	faceplayer
+	checkflag FLAG_0x4B6
+	goto_if_eq EventScript_16DBC0
+	msgbox gUnknown_8199B81
+	release
+	end
+
+EventScript_16DBC0:: @ 816DBC0
+	msgbox gUnknown_8199C0C
+	release
+	end
+
+CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA
+	lockall
+	checkflag FLAG_UNK826
+	goto_if_eq EventScript_16DBDE
+	msgbox gUnknown_8199C29
+	releaseall
+	end
+
+EventScript_16DBDE:: @ 816DBDE
+	msgbox gUnknown_8199C62
+	releaseall
+	end
+
+CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16DC00
+	end
+
+CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16DC00
+	end
+
+EventScript_16DC00:: @ 816DC00
+	msgbox gUnknown_8199C9F
+	msgbox gUnknown_8199D5A, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16DC43
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16DC6A
+	end
+
+EventScript_16DC27:: @ 816DC27
+	playfanfare MUS_FANFA1
+	waitfanfare
+	msgbox gUnknown_8199E4F
+	return
+
+EventScript_16DC34:: @ 816DC34
+	waitse
+	playse SE_BOO
+	waitse
+	msgbox gUnknown_8199E79
+	closemessage
+	return
+
+EventScript_16DC43:: @ 816DC43
+	call EventScript_16DC27
+	checkflag FLAG_0x265
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DC58
+	releaseall
+	end
+
+EventScript_16DC58:: @ 816DC58
+	playse SE_FU_ZAKU2
+	waitse
+	call EventScript_16E117
+	special DrawWholeMapView
+	setflag FLAG_0x265
+	return
+
+EventScript_16DC68:: @ 816DC68
+	releaseall
+	end
+
+EventScript_16DC6A:: @ 816DC6A
+	call EventScript_16DC34
+	checktrainerflag FLAG_0x0D5
+	goto_if 0, EventScript_16DC7A
+	releaseall
+	end
+
+EventScript_16DC7A:: @ 816DC7A
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16DCB4
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16DCC6
+	textcolor 0
+	msgbox gUnknown_819983F
+	trainerbattle 3, 213, 0, Text_199870
+	checkflag FLAG_0x265
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DC58
+	releaseall
+	end
+
+EventScript_16DCB4:: @ 816DCB4
+	applymovement 255, Movement_1A75EB
+	applymovement 1, Movement_16DCD8
+	waitmovement 0
+	return
+
+EventScript_16DCC6:: @ 816DCC6
+	applymovement 255, Movement_1A75EB
+	applymovement 1, Movement_16DCDB
+	waitmovement 0
+	return
+
+Movement_16DCD8:: @ 816DCD8
+	step_12
+	step_12
+	step_end
+
+Movement_16DCDB:: @ 816DCDB
+	step_12
+	step_end
+
+CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16DCF5
+	end
+
+CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16DCF5
+	end
+
+EventScript_16DCF5:: @ 816DCF5
+	msgbox gUnknown_8199C9F
+	msgbox gUnknown_8199D79, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16DD41
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16DD1C
+	end
+
+EventScript_16DD1C:: @ 816DD1C
+	call EventScript_16DC27
+	checkflag FLAG_0x267
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DD31
+	releaseall
+	end
+
+EventScript_16DD31:: @ 816DD31
+	playse SE_FU_ZAKU2
+	waitse
+	call EventScript_16E157
+	special DrawWholeMapView
+	setflag FLAG_0x267
+	return
+
+EventScript_16DD41:: @ 816DD41
+	call EventScript_16DC34
+	checktrainerflag FLAG_0x0B2
+	goto_if 0, EventScript_16DD51
+	releaseall
+	end
+
+EventScript_16DD51:: @ 816DD51
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16DD8B
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16DD9D
+	textcolor 0
+	msgbox gUnknown_81998BD
+	trainerbattle 3, 178, 0, Text_1998ED
+	checkflag FLAG_0x267
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DD31
+	releaseall
+	end
+
+EventScript_16DD8B:: @ 816DD8B
+	applymovement 255, Movement_16DDB7
+	applymovement 3, Movement_16DDAF
+	waitmovement 0
+	return
+
+EventScript_16DD9D:: @ 816DD9D
+	applymovement 255, Movement_16DDB7
+	applymovement 3, Movement_16DDB3
+	waitmovement 0
+	return
+
+Movement_16DDAF:: @ 816DDAF
+	step_11
+	step_11
+	step_12
+	step_end
+
+Movement_16DDB3:: @ 816DDB3
+	step_11
+	step_11
+	step_2f
+	step_end
+
+Movement_16DDB7:: @ 816DDB7
+	step_1c
+	step_1c
+	step_30
+	step_end
+
+CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16DDD3
+	end
+
+CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16DDD3
+	end
+
+EventScript_16DDD3:: @ 816DDD3
+	msgbox gUnknown_8199C9F
+	msgbox gUnknown_8199DA9, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16DE1F
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16DDFA
+	end
+
+EventScript_16DDFA:: @ 816DDFA
+	call EventScript_16DC27
+	checkflag FLAG_0x268
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DE0F
+	releaseall
+	end
+
+EventScript_16DE0F:: @ 816DE0F
+	playse SE_FU_ZAKU2
+	waitse
+	call EventScript_16E197
+	special DrawWholeMapView
+	setflag FLAG_0x268
+	return
+
+EventScript_16DE1F:: @ 816DE1F
+	call EventScript_16DC34
+	checktrainerflag FLAG_0x0D6
+	goto_if 0, EventScript_16DE2F
+	releaseall
+	end
+
+EventScript_16DE2F:: @ 816DE2F
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16DE69
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16DE7B
+	textcolor 0
+	msgbox gUnknown_8199948
+	trainerbattle 3, 214, 0, Text_199973
+	checkflag FLAG_0x268
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DE0F
+	releaseall
+	end
+
+EventScript_16DE69:: @ 816DE69
+	applymovement 255, Movement_1A75EB
+	applymovement 4, Movement_16DE8D
+	waitmovement 0
+	return
+
+EventScript_16DE7B:: @ 816DE7B
+	applymovement 255, Movement_1A75EB
+	applymovement 4, Movement_16DE90
+	waitmovement 0
+	return
+
+Movement_16DE8D:: @ 816DE8D
+	step_12
+	step_12
+	step_end
+
+Movement_16DE90:: @ 816DE90
+	step_12
+	step_end
+
+CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16DEAA
+	end
+
+CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16DEAA
+	end
+
+EventScript_16DEAA:: @ 816DEAA
+	msgbox gUnknown_8199C9F
+	msgbox gUnknown_8199DC6, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16DEF6
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16DED1
+	end
+
+EventScript_16DED1:: @ 816DED1
+	call EventScript_16DC27
+	checkflag FLAG_0x269
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DEE6
+	releaseall
+	end
+
+EventScript_16DEE6:: @ 816DEE6
+	playse SE_FU_ZAKU2
+	waitse
+	call EventScript_16E1D7
+	special DrawWholeMapView
+	setflag FLAG_0x269
+	return
+
+EventScript_16DEF6:: @ 816DEF6
+	call EventScript_16DC34
+	checktrainerflag FLAG_0x0B3
+	goto_if 0, EventScript_16DF06
+	releaseall
+	end
+
+EventScript_16DF06:: @ 816DF06
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16DF40
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16DF52
+	textcolor 0
+	msgbox gUnknown_81999B7
+	trainerbattle 3, 179, 0, Text_1999DB
+	checkflag FLAG_0x269
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DEE6
+	releaseall
+	end
+
+EventScript_16DF40:: @ 816DF40
+	applymovement 255, Movement_1A75EB
+	applymovement 5, Movement_16DF64
+	waitmovement 0
+	return
+
+EventScript_16DF52:: @ 816DF52
+	applymovement 255, Movement_1A75EB
+	applymovement 5, Movement_16DF67
+	waitmovement 0
+	return
+
+Movement_16DF64:: @ 816DF64
+	step_12
+	step_12
+	step_end
+
+Movement_16DF67:: @ 816DF67
+	step_12
+	step_end
+
+CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16DF81
+	end
+
+CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16DF81
+	end
+
+EventScript_16DF81:: @ 816DF81
+	msgbox gUnknown_8199C9F
+	msgbox gUnknown_8199E00, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16DFA8
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16DFCD
+	end
+
+EventScript_16DFA8:: @ 816DFA8
+	call EventScript_16DC27
+	checkflag FLAG_0x26A
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DFBD
+	releaseall
+	end
+
+EventScript_16DFBD:: @ 816DFBD
+	playse SE_FU_ZAKU2
+	waitse
+	call EventScript_16E1F3
+	special DrawWholeMapView
+	setflag FLAG_0x26A
+	return
+
+EventScript_16DFCD:: @ 816DFCD
+	call EventScript_16DC34
+	checktrainerflag FLAG_0x0D7
+	goto_if 0, EventScript_16DFDD
+	releaseall
+	end
+
+EventScript_16DFDD:: @ 816DFDD
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16E017
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16E029
+	textcolor 0
+	msgbox gUnknown_8199A7F
+	trainerbattle 3, 215, 0, Text_199AB9
+	checkflag FLAG_0x26A
+	goto_if_eq EventScript_16DC68
+	call EventScript_16DFBD
+	releaseall
+	end
+
+EventScript_16E017:: @ 816E017
+	applymovement 255, Movement_1A75EB
+	applymovement 6, Movement_16E03B
+	waitmovement 0
+	return
+
+EventScript_16E029:: @ 816E029
+	applymovement 255, Movement_1A75EB
+	applymovement 6, Movement_16E03E
+	waitmovement 0
+	return
+
+Movement_16E03B:: @ 816E03B
+	step_12
+	step_12
+	step_end
+
+Movement_16E03E:: @ 816E03E
+	step_12
+	step_end
+
+CinnabarIsland_Gym_EventScript_16E040:: @ 816E040
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16E058
+	end
+
+CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16E058
+	end
+
+EventScript_16E058:: @ 816E058
+	msgbox gUnknown_8199C9F
+	msgbox gUnknown_8199E36, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E0A4
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E07F
+	end
+
+EventScript_16E07F:: @ 816E07F
+	call EventScript_16DC27
+	checkflag FLAG_0x26B
+	goto_if_eq EventScript_16DC68
+	call EventScript_16E094
+	releaseall
+	end
+
+EventScript_16E094:: @ 816E094
+	playse SE_FU_ZAKU2
+	waitse
+	call EventScript_16E233
+	special DrawWholeMapView
+	setflag FLAG_0x26B
+	return
+
+EventScript_16E0A4:: @ 816E0A4
+	call EventScript_16DC34
+	checktrainerflag FLAG_0x0B4
+	goto_if 0, EventScript_16E0B4
+	releaseall
+	end
+
+EventScript_16E0B4:: @ 816E0B4
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16E0EE
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16E100
+	textcolor 0
+	msgbox gUnknown_8199AFC
+	trainerbattle 3, 180, 0, Text_199B16
+	checkflag FLAG_0x26B
+	goto_if_eq EventScript_16DC68
+	call EventScript_16E094
+	releaseall
+	end
+
+EventScript_16E0EE:: @ 816E0EE
+	applymovement 255, Movement_1A75EB
+	applymovement 7, Movement_16E112
+	waitmovement 0
+	return
+
+EventScript_16E100:: @ 816E100
+	applymovement 255, Movement_1A75EB
+	applymovement 7, Movement_16E115
+	waitmovement 0
+	return
+
+Movement_16E112:: @ 816E112
+	step_12
+	step_12
+	step_end
+
+Movement_16E115:: @ 816E115
+	step_12
+	step_end
+
+EventScript_16E117:: @ 816E117
+	setmetatile 26, 8, 711, 0
+	setmetatile 27, 8, 710, 0
+	setmetatile 26, 9, 719, 0
+	setmetatile 27, 9, 718, 0
+	setmetatile 26, 10, 649, 0
+	setmetatile 27, 10, 641, 0
+	setmetatile 28, 10, 642, 0
+	return
+
+EventScript_16E157:: @ 816E157
+	setmetatile 17, 8, 711, 0
+	setmetatile 18, 8, 710, 0
+	setmetatile 17, 9, 719, 0
+	setmetatile 18, 9, 718, 0
+	setmetatile 17, 10, 649, 0
+	setmetatile 18, 10, 641, 0
+	setmetatile 19, 10, 642, 0
+	return
+
+EventScript_16E197:: @ 816E197
+	setmetatile 17, 15, 711, 0
+	setmetatile 18, 15, 710, 0
+	setmetatile 17, 16, 719, 0
+	setmetatile 18, 16, 718, 0
+	setmetatile 17, 17, 649, 0
+	setmetatile 18, 17, 641, 0
+	setmetatile 19, 17, 642, 0
+	return
+
+EventScript_16E1D7:: @ 816E1D7
+	setmetatile 11, 21, 721, 1
+	setmetatile 11, 22, 649, 0
+	setmetatile 11, 23, 641, 0
+	return
+
+EventScript_16E1F3:: @ 816E1F3
+	setmetatile 5, 16, 711, 0
+	setmetatile 6, 16, 710, 0
+	setmetatile 5, 17, 719, 0
+	setmetatile 6, 17, 718, 0
+	setmetatile 5, 18, 649, 0
+	setmetatile 6, 18, 641, 0
+	setmetatile 7, 18, 642, 0
+	return
+
+EventScript_16E233:: @ 816E233
+	setmetatile 5, 8, 711, 0
+	setmetatile 6, 8, 710, 0
+	setmetatile 5, 9, 719, 0
+	setmetatile 6, 9, 718, 0
+	setmetatile 5, 10, 649, 0
+	setmetatile 6, 10, 641, 0
+	setmetatile 7, 10, 642, 0
+	return
diff --git a/data/maps/CinnabarIsland_Gym/text.inc b/data/maps/CinnabarIsland_Gym/text.inc
new file mode 100644
index 000000000..e5ceccbd4
--- /dev/null
+++ b/data/maps/CinnabarIsland_Gym/text.inc
@@ -0,0 +1,196 @@
+Text_199543:: @ 8199543
+    .string "Hah!\p"
+    .string "I am BLAINE, the red-hot LEADER\n"
+    .string "of CINNABAR GYM!\p"
+    .string "My fiery POKéMON are all rough\n"
+    .string "and ready with intense heat!\p"
+    .string "They incinerate all challengers!\p"
+    .string "Hah!\n"
+    .string "You better have BURN HEAL!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+Text_1995FA:: @ 81995FA
+    .string "I have burned down to nothing!\n"
+    .string "Not even ashes remain!\p"
+    .string "You have earned the VOLCANOBADGE.$"
+
+gUnknown_8199652:: @ 8199652
+    .string "FIRE BLAST is the ultimate fire\n"
+    .string "technique.\p"
+    .string "Don't waste it on WATER POKéMON.$"
+
+gUnknown_819969E:: @ 819969E
+    .string "Hah!\p"
+    .string "The VOLCANOBADGE heightens the\n"
+    .string "SPECIAL stats of your POKéMON.\p"
+    .string "Here, you can have this, too!$"
+
+gUnknown_81996FF:: @ 81996FF
+    .string "{PLAYER} received TM38\n"
+    .string "from BLAINE.$"
+
+gUnknown_819971D:: @ 819971D
+    .string "TM38 contains FIRE BLAST.\n"
+    .string "Teach it to FIRE-type POKéMON.\p"
+    .string "VULPIX or CHARMELEON would be\n"
+    .string "ideal for that move.$"
+
+gUnknown_8199789:: @ 8199789
+    .string "Make space for this, child!$"
+
+Text_1997A5:: @ 81997A5
+    .string "Do you know how hot POKéMON fire\n"
+    .string "breath can get?$"
+
+Text_1997D6:: @ 81997D6
+    .string "Yow!\n"
+    .string "Hot, hot, hot!$"
+
+gUnknown_81997EA:: @ 81997EA
+    .string "Fire, or to be more precise,\n"
+    .string "combustion…\p"
+    .string "…Oxygen in the air…\n"
+    .string "Blah, blah, blah, blah…$"
+
+Text_19983F:: @ 819983F
+gUnknown_819983F:: @ 819983F
+    .string "I was a thief, but I went straight\n"
+    .string "as a TRAINER.$"
+
+Text_199870:: @ 8199870
+    .string "I surrender!$"
+
+gUnknown_819987D:: @ 819987D
+    .string "I get this uncontrollable urge to\n"
+    .string "steal other people's POKéMON.$"
+
+Text_1998BD:: @ 81998BD
+gUnknown_81998BD:: @ 81998BD
+    .string "I've studied POKéMON thoroughly.\n"
+    .string "You can't win!$"
+
+Text_1998ED:: @ 81998ED
+    .string "Waah!\n"
+    .string "My studies were insufficient!$"
+
+gUnknown_8199911:: @ 8199911
+    .string "My theories are too complicated\n"
+    .string "for you to understand.$"
+
+Text_199948:: @ 8199948
+gUnknown_8199948:: @ 8199948
+    .string "I like using FIRE-type POKéMON.\n"
+    .string "I just do.$"
+
+Text_199973:: @ 8199973
+    .string "Too hot to handle!$"
+
+gUnknown_8199986:: @ 8199986
+    .string "I wish there were a thief POKéMON.\n"
+    .string "I'd use that!$"
+
+Text_1999B7:: @ 81999B7
+gUnknown_81999B7:: @ 81999B7
+    .string "I know why BLAINE became a\n"
+    .string "TRAINER.$"
+
+Text_1999DB:: @ 81999DB
+    .string "Ow!$"
+
+gUnknown_81999DF:: @ 81999DF
+    .string "Our LEADER, BLAINE, became lost\n"
+    .string "in the mountains but good.\p"
+    .string "Night fell when a fiery bird\n"
+    .string "POKéMON appeared.\p"
+    .string "Its light allowed BLAINE to find\n"
+    .string "his way down safely.$"
+
+Text_199A7F:: @ 8199A7F
+gUnknown_8199A7F:: @ 8199A7F
+    .string "I've been to many GYMS, but this\n"
+    .string "one best suits my style.$"
+
+Text_199AB9:: @ 8199AB9
+    .string "Yowza!\n"
+    .string "Too hot!$"
+
+gUnknown_8199AC9:: @ 8199AC9
+    .string "PONYTA, NINETALES…\n"
+    .string "Those are popular FIRE POKéMON.$"
+
+Text_199AFC:: @ 8199AFC
+gUnknown_8199AFC:: @ 8199AFC
+    .string "Fire is weak against H2O.$"
+
+Text_199B16:: @ 8199B16
+    .string "Oh!\n"
+    .string "Snuffed out!$"
+
+gUnknown_8199B27:: @ 8199B27
+    .string "Water beats fire, of course.\p"
+    .string "But fire melts ice, so the FIRE\n"
+    .string "type beats ICE-type POKéMON.$"
+
+gUnknown_8199B81:: @ 8199B81
+    .string "Yo!\n"
+    .string "Champ in the making!\p"
+    .string "The hotheaded BLAINE is a FIRE\n"
+    .string "POKéMON pro.\p"
+    .string "Douse his spirits with water!\p"
+    .string "You'd better take some\n"
+    .string "BURN HEALS, too.$"
+
+gUnknown_8199C0C:: @ 8199C0C
+    .string "{PLAYER}!\n"
+    .string "You beat that firebrand!$"
+
+gUnknown_8199C29:: @ 8199C29
+    .string "CINNABAR POKéMON GYM\n"
+    .string "LEADER: BLAINE\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}$"
+
+gUnknown_8199C62:: @ 8199C62
+    .string "CINNABAR POKéMON GYM\n"
+    .string "LEADER: BLAINE\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}, {PLAYER}$"
+
+gUnknown_8199C9F:: @ 8199C9F
+    .string "POKéMON Quiz!\p"
+    .string "Get it right, and the door opens to\n"
+    .string "the next room.\p"
+    .string "Get it wrong, and face a TRAINER!\p"
+    .string "If you want to conserve your\n"
+    .string "POKéMON for the GYM LEADER…\p"
+    .string "Then get it right!\n"
+    .string "Here we go!$"
+
+gUnknown_8199D5A:: @ 8199D5A
+    .string "CATERPIE evolves into METAPOD?$"
+
+gUnknown_8199D79:: @ 8199D79
+    .string "There are nine certified POKéMON\n"
+    .string "LEAGUE BADGES?$"
+
+gUnknown_8199DA9:: @ 8199DA9
+    .string "POLIWAG evolves three times?$"
+
+gUnknown_8199DC6:: @ 8199DC6
+    .string "Are electric moves effective\n"
+    .string "against GROUND-type POKéMON?$"
+
+gUnknown_8199E00:: @ 8199E00
+    .string "POKéMON of the same kind and level\n"
+    .string "are not identical?$"
+
+gUnknown_8199E36:: @ 8199E36
+    .string "TM28 contains TOMBSTONY?$"
+
+gUnknown_8199E4F:: @ 8199E4F
+    .string "You're absolutely correct!\p"
+    .string "Go on through!$"
+
+gUnknown_8199E79:: @ 8199E79
+    .string "Sorry!\n"
+    .string "Bad call!$"
+
diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json
new file mode 100644
index 000000000..fa0972302
--- /dev/null
+++ b/data/maps/CinnabarIsland_Mart/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_CINNABAR_ISLAND_MART",
+  "name": "CinnabarIsland_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Mart_EventScript_16EA22",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Mart_EventScript_16EA10",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_Mart_EventScript_16EA19",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc
new file mode 100644
index 000000000..c82034dd0
--- /dev/null
+++ b/data/maps/CinnabarIsland_Mart/scripts.inc
@@ -0,0 +1,36 @@
+CinnabarIsland_Mart_MapScripts:: @ 816EA0F
+	.byte 0
+
+CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10
+	msgbox gUnknown_819A7A0, 2
+	end
+
+CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
+	msgbox gUnknown_819A7F1, 2
+	end
+
+CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16EA48
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16EA48:: @ 816EA48
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/CinnabarIsland_Mart/text.inc b/data/maps/CinnabarIsland_Mart/text.inc
new file mode 100644
index 000000000..189baff6a
--- /dev/null
+++ b/data/maps/CinnabarIsland_Mart/text.inc
@@ -0,0 +1,9 @@
+gUnknown_819A7A0:: @ 819A7A0
+    .string "Don't they have X ATTACK?\p"
+    .string "I like it because it raises the\n"
+    .string "ATTACK stat in battle.$"
+
+gUnknown_819A7F1:: @ 819A7F1
+    .string "It never hurts to have extra items.\n"
+    .string "You never know what might happen.$"
+
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..134d89ac8
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
@@ -0,0 +1,140 @@
+{
+  "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
+  "name": "CinnabarIsland_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E901",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "73",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A",
+      "flag": "162"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..53eb545d6
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,144 @@
+CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7
+	map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2
+	map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2
+	setrespawn SPAWN_CINNABAR_ISLAND
+	end
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF
+	msgbox gUnknown_819A5BE, 2
+	end
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8
+	msgbox gUnknown_819A4F8, 2
+	end
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901
+	msgbox gUnknown_819A6B1, 2
+	end
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
+	lock
+	faceplayer
+	msgbox gUnknown_819A725, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E9A5
+	msgbox gUnknown_819A785
+	closemessage
+	playbgm BGM_FRLG_FOLLOW_ME, 1
+	savebgm BGM_FRLG_FOLLOW_ME
+	setflag FLAG_SPECIAL_FLAG_0x4001
+	setflag FLAG_0x0A2
+	delay 20
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_16E96F
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_16E981
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_16E993
+	removeobject 7
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
+	clearflag FLAG_0x062
+	warp MAP_CINNABAR_ISLAND, 255, 14, 11
+	waitstate
+	release
+	end
+
+EventScript_16E96F:: @ 816E96F
+	applymovement 7, Movement_16E9AF
+	applymovement 255, Movement_16E9B9
+	waitmovement 0
+	return
+
+EventScript_16E981:: @ 816E981
+	applymovement 7, Movement_16E9C3
+	applymovement 255, Movement_16E9CF
+	waitmovement 0
+	return
+
+EventScript_16E993:: @ 816E993
+	applymovement 7, Movement_16E9AF
+	applymovement 255, Movement_16E9DE
+	waitmovement 0
+	return
+
+EventScript_16E9A5:: @ 816E9A5
+	msgbox gUnknown_819A766
+	release
+	end
+
+Movement_16E9AF:: @ 816E9AF
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_1b
+	step_60
+	step_end
+
+Movement_16E9B9:: @ 816E9B9
+	step_10
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_1c
+	step_10
+	step_end
+
+Movement_16E9C3:: @ 816E9C3
+	step_11
+	step_12
+	step_12
+	step_10
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_1b
+	step_60
+	step_end
+
+Movement_16E9CF:: @ 816E9CF
+	step_1c
+	step_1c
+	step_1c
+	step_02
+	step_1c
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_1b
+	step_10
+	step_1b
+	step_60
+	step_end
+
+Movement_16E9DE:: @ 816E9DE
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_1c
+	step_10
+	step_end
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..c88fbbf28
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc
@@ -0,0 +1,38 @@
+gUnknown_819A4F8:: @ 819A4F8
+    .string "I came to visit the CINNABAR GYM,\n"
+    .string "but the door is locked tight.\p"
+    .string "There should be a key for it\n"
+    .string "somewhere.\p"
+    .string "Could it be in that burned-out\n"
+    .string "mansion?\p"
+    .string "The GYM LEADER's friend used to\n"
+    .string "live there, they say.$"
+
+gUnknown_819A5BE:: @ 819A5BE
+    .string "Do you have lots of friends?\p"
+    .string "Linking up with the usual friends\n"
+    .string "is fun, of course.\p"
+    .string "But how about visiting the\n"
+    .string "UNION ROOM every so often?\p"
+    .string "Who knows, you may end up making\n"
+    .string "new friends.\p"
+    .string "I think it would be worth your time\n"
+    .string "to check the UNION ROOM.$"
+
+gUnknown_819A6B1:: @ 819A6B1
+    .string "POKéMON can still learn techniques\n"
+    .string "after canceling evolution.\p"
+    .string "Evolution can wait until new moves\n"
+    .string "have been learned.$"
+
+gUnknown_819A725:: @ 819A725
+    .string "BILL: Hey, you kept me waiting!\n"
+    .string "Ready to set sail to ONE ISLAND?$"
+
+gUnknown_819A766:: @ 819A766
+    .string "Oh, you're still not done yet?$"
+
+gUnknown_819A785:: @ 819A785
+    .string "Well, that's it.\n"
+    .string "Let's go!$"
+
diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..181acc569
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F",
+  "name": "CinnabarIsland_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..828f9296a
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8
+	map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD
+	call EventScript_1BB4A3
+	end
+
+EventScript_16EA03:: @ 816EA03
+	call EventScript_1BB6AB
+	end
+
+EventScript_16EA09:: @ 816EA09
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
new file mode 100644
index 000000000..f1ee3023b
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
@@ -0,0 +1,105 @@
+{
+  "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
+  "name": "CinnabarIsland_PokemonLab_Entrance",
+  "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
+  "music": "BGM_FRLG_CINNABAR_ISLAND",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 25,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E294"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 18,
+      "y": 5,
+      "elevation": 0,
+      "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 24,
+      "y": 5,
+      "elevation": 0,
+      "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF"
+    }
+  ]
+}
diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc
new file mode 100644
index 000000000..5da8c3e89
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc
@@ -0,0 +1,32 @@
+CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273
+	map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279
+	.byte 0
+
+CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279
+	compare_var_to_value VAR_0x406A, 1
+	call_if 1, EventScript_16E285
+	end
+
+EventScript_16E285:: @ 816E285
+	setvar VAR_0x406A, 2
+	return
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B
+	msgbox gUnknown_8199EE5, 2
+	end
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294
+	msgbox gUnknown_8199F41, 3
+	end
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D
+	msgbox gUnknown_8199F6A, 3
+	end
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6
+	msgbox gUnknown_8199F83, 3
+	end
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF
+	msgbox gUnknown_8199F9A, 3
+	end
diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc
new file mode 100644
index 000000000..a14866bd4
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc
@@ -0,0 +1,28 @@
+Text_199E8A:: @ 8199E8A
+    .string "It's a photo of BLAINE and\n"
+    .string "MR. FUJI.\p"
+    .string "They're standing shoulder to\n"
+    .string "shoulder with big grins.$"
+
+gUnknown_8199EE5:: @ 8199EE5
+    .string "We study POKéMON extensively\n"
+    .string "every day.\p"
+    .string "People often bring us rare POKéMON\n"
+    .string "for examination.$"
+
+gUnknown_8199F41:: @ 8199F41
+    .string "A photo of the LAB's founder…\n"
+    .string "DR. FUJI?!$"
+
+gUnknown_8199F6A:: @ 8199F6A
+    .string "POKéMON LAB\n"
+    .string "Meeting Room$"
+
+gUnknown_8199F83:: @ 8199F83
+    .string "POKéMON LAB\n"
+    .string "R & D Room$"
+
+gUnknown_8199F9A:: @ 8199F9A
+    .string "POKéMON LAB\n"
+    .string "Testing Room$"
+
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
new file mode 100644
index 000000000..7c7ac1268
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
+  "name": "CinnabarIsland_PokemonLab_ExperimentRoom",
+  "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
+  "music": "BGM_FRLG_CINNABAR_ISLAND",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "19",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
new file mode 100644
index 000000000..3b415bfab
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
@@ -0,0 +1,321 @@
+CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: @ 816E400
+	.byte 0
+
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
+	lock
+	faceplayer
+	setvar VAR_0x8008, 8
+	call EventScript_1A8CAD
+	checkflag FLAG_0x276
+	goto_if_eq EventScript_16E473
+	msgbox gUnknown_81A597B, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E45B
+	call EventScript_1A8CBD
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16E45B
+	call EventScript_1A8CC9
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_16E465
+	call EventScript_1A8CD9
+	msgbox gUnknown_81A59DA
+	setflag FLAG_0x276
+	release
+	end
+
+EventScript_16E45B:: @ 816E45B
+	msgbox gUnknown_81A59B6
+	release
+	end
+
+EventScript_16E465:: @ 816E465
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_81A59C6
+	release
+	end
+
+EventScript_16E473:: @ 816E473
+	msgbox gUnknown_81A59E7
+	release
+	end
+
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
+	lock
+	faceplayer
+	setvar VAR_RESULT, 0
+	checkflag FLAG_0x2EE
+	call_if 1, EventScript_16E8A1
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E897
+	compare_var_to_value VAR_0x406A, 2
+	goto_if_eq EventScript_16E736
+	compare_var_to_value VAR_0x406A, 1
+	goto_if_eq EventScript_16E72C
+	call EventScript_16E4EC
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E544
+	call EventScript_16E504
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E586
+	call EventScript_16E51C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E5C8
+	msgbox gUnknown_819A282
+	goto EventScript_16E53A
+	end
+
+EventScript_16E4EC:: @ 816E4EC
+	checkflag FLAG_0x273
+	goto_if 0, EventScript_16E534
+	checkflag FLAG_0x2ED
+	goto_if_eq EventScript_16E534
+	setvar VAR_RESULT, 1
+	return
+
+EventScript_16E504:: @ 816E504
+	checkflag FLAG_0x272
+	goto_if 0, EventScript_16E534
+	checkflag FLAG_0x2EC
+	goto_if_eq EventScript_16E534
+	setvar VAR_RESULT, 1
+	return
+
+EventScript_16E51C:: @ 816E51C
+	checkflag FLAG_0x25E
+	goto_if 0, EventScript_16E534
+	checkflag FLAG_0x2EE
+	goto_if_eq EventScript_16E534
+	setvar VAR_RESULT, 1
+	return
+
+EventScript_16E534:: @ 816E534
+	setvar VAR_RESULT, 0
+	return
+
+EventScript_16E53A:: @ 816E53A
+	msgbox gUnknown_819A314
+	release
+	end
+
+EventScript_16E544:: @ 816E544
+	message Text_19A282
+	waitmessage
+	call EventScript_16E51C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E5FA
+	multichoice 0, 0, 21, 0
+	switch VAR_RESULT
+	case 0, EventScript_16E668
+	case 1, EventScript_16E53A
+	case 127, EventScript_16E53A
+	end
+
+EventScript_16E586:: @ 816E586
+	message Text_19A282
+	waitmessage
+	call EventScript_16E51C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E631
+	multichoice 0, 0, 22, 0
+	switch VAR_RESULT
+	case 0, EventScript_16E6A6
+	case 1, EventScript_16E53A
+	case 127, EventScript_16E53A
+	end
+
+EventScript_16E5C8:: @ 816E5C8
+	message Text_19A282
+	waitmessage
+	multichoice 0, 0, 23, 0
+	switch VAR_RESULT
+	case 0, EventScript_16E6E4
+	case 1, EventScript_16E53A
+	case 127, EventScript_16E53A
+	end
+
+EventScript_16E5FA:: @ 816E5FA
+	multichoice 0, 0, 24, 0
+	switch VAR_RESULT
+	case 0, EventScript_16E668
+	case 1, EventScript_16E6E4
+	case 2, EventScript_16E53A
+	case 127, EventScript_16E53A
+	end
+
+EventScript_16E631:: @ 816E631
+	multichoice 0, 0, 25, 0
+	switch VAR_RESULT
+	case 0, EventScript_16E6A6
+	case 1, EventScript_16E6E4
+	case 2, EventScript_16E53A
+	case 127, EventScript_16E53A
+	end
+
+EventScript_16E668:: @ 816E668
+	getspeciesname 0, SPECIES_OMANYTE
+	getitemname 1, ITEM_HELIX_FOSSIL
+	msgbox gUnknown_819A3D4, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E722
+	msgbox gUnknown_819A45D
+	textcolor 0
+	removeitem ITEM_HELIX_FOSSIL, 1
+	msgbox gUnknown_819A4AB
+	setvar VAR_0x406A, 1
+	setvar VAR_0x4069, 1
+	release
+	end
+
+EventScript_16E6A6:: @ 816E6A6
+	getspeciesname 0, SPECIES_KABUTO
+	getitemname 1, ITEM_DOME_FOSSIL
+	msgbox gUnknown_819A3D4, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E722
+	msgbox gUnknown_819A45D
+	textcolor 0
+	removeitem ITEM_DOME_FOSSIL, 1
+	msgbox gUnknown_819A4AB
+	setvar VAR_0x406A, 1
+	setvar VAR_0x4069, 2
+	release
+	end
+
+EventScript_16E6E4:: @ 816E6E4
+	getspeciesname 0, SPECIES_AERODACTYL
+	getitemname 1, ITEM_OLD_AMBER
+	msgbox gUnknown_819A3D4, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E722
+	msgbox gUnknown_819A45D
+	textcolor 0
+	removeitem ITEM_OLD_AMBER, 1
+	msgbox gUnknown_819A4AB
+	setvar VAR_0x406A, 1
+	setvar VAR_0x4069, 3
+	release
+	end
+
+EventScript_16E722:: @ 816E722
+	msgbox gUnknown_819A4E1
+	release
+	end
+
+EventScript_16E72C:: @ 816E72C
+	msgbox gUnknown_819A4AB
+	release
+	end
+
+EventScript_16E736:: @ 816E736
+	compare_var_to_value VAR_0x4069, 1
+	goto_if_eq EventScript_16E758
+	compare_var_to_value VAR_0x4069, 2
+	goto_if_eq EventScript_16E79D
+	compare_var_to_value VAR_0x4069, 3
+	goto_if_eq EventScript_16E7E2
+	end
+
+EventScript_16E758:: @ 816E758
+	setvar VAR_0x4001, 138
+	getspeciesname 0, SPECIES_OMANYTE
+	msgbox gUnknown_819A34F
+	givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A927C
+	setflag FLAG_0x2ED
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E827
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E85B
+	end
+
+EventScript_16E79D:: @ 816E79D
+	setvar VAR_0x4001, 140
+	getspeciesname 0, SPECIES_KABUTO
+	msgbox gUnknown_819A34F
+	givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A927C
+	setflag FLAG_0x2EC
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E827
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E85B
+	end
+
+EventScript_16E7E2:: @ 816E7E2
+	setvar VAR_0x4001, 142
+	getspeciesname 0, SPECIES_AERODACTYL
+	msgbox gUnknown_819A34F
+	givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A927C
+	setflag FLAG_0x2EE
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E827
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E85B
+	end
+
+EventScript_16E827:: @ 816E827
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message Text_19A39E
+	waitmessage
+	waitfanfare
+	setvar VAR_0x406A, 0
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E895
+	call EventScript_1A8C27
+	call EventScript_1A74EB
+	goto EventScript_16E895
+	end
+
+EventScript_16E85B:: @ 816E85B
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message Text_19A39E
+	waitmessage
+	waitfanfare
+	setvar VAR_0x406A, 0
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E88A
+	call EventScript_1A8C33
+	goto EventScript_16E88A
+	end
+
+EventScript_16E88A:: @ 816E88A
+	call EventScript_1A8C3C
+	goto EventScript_16E895
+	end
+
+EventScript_16E895:: @ 816E895
+	release
+	end
+
+EventScript_16E897:: @ 816E897
+	msgbox gUnknown_819A4E1
+	release
+	end
+
+EventScript_16E8A1:: @ 816E8A1
+	checkflag FLAG_0x273
+	goto_if_eq EventScript_16E8B9
+	checkflag FLAG_0x272
+	goto_if_eq EventScript_16E8C8
+	goto EventScript_16E534
+	end
+
+EventScript_16E8B9:: @ 816E8B9
+	checkflag FLAG_0x2ED
+	goto_if 0, EventScript_16E534
+	setvar VAR_RESULT, 1
+	return
+
+EventScript_16E8C8:: @ 816E8C8
+	checkflag FLAG_0x2EC
+	goto_if 0, EventScript_16E534
+	setvar VAR_RESULT, 1
+	return
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
new file mode 100644
index 000000000..dda99e8ea
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
@@ -0,0 +1,75 @@
+Text_19A137:: @ 819A137
+    .string "Tch-tch-tch!\n"
+    .string "I'll teach you a nifty move.\p"
+    .string "Teach it to a POKéMON, and watch\n"
+    .string "the fun unfold!\p"
+    .string "It's a move called METRONOME.\n"
+    .string "Does it strike your fancy?$"
+
+Text_19A1CB:: @ 819A1CB
+    .string "I tell you, it's a lot of fun!$"
+
+Text_19A1EA:: @ 819A1EA
+    .string "Okay!\n"
+    .string "Which POKéMON should I teach?$"
+
+Text_19A20E:: @ 819A20E
+    .string "Tch-tch-tch!\n"
+    .string "That's the sound of a METRONOME.\p"
+    .string "It tweaks your POKéMON's brain into\n"
+    .string "using moves it doesn't even know.$"
+
+Text_19A282:: @ 819A282
+gUnknown_819A282:: @ 819A282
+    .string "Hiya!\p"
+    .string "I am important doctor.\n"
+    .string "Yes, very much so, indeed.\p"
+    .string "Here, I study rare POKéMON fossils.\n"
+    .string "All the time, I study.\p"
+    .string "You!\n"
+    .string "Have you a fossil for me?$"
+
+gUnknown_819A314:: @ 819A314
+    .string "No!\n"
+    .string "Is too bad!$"
+
+Text_19A324:: @ 819A324
+    .string "ちょっと　じかん　かかるよ！\p"
+    .string "そこらへんを　すこし\n"
+    .string "ブラブラ　してくると　よろしー！$"
+
+gUnknown_819A34F:: @ 819A34F
+    .string "You late.\n"
+    .string "Where were you?\p"
+    .string "Your fossil is back to life!\n"
+    .string "It was {STR_VAR_1} like I think!$"
+
+Text_19A39E:: @ 819A39E
+    .string "{PLAYER} received the {STR_VAR_1}\n"
+    .string "from the doctor.$"
+
+Text_19A3C2:: @ 819A3C2
+    .string "ポケモン　いっぱいで　もてないね！$"
+
+gUnknown_819A3D4:: @ 819A3D4
+    .string "Oh!\n"
+    .string "That is {STR_VAR_2}, it is!\p"
+    .string "It is fossil of {STR_VAR_1},\n"
+    .string "a POKéMON that is already extinct!\p"
+    .string "My Resurrection Machine will make\n"
+    .string "that POKéMON live again!$"
+
+gUnknown_819A45D:: @ 819A45D
+    .string "So!\n"
+    .string "You hurry and give me that!\p"
+    .string "{SIZE}Á{PLAYER} handed over the\n"
+    .string "{STR_VAR_2} to the weird doctor.$"
+
+gUnknown_819A4AB:: @ 819A4AB
+    .string "I take a little time!\n"
+    .string "You go for walk a little while!$"
+
+gUnknown_819A4E1:: @ 819A4E1
+    .string "Aiyah!\n"
+    .string "You come again!$"
+
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
new file mode 100644
index 000000000..1d9e1aa0e
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
+  "name": "CinnabarIsland_PokemonLab_Lounge",
+  "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
+  "music": "BGM_FRLG_CINNABAR_ISLAND",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "33",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
new file mode 100644
index 000000000..651fe0c76
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
@@ -0,0 +1,92 @@
+CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8
+	.byte 0
+
+CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9
+	msgbox gUnknown_8199FB3, 2
+	end
+
+CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
+	lock
+	faceplayer
+	setvar VAR_0x8008, 6
+	call EventScript_1A8CAD
+	checkflag FLAG_0x274
+	goto_if_eq EventScript_16E334
+	msgbox gUnknown_81A59FE, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E31C
+	call EventScript_1A8CBD
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16E31C
+	call EventScript_1A8CC9
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_16E326
+	call EventScript_1A8CD9
+	msgbox gUnknown_81A5A9D
+	setflag FLAG_0x274
+	release
+	end
+
+EventScript_16E31C:: @ 816E31C
+	msgbox gUnknown_81A5A4E
+	release
+	end
+
+EventScript_16E326:: @ 816E326
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_81A5A6A
+	release
+	end
+
+EventScript_16E334:: @ 816E334
+	msgbox gUnknown_81A5AA5
+	release
+	end
+
+CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
+	lock
+	faceplayer
+	setvar VAR_0x8008, 7
+	copyvar VAR_0x8004, VAR_0x8008
+	specialvar VAR_RESULT, sub_8053A9C
+	copyvar VAR_0x8009, VAR_RESULT
+	checkflag FLAG_0x275
+	goto_if_eq EventScript_16E3D4
+	msgbox gUnknown_81A5AD6, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16E3BC
+	special sub_80BF8FC
+	waitstate
+	copyvar VAR_0x800A, VAR_0x8004
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16E3BC
+	copyvar VAR_0x8005, VAR_0x800A
+	specialvar VAR_RESULT, sub_8053D2C
+	copyvar VAR_0x800B, VAR_RESULT
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_16E3C6
+	copyvar VAR_0x8004, VAR_0x8008
+	copyvar VAR_0x8005, VAR_0x800A
+	special sub_8053D68
+	special sub_8054440
+	waitstate
+	msgbox gUnknown_81A5B4A
+	setflag FLAG_0x275
+	release
+	end
+
+EventScript_16E3BC:: @ 816E3BC
+	msgbox gUnknown_81A5B08
+	release
+	end
+
+EventScript_16E3C6:: @ 816E3C6
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_81A5B18
+	release
+	end
+
+EventScript_16E3D4:: @ 816E3D4
+	msgbox gUnknown_81A5B60
+	release
+	end
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc
new file mode 100644
index 000000000..24d539c13
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc
@@ -0,0 +1,6 @@
+gUnknown_8199FB3:: @ 8199FB3
+    .string "I found this most remarkable fossil\n"
+    .string "inside MT. MOON.\p"
+    .string "I think it's of a rare, prehistoric\n"
+    .string "POKéMON.$"
+
diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
new file mode 100644
index 000000000..83f6135b7
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
+  "name": "CinnabarIsland_PokemonLab_ResearchRoom",
+  "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
+  "music": "BGM_FRLG_CINNABAR_ISLAND",
+  "region_map_section": "MAPSEC_CINNABAR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "52",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE"
+    }
+  ]
+}
diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc
new file mode 100644
index 000000000..e390fd266
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc
@@ -0,0 +1,18 @@
+CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE
+	.byte 0
+
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF
+	goto EventScript_1C4C8E
+	end
+
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5
+	msgbox gUnknown_819A015, 2
+	end
+
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE
+	msgbox gUnknown_819A04A, 3
+	end
+
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7
+	msgbox gUnknown_819A128, 3
+	end
diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc
new file mode 100644
index 000000000..e3343e8e3
--- /dev/null
+++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc
@@ -0,0 +1,19 @@
+gUnknown_819A015:: @ 819A015
+    .string "EEVEE can evolve into one of three\n"
+    .string "kinds of POKéMON.$"
+
+gUnknown_819A04A:: @ 819A04A
+    .string "There's an e-mail message.\p"
+    .string "… … …\p"
+    .string "There are three legendary bird\n"
+    .string "POKéMON.\p"
+    .string "They are ARTICUNO, ZAPDOS, and\n"
+    .string "MOLTRES.\p"
+    .string "Their whereabouts are unknown.\p"
+    .string "We plan to explore the cavern\n"
+    .string "close to CERULEAN.\p"
+    .string "From: POKéMON RESEARCH TEAM…$"
+
+gUnknown_819A128:: @ 819A128
+    .string "An amber pipe!$"
+
diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json
new file mode 100644
index 000000000..202d9fb6a
--- /dev/null
+++ b/data/maps/DiglettsCave_B1F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_DIGLETTS_CAVE_B1F",
+  "name": "DiglettsCave_B1F",
+  "layout": "LAYOUT_DIGLETTS_CAVE_B1F",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_DIGLETTS_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 82,
+      "y": 71,
+      "elevation": 3,
+      "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc
new file mode 100644
index 000000000..28bd063ac
--- /dev/null
+++ b/data/maps/DiglettsCave_B1F/scripts.inc
@@ -0,0 +1,7 @@
+DiglettsCave_B1F_MapScripts:: @ 8160EF1
+	map_script 3, DiglettsCave_B1F_MapScript1_160EF7
+	.byte 0
+
+DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7
+	setworldmapflag FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F
+	end
diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json
new file mode 100644
index 000000000..1529d8592
--- /dev/null
+++ b/data/maps/DiglettsCave_NorthEntrance/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE",
+  "name": "DiglettsCave_NorthEntrance",
+  "layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_DIGLETTS_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "56",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "DiglettsCave_NorthEntrance_EventScript_160EE8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_DIGLETTS_CAVE_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/DiglettsCave_NorthEntrance/scripts.inc b/data/maps/DiglettsCave_NorthEntrance/scripts.inc
new file mode 100644
index 000000000..890c5183c
--- /dev/null
+++ b/data/maps/DiglettsCave_NorthEntrance/scripts.inc
@@ -0,0 +1,6 @@
+DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7
+	.byte 0
+
+DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8
+	msgbox gUnknown_817462C, 2
+	end
diff --git a/data/maps/DiglettsCave_NorthEntrance/text.inc b/data/maps/DiglettsCave_NorthEntrance/text.inc
new file mode 100644
index 000000000..89dcb5a38
--- /dev/null
+++ b/data/maps/DiglettsCave_NorthEntrance/text.inc
@@ -0,0 +1,6 @@
+gUnknown_817462C:: @ 817462C
+    .string "I went inside ROCK TUNNEL, but it's\n"
+    .string "pitch-black and scary in there.\p"
+    .string "If I could get a POKéMON to use\n"
+    .string "FLASH and light it up…$"
+
diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json
new file mode 100644
index 000000000..27a17103e
--- /dev/null
+++ b/data/maps/DiglettsCave_SouthEntrance/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE",
+  "name": "DiglettsCave_SouthEntrance",
+  "layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_DIGLETTS_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "DiglettsCave_SouthEntrance_EventScript_160EFC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_DIGLETTS_CAVE_B1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/DiglettsCave_SouthEntrance/scripts.inc b/data/maps/DiglettsCave_SouthEntrance/scripts.inc
new file mode 100644
index 000000000..0aab02b7f
--- /dev/null
+++ b/data/maps/DiglettsCave_SouthEntrance/scripts.inc
@@ -0,0 +1,6 @@
+DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB
+	.byte 0
+
+DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC
+	msgbox gUnknown_81746A7, 2
+	end
diff --git a/data/maps/DiglettsCave_SouthEntrance/text.inc b/data/maps/DiglettsCave_SouthEntrance/text.inc
new file mode 100644
index 000000000..4c97cdc0b
--- /dev/null
+++ b/data/maps/DiglettsCave_SouthEntrance/text.inc
@@ -0,0 +1,6 @@
+gUnknown_81746A7:: @ 81746A7
+    .string "Well, isn't this a surprise!\n"
+    .string "DIGLETT dug this long tunnel!\p"
+    .string "It goes right to VIRIDIAN CITY,\n"
+    .string "they tell me.$"
+
diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json
new file mode 100644
index 000000000..0a087cd74
--- /dev/null
+++ b/data/maps/FiveIsland/map.json
@@ -0,0 +1,107 @@
+{
+  "id": "MAP_FIVE_ISLAND",
+  "name": "FiveIsland",
+  "layout": "LAYOUT_FIVE_ISLAND",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FIVE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH",
+      "offset": -48,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_FIVE_ISLAND_MEADOW",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_EventScript_167EAA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 16,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_EventScript_167EA1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65375",
+      "x": 32,
+      "y": 9,
+      "elevation": 4,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 56,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_FIVE_ISLAND_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 22,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_FIVE_ISLAND_HOUSE2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 20,
+      "y": 8,
+      "elevation": 0,
+      "script": "FiveIsland_EventScript_167E98"
+    }
+  ]
+}
diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc
new file mode 100644
index 000000000..916cba8a1
--- /dev/null
+++ b/data/maps/FiveIsland/scripts.inc
@@ -0,0 +1,19 @@
+FiveIsland_MapScripts:: @ 8167E8E
+	map_script 3, FiveIsland_MapScript1_167E94
+	.byte 0
+
+FiveIsland_MapScript1_167E94:: @ 8167E94
+	setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND
+	end
+
+FiveIsland_EventScript_167E98:: @ 8167E98
+	msgbox gUnknown_8182DFB, 3
+	end
+
+FiveIsland_EventScript_167EA1:: @ 8167EA1
+	msgbox gUnknown_8182E26, 2
+	end
+
+FiveIsland_EventScript_167EAA:: @ 8167EAA
+	msgbox gUnknown_8182E96, 2
+	end
diff --git a/data/maps/FiveIsland/text.inc b/data/maps/FiveIsland/text.inc
new file mode 100644
index 000000000..40c0d7b4e
--- /dev/null
+++ b/data/maps/FiveIsland/text.inc
@@ -0,0 +1,16 @@
+gUnknown_8182DFB:: @ 8182DFB
+    .string "FIVE ISLAND\n"
+    .string "Chrono Island: Where Time Goes$"
+
+gUnknown_8182E26:: @ 8182E26
+    .string "Oh, this stinks. I wanted to play in\n"
+    .string "the MEADOW.\p"
+    .string "But they put up a weird building\n"
+    .string "on it, so I can't play there.$"
+
+gUnknown_8182E96:: @ 8182E96
+    .string "It's been getting busier around\n"
+    .string "these parts lately.\p"
+    .string "I haven't been catching many good\n"
+    .string "fish lately, either.$"
+
diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json
new file mode 100644
index 000000000..f99fced10
--- /dev/null
+++ b/data/maps/FiveIsland_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_FIVE_ISLAND_HARBOR",
+  "name": "FiveIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FIVE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_Harbor_EventScript_171D43",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..f5d12f8a4
--- /dev/null
+++ b/data/maps/FiveIsland_Harbor/scripts.inc
@@ -0,0 +1,11 @@
+FiveIsland_Harbor_MapScripts:: @ 8171D42
+	.byte 0
+
+FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 5
+	goto EventScript_1A900F
+	end
diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json
new file mode 100644
index 000000000..817d17cda
--- /dev/null
+++ b/data/maps/FiveIsland_House1/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FIVE_ISLAND_HOUSE1",
+  "name": "FiveIsland_House1",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FIVE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "31",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_House1_EventScript_171D57",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc
new file mode 100644
index 000000000..4f34587d7
--- /dev/null
+++ b/data/maps/FiveIsland_House1/scripts.inc
@@ -0,0 +1,6 @@
+FiveIsland_House1_MapScripts:: @ 8171D56
+	.byte 0
+
+FiveIsland_House1_EventScript_171D57:: @ 8171D57
+	msgbox gUnknown_81A3CAC, 2
+	end
diff --git a/data/maps/FiveIsland_House1/text.inc b/data/maps/FiveIsland_House1/text.inc
new file mode 100644
index 000000000..7fa7e5ac1
--- /dev/null
+++ b/data/maps/FiveIsland_House1/text.inc
@@ -0,0 +1,15 @@
+Text_1A3C71:: @ 81A3C71
+    .string "こんばんの　おかずは\n"
+    .string "ようい　しなくて　いいぞ！\p"
+    .string "って　だんなが\n"
+    .string "つりに　いったん　だけど‥\l"
+    .string "しんじて　いいのかねえ$"
+
+gUnknown_81A3CAC:: @ 81A3CAC
+    .string "Don't worry about buying anything\n"
+    .string "for dinner tonight!\p"
+    .string "…That's what my husband said when\n"
+    .string "he went off fishing today.\p"
+    .string "I'm not sure if I can count on him\n"
+    .string "to live up to that promise.$"
+
diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json
new file mode 100644
index 000000000..e9254cf3c
--- /dev/null
+++ b/data/maps/FiveIsland_House2/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FIVE_ISLAND_HOUSE2",
+  "name": "FiveIsland_House2",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FIVE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_House2_EventScript_171D61",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc
new file mode 100644
index 000000000..e46909905
--- /dev/null
+++ b/data/maps/FiveIsland_House2/scripts.inc
@@ -0,0 +1,6 @@
+FiveIsland_House2_MapScripts:: @ 8171D60
+	.byte 0
+
+FiveIsland_House2_EventScript_171D61:: @ 8171D61
+	msgbox gUnknown_81A3D5E, 2
+	end
diff --git a/data/maps/FiveIsland_House2/text.inc b/data/maps/FiveIsland_House2/text.inc
new file mode 100644
index 000000000..bad18b3a3
--- /dev/null
+++ b/data/maps/FiveIsland_House2/text.inc
@@ -0,0 +1,8 @@
+gUnknown_81A3D5E:: @ 81A3D5E
+    .string "That MEADOW has belonged to our\n"
+    .string "family for generations.\p"
+    .string "I should have had a giant mansion\n"
+    .string "built on it.\p"
+    .string "It would be preferable to having\n"
+    .string "those thugs run wild on it!$"
+
diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json
new file mode 100644
index 000000000..e34db7ec9
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Entrance/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
+  "name": "FiveIsland_LostCave_Entrance",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc
new file mode 100644
index 000000000..e288ceff6
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc
@@ -0,0 +1,7 @@
+FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC
+	map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2
+	.byte 0
+
+FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2
+	setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE
+	end
diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json
new file mode 100644
index 000000000..80c4a3ee1
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room1/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+  "name": "FiveIsland_LostCave_Room1",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "56",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_LostCave_Room1_EventScript_164BF7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc
new file mode 100644
index 000000000..49ab5a14f
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc
@@ -0,0 +1,7 @@
+FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6
+	.byte 0
+
+FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7
+	trainerbattle 0, 607, 0, Text_17CEF5, Text_17CF42
+	msgbox gUnknown_817CF54, 6
+	end
diff --git a/data/maps/FiveIsland_LostCave_Room1/text.inc b/data/maps/FiveIsland_LostCave_Room1/text.inc
new file mode 100644
index 000000000..820a9a10f
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room1/text.inc
@@ -0,0 +1,15 @@
+Text_17CEF5:: @ 817CEF5
+    .string "Aiyeeeeeh!\p"
+    .string "I thought this was an ancient ruin.\n"
+    .string "But it's teeming with ghosts!$"
+
+Text_17CF42:: @ 817CF42
+    .string "Aiyeeeeeh!\n"
+    .string "Mercy!$"
+
+gUnknown_817CF54:: @ 817CF54
+    .string "I'm trying to get out of here, but\n"
+    .string "I always end up at the same spot.\p"
+    .string "Maybe the number of boulders is\n"
+    .string "a hint…$"
+
diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json
new file mode 100644
index 000000000..d155f030a
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room10/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10",
+  "name": "FiveIsland_LostCave_Room10",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "147"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB",
+      "flag": "504"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc
new file mode 100644
index 000000000..cd21dbcbd
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc
@@ -0,0 +1,66 @@
+FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D
+	map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38
+	map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48
+	.byte 0
+
+FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38
+	checktrainerflag FLAG_0x25E
+	call_if 1, EventScript_164C42
+	end
+
+EventScript_164C42:: @ 8164C42
+	setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1
+	return
+
+FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48
+	map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52
+	.2byte 0
+
+EventScript_164C52:: @ 8164C52
+	lockall
+	textcolor 1
+	applymovement 1, Movement_164CC0
+	waitmovement 0
+	delay 100
+	applymovement 1, Movement_164CC8
+	waitmovement 0
+	msgbox gUnknown_817D062
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_164CB6
+	trainerbattle 3, 606, 0, Text_17D086
+	msgbox gUnknown_817D0B2
+	closemessage
+	call EventScript_164CA5
+	warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10
+	waitstate
+	releaseall
+	end
+
+EventScript_164CA5:: @ 8164CA5
+	setflag FLAG_0x093
+	clearflag FLAG_0x094
+	setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1
+	setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1
+	return
+
+EventScript_164CB6:: @ 8164CB6
+	settrainerflag FLAG_0x25E
+	call EventScript_164CA5
+	releaseall
+	end
+
+Movement_164CC0:: @ 8164CC0
+	step_12
+	step_1c
+	step_13
+	step_1c
+	step_2e
+	step_1c
+	step_2d
+	step_end
+
+Movement_164CC8:: @ 8164CC8
+	step_10
+	step_10
+	step_end
diff --git a/data/maps/FiveIsland_LostCave_Room10/text.inc b/data/maps/FiveIsland_LostCave_Room10/text.inc
new file mode 100644
index 000000000..da92ae5e7
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room10/text.inc
@@ -0,0 +1,16 @@
+gUnknown_817D062:: @ 817D062
+    .string "W-what do you intend to do with\n"
+    .string "me?$"
+
+Text_17D086:: @ 817D086
+    .string "Oh… I was afraid that you meant to\n"
+    .string "harm me.$"
+
+gUnknown_817D0B2:: @ 817D0B2
+    .string "I am so glad that you happened\n"
+    .string "here.\p"
+    .string "I grew rather bored of walking,\n"
+    .string "and I am feeling fatigued.\p"
+    .string "May I ask you to take me home\n"
+    .string "from here?$"
+
diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json
new file mode 100644
index 000000000..c7e948840
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room11/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11",
+  "name": "FiveIsland_LostCave_Room11",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8",
+      "flag": "505"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room11/scripts.inc b/data/maps/FiveIsland_LostCave_Room11/scripts.inc
new file mode 100644
index 000000000..abc87678f
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room11/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room11_MapScripts:: @ 8164CCB
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json
new file mode 100644
index 000000000..da0d9ca31
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room12/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12",
+  "name": "FiveIsland_LostCave_Room12",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5",
+      "flag": "506"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room12/scripts.inc b/data/maps/FiveIsland_LostCave_Room12/scripts.inc
new file mode 100644
index 000000000..2a8500927
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room12/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room12_MapScripts:: @ 8164CCC
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json
new file mode 100644
index 000000000..cef031273
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room13/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13",
+  "name": "FiveIsland_LostCave_Room13",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2",
+      "flag": "507"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room13/scripts.inc b/data/maps/FiveIsland_LostCave_Room13/scripts.inc
new file mode 100644
index 000000000..23ef2d129
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room13/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room13_MapScripts:: @ 8164CCD
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json
new file mode 100644
index 000000000..025120be6
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room14/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14",
+  "name": "FiveIsland_LostCave_Room14",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF",
+      "flag": "508"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room14/scripts.inc b/data/maps/FiveIsland_LostCave_Room14/scripts.inc
new file mode 100644
index 000000000..ec2260f6e
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room14/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room14_MapScripts:: @ 8164CCE
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json
new file mode 100644
index 000000000..59da7ae72
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room2/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2",
+  "name": "FiveIsland_LostCave_Room2",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room2/scripts.inc b/data/maps/FiveIsland_LostCave_Room2/scripts.inc
new file mode 100644
index 000000000..98e4cae7f
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room2/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room2_MapScripts:: @ 8164C0E
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json
new file mode 100644
index 000000000..129c50fe9
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room3/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3",
+  "name": "FiveIsland_LostCave_Room3",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room3/scripts.inc b/data/maps/FiveIsland_LostCave_Room3/scripts.inc
new file mode 100644
index 000000000..c77557a4a
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room3/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room3_MapScripts:: @ 8164C0F
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json
new file mode 100644
index 000000000..98b31bca3
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room4/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4",
+  "name": "FiveIsland_LostCave_Room4",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "23",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_LostCave_Room4_EventScript_164C11",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc
new file mode 100644
index 000000000..68104231a
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc
@@ -0,0 +1,7 @@
+FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10
+	.byte 0
+
+FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11
+	trainerbattle 0, 608, 0, Text_17CFC1, Text_17CFFB
+	msgbox gUnknown_817D037, 6
+	end
diff --git a/data/maps/FiveIsland_LostCave_Room4/text.inc b/data/maps/FiveIsland_LostCave_Room4/text.inc
new file mode 100644
index 000000000..a9a8c0daf
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room4/text.inc
@@ -0,0 +1,12 @@
+Text_17CFC1:: @ 817CFC1
+    .string "I think there is a mysterious power\n"
+    .string "at work in this cave.$"
+
+Text_17CFFB:: @ 817CFFB
+    .string "If you don't go into the right\n"
+    .string "tunnel, you won't get ahead.$"
+
+gUnknown_817D037:: @ 817D037
+    .string "Earlier, a lady went into the caves\n"
+    .string "ahead.$"
+
diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json
new file mode 100644
index 000000000..1df784d77
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room5/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5",
+  "name": "FiveIsland_LostCave_Room5",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room5/scripts.inc b/data/maps/FiveIsland_LostCave_Room5/scripts.inc
new file mode 100644
index 000000000..47e9771de
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room5/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room5_MapScripts:: @ 8164C28
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json
new file mode 100644
index 000000000..5a6be0290
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room6/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6",
+  "name": "FiveIsland_LostCave_Room6",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room6/scripts.inc b/data/maps/FiveIsland_LostCave_Room6/scripts.inc
new file mode 100644
index 000000000..1956ee70b
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room6/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room6_MapScripts:: @ 8164C29
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json
new file mode 100644
index 000000000..b18af46f7
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room7/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7",
+  "name": "FiveIsland_LostCave_Room7",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room7/scripts.inc b/data/maps/FiveIsland_LostCave_Room7/scripts.inc
new file mode 100644
index 000000000..f8a8afc5f
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room7/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room7_MapScripts:: @ 8164C2A
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json
new file mode 100644
index 000000000..72057fbd1
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room8/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8",
+  "name": "FiveIsland_LostCave_Room8",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room8/scripts.inc b/data/maps/FiveIsland_LostCave_Room8/scripts.inc
new file mode 100644
index 000000000..89fc85c34
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room8/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room8_MapScripts:: @ 8164C2B
+	.byte 0
diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json
new file mode 100644
index 000000000..54b9d6d2e
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room9/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9",
+  "name": "FiveIsland_LostCave_Room9",
+  "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_LOST_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_LostCave_Room9/scripts.inc b/data/maps/FiveIsland_LostCave_Room9/scripts.inc
new file mode 100644
index 000000000..771427153
--- /dev/null
+++ b/data/maps/FiveIsland_LostCave_Room9/scripts.inc
@@ -0,0 +1,2 @@
+FiveIsland_LostCave_Room9_MapScripts:: @ 8164C2C
+	.byte 0
diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json
new file mode 100644
index 000000000..cda0c4f2c
--- /dev/null
+++ b/data/maps/FiveIsland_Meadow/map.json
@@ -0,0 +1,138 @@
+{
+  "id": "MAP_FIVE_ISLAND_MEADOW",
+  "name": "FiveIsland_Meadow",
+  "layout": "LAYOUT_FIVE_ISLAND_MEADOW",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_FIVE_ISLAND",
+      "offset": 0,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR",
+      "offset": 20,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "50",
+      "x": 18,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_Meadow_EventScript_1689BB",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "49",
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "FiveIsland_Meadow_EventScript_16898D",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "49",
+      "x": 11,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "FiveIsland_Meadow_EventScript_1689A4",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "95",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_Meadow_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "95",
+      "x": 19,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_Meadow_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_Meadow_EventScript_1BEC69",
+      "flag": "478"
+    },
+    {
+      "graphics_id": "92",
+      "x": 3,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_Meadow_EventScript_1BEC76",
+      "flag": "479"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 21,
+      "elevation": 0,
+      "script": "FiveIsland_Meadow_EventScript_168942"
+    }
+  ]
+}
diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc
new file mode 100644
index 000000000..4b3b4d895
--- /dev/null
+++ b/data/maps/FiveIsland_Meadow/scripts.inc
@@ -0,0 +1,54 @@
+FiveIsland_Meadow_MapScripts:: @ 8168932
+	map_script 1, FiveIsland_Meadow_MapScript1_168938
+	.byte 0
+
+FiveIsland_Meadow_MapScript1_168938:: @ 8168938
+	checkflag FLAG_0x2D6
+	call_if 1, EventScript_168983
+	end
+
+FiveIsland_Meadow_EventScript_168942:: @ 8168942
+	lockall
+	checkflag FLAG_0x2D6
+	goto_if_eq EventScript_168979
+	checkflag FLAG_0x2D8
+	goto_if_eq EventScript_16895F
+	msgbox gUnknown_818AB8E
+	releaseall
+	end
+
+EventScript_16895F:: @ 816895F
+	setflag FLAG_0x2D6
+	message Text_18ABF4
+	waitmessage
+	delay 60
+	call EventScript_168983
+	special DrawWholeMapView
+	playse SE_PIN
+	waitse
+	releaseall
+	end
+
+EventScript_168979:: @ 8168979
+	msgbox gUnknown_818AC62
+	releaseall
+	end
+
+EventScript_168983:: @ 8168983
+	setmetatile 12, 21, 687, 1
+	return
+
+FiveIsland_Meadow_EventScript_16898D:: @ 816898D
+	trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3
+	msgbox gUnknown_818ACC5, 6
+	end
+
+FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4
+	trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39
+	msgbox gUnknown_818AD59, 6
+	end
+
+FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB
+	trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB
+	msgbox gUnknown_818AE16, 6
+	end
diff --git a/data/maps/FiveIsland_Meadow/text.inc b/data/maps/FiveIsland_Meadow/text.inc
new file mode 100644
index 000000000..7ffd69619
--- /dev/null
+++ b/data/maps/FiveIsland_Meadow/text.inc
@@ -0,0 +1,70 @@
+Text_18AAD5:: @ 818AAD5
+    .string "This is an excellent environment\n"
+    .string "for raising POKéMON.$"
+
+Text_18AB0B:: @ 818AB0B
+    .string "Your POKéMON are growing up\n"
+    .string "admirably well!$"
+
+Text_18AB37:: @ 818AB37
+    .string "You know, I think you have the\n"
+    .string "talent to be a good BREEDER.$"
+
+Text_18AB73:: @ 818AB73
+    .string "とびらを　あけるには\n"
+    .string "パスワードが　2つ　いるようだ$"
+
+gUnknown_818AB8E:: @ 818AB8E
+    .string "{PLAYER} entered a password.\p"
+    .string "“GOLDEEN need log.”\p"
+    .string "… …  … …  … …\p"
+    .string "Another password is needed to\n"
+    .string "open the door…$"
+
+Text_18ABF4:: @ 818ABF4
+    .string "{PLAYER} entered two passwords.\p"
+    .string "“GOLDEEN need log.”\n"
+    .string "“Yes, nah, CHANSEY.”\p"
+    .string "… …  … …  … …\p"
+    .string "The WAREHOUSE's door opened!$"
+
+gUnknown_818AC62:: @ 818AC62
+    .string "The WAREHOUSE's door is already\n"
+    .string "open.$"
+
+Text_18AC88:: @ 818AC88
+    .string "This area's strictly off-limits!\n"
+    .string "Out, out!$"
+
+Text_18ACB3:: @ 818ACB3
+    .string "Is this for real?$"
+
+gUnknown_818ACC5:: @ 818ACC5
+    .string "You don't have any business here!\n"
+    .string "Go home!$"
+
+Text_18ACF0:: @ 818ACF0
+    .string "There's nothing past here except\n"
+    .string "our WAREHOUSE.\p"
+    .string "So what brings you here?$"
+
+Text_18AD39:: @ 818AD39
+    .string "That wasn't supposed to happen…$"
+
+gUnknown_818AD59:: @ 818AD59
+    .string "You're wanting to know what's inside\n"
+    .string "this WAREHOUSE?\p"
+    .string "It's better you didn't know.\n"
+    .string "For your own sake, I mean.$"
+
+Text_18ADC6:: @ 818ADC6
+    .string "You'd be wasting time even if you\n"
+    .string "were to get by me.$"
+
+Text_18ADFB:: @ 818ADFB
+    .string "Oh, that makes me furious!$"
+
+gUnknown_818AE16:: @ 818AE16
+    .string "You won't be able to get in without\n"
+    .string "the passwords anyway.$"
+
diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json
new file mode 100644
index 000000000..30418fb84
--- /dev/null
+++ b/data/maps/FiveIsland_MemorialPillar/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR",
+  "name": "FiveIsland_MemorialPillar",
+  "layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_MEMORIAL_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_FIVE_ISLAND_MEADOW",
+      "offset": -20,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "25",
+      "x": 8,
+      "y": 44,
+      "elevation": 4,
+      "movement_type": "15",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_MemorialPillar_EventScript_1689D3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "21",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "FiveIsland_MemorialPillar_EventScript_1AC317",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 14,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "19",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "FiveIsland_MemorialPillar_EventScript_1AC355",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 17,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "FiveIsland_MemorialPillar_EventScript_1AC393",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 4,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_MemorialPillar_EventScript_1BEC83",
+      "flag": "480"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 9,
+      "y": 43,
+      "elevation": 0,
+      "script": "FiveIsland_MemorialPillar_EventScript_168A48"
+    },
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 52,
+      "elevation": 3,
+      "item": "ITEM_BIG_PEARL",
+      "flag": "170",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 7,
+      "elevation": 3,
+      "item": "ITEM_RAZZ_BERRY",
+      "flag": "171",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 17,
+      "y": 22,
+      "elevation": 3,
+      "item": "ITEM_SITRUS_BERRY",
+      "flag": "172",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 25,
+      "elevation": 3,
+      "item": "ITEM_BLUK_BERRY",
+      "flag": "173",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc
new file mode 100644
index 000000000..23b3527f7
--- /dev/null
+++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc
@@ -0,0 +1,94 @@
+FiveIsland_MemorialPillar_MapScripts:: @ 81689D2
+	.byte 0
+
+FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3
+	lock
+	checkflag FLAG_0x236
+	goto_if_eq EventScript_168A18
+	checkflag FLAG_0x2D7
+	goto_if_eq EventScript_168A22
+	msgbox gUnknown_818B02E
+	closemessage
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	delay 45
+	msgbox gUnknown_818B03C
+	applymovement 1, Movement_1A75E9
+	waitmovement 0
+	msgbox gUnknown_818B05E
+	release
+	end
+
+EventScript_168A18:: @ 8168A18
+	msgbox gUnknown_818B2DA
+	release
+	end
+
+EventScript_168A22:: @ 8168A22
+	msgbox gUnknown_818B282
+	giveitem ITEM_TM42
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_168AFE
+	call EventScript_168AE8
+	release
+	end
+
+FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lockall
+	checkflag FLAG_0x236
+	goto_if_eq EventScript_168B0B
+	checkflag FLAG_0x2D7
+	goto_if_eq EventScript_168B0B
+	msgbox gUnknown_818B095
+	checkitem ITEM_LEMONADE, 1
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_168A86
+	releaseall
+	end
+
+EventScript_168A86:: @ 8168A86
+	msgbox gUnknown_818B105, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_168A9B
+	releaseall
+	end
+
+EventScript_168A9B:: @ 8168A9B
+	removeitem ITEM_LEMONADE, 1
+	msgbox gUnknown_818B13E
+	closemessage
+	applymovement 1, Movement_1A75EB
+	waitmovement 0
+	delay 45
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	textcolor 0
+	msgbox gUnknown_818B171
+	giveitem ITEM_TM42
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_168AFE
+	call EventScript_168AE8
+	releaseall
+	end
+
+EventScript_168AE8:: @ 8168AE8
+	msgbox gUnknown_818B219
+	applymovement 1, Movement_1A75E9
+	waitmovement 0
+	setflag FLAG_0x236
+	return
+
+EventScript_168AFE:: @ 8168AFE
+	setflag FLAG_0x2D7
+	msgbox gUnknown_818B23E
+	releaseall
+	end
+
+EventScript_168B0B:: @ 8168B0B
+	msgbox gUnknown_818B2F8
+	releaseall
+	end
diff --git a/data/maps/FiveIsland_MemorialPillar/text.inc b/data/maps/FiveIsland_MemorialPillar/text.inc
new file mode 100644
index 000000000..051f3fdc1
--- /dev/null
+++ b/data/maps/FiveIsland_MemorialPillar/text.inc
@@ -0,0 +1,99 @@
+Text_18AE50:: @ 818AE50
+    .string "I'm the eldest of the BIRD\n"
+    .string "BROTHERS.\p"
+    .string "The best thing about birds…\n"
+    .string "It has to be the beak.$"
+
+Text_18AEA8:: @ 818AEA8
+    .string "Oh, so sharp!$"
+
+Text_18AEB6:: @ 818AEB6
+    .string "You can fly to FOUR ISLAND from\n"
+    .string "here.$"
+
+Text_18AEDC:: @ 818AEDC
+    .string "I'm the middle kid of the BIRD\n"
+    .string "BROTHERS.\p"
+    .string "The best thing about birds…\n"
+    .string "It has to be the wings.$"
+
+Text_18AF39:: @ 818AF39
+    .string "Flap, flap!$"
+
+Text_18AF45:: @ 818AF45
+    .string "There was a really somber guy\n"
+    .string "over that way.$"
+
+Text_18AF72:: @ 818AF72
+    .string "I'm the youngest of the BIRD\n"
+    .string "BROTHERS.\p"
+    .string "The best thing about birds…\n"
+    .string "It has to be the down.$"
+
+Text_18AFCC:: @ 818AFCC
+    .string "Down is so comfy…\n"
+    .string "It makes me drowsy…$"
+
+Text_18AFF2:: @ 818AFF2
+    .string "It fills me with happiness when\n"
+    .string "bird POKéMON beg playfully…$"
+
+gUnknown_818B02E:: @ 818B02E
+    .string "Scrub, scrub…$"
+
+gUnknown_818B03C:: @ 818B03C
+    .string "Hello…\n"
+    .string "Your POKéMON look healthy…$"
+
+gUnknown_818B05E:: @ 818B05E
+    .string "This is where I buried my ONIX…\n"
+    .string "It was named TECTONIX…$"
+
+gUnknown_818B095:: @ 818B095
+    .string "“Here lies TECTONIX” is engraved\n"
+    .string "on a boulder.\p"
+    .string "There is a LEMONADE placed as an\n"
+    .string "offering in front of the grave.$"
+
+gUnknown_818B105:: @ 818B105
+    .string "Would you like to leave another\n"
+    .string "LEMONADE as an offering?$"
+
+gUnknown_818B13E:: @ 818B13E
+    .string "{PLAYER} placed a can of LEMONADE\n"
+    .string "in front of the grave.$"
+
+gUnknown_818B171:: @ 818B171
+    .string "Th-thank you…\p"
+    .string "That was my TECTONIX's favorite\n"
+    .string "drink…\p"
+    .string "I don't even know you, but your\n"
+    .string "act of kindness…\p"
+    .string "It's uplifted me a little.\p"
+    .string "Can you please take this as my\n"
+    .string "thanks?$"
+
+gUnknown_818B219:: @ 818B219
+    .string "Please be good to your POKéMON,\n"
+    .string "too.$"
+
+gUnknown_818B23E:: @ 818B23E
+    .string "If you don't have room for it,\n"
+    .string "I'll hold it for you till next time.$"
+
+gUnknown_818B282:: @ 818B282
+    .string "Oh, it's you from that time…\p"
+    .string "I still have that thing I wanted\n"
+    .string "you to have as my thanks.$"
+
+gUnknown_818B2DA:: @ 818B2DA
+    .string "Scrub, scrub…\p"
+    .string "… … …\n"
+    .string "TECTONIX…$"
+
+gUnknown_818B2F8:: @ 818B2F8
+    .string "Boulders and rocks are neatly piled\n"
+    .string "up as a cairn.\p"
+    .string "“Here lies TECTONIX” is engraved\n"
+    .string "on a boulder.$"
+
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..e0e708bd2
--- /dev/null
+++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json
@@ -0,0 +1,100 @@
+{
+  "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
+  "name": "FiveIsland_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_FIVE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_1F_EventScript_171D00",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_1F_EventScript_171D12",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_1F_EventScript_171D09",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..a16cb37d1
--- /dev/null
+++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,23 @@
+FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1
+	map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC
+	map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC
+	setrespawn SPAWN_FIVE_ISLAND
+	end
+
+FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09
+	msgbox gUnknown_81A3BBA, 2
+	end
+
+FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12
+	msgbox gUnknown_81A3BFD, 2
+	end
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/text.inc b/data/maps/FiveIsland_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..e1b0e1ea4
--- /dev/null
+++ b/data/maps/FiveIsland_PokemonCenter_1F/text.inc
@@ -0,0 +1,10 @@
+gUnknown_81A3BBA:: @ 81A3BBA
+    .string "I'm on my way to prepare a meal\n"
+    .string "for a certain high-society person.$"
+
+gUnknown_81A3BFD:: @ 81A3BFD
+    .string "You're on a quest to catch every\n"
+    .string "single kind of POKéMON?\p"
+    .string "…How incredible. Please tell me if\n"
+    .string "you catch a strong one!$"
+
diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..e6b4d237b
--- /dev/null
+++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F",
+  "name": "FiveIsland_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_FIVE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..5c50a6092
--- /dev/null
+++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B
+	map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, FiveIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30
+	call EventScript_1BB4A3
+	end
+
+EventScript_171D36:: @ 8171D36
+	call EventScript_1BB6AB
+	end
+
+EventScript_171D3C:: @ 8171D3C
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json
new file mode 100644
index 000000000..dc53baf54
--- /dev/null
+++ b/data/maps/FiveIsland_ResortGorgeous/map.json
@@ -0,0 +1,189 @@
+{
+  "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
+  "name": "FiveIsland_ResortGorgeous",
+  "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_RESORT_GORGEOUS",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH",
+      "offset": -48,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 44,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "FiveIsland_ResortGorgeous_EventScript_1AC127",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 33,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "FiveIsland_ResortGorgeous_EventScript_1AC165",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_ResortGorgeous_EventScript_1AC1A3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 23,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_ResortGorgeous_EventScript_1AC1E1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 33,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_ResortGorgeous_EventScript_1AC21F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 33,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "46",
+      "movement_range_x": 10,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_ResortGorgeous_EventScript_1AC25D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 56,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_ResortGorgeous_EventScript_1AC29B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 39,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "148"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 64,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 39,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "item": "ITEM_NEST_BALL",
+      "flag": "174",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 27,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_STARDUST",
+      "flag": "175",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 40,
+      "y": 12,
+      "elevation": 3,
+      "item": "ITEM_STAR_PIECE",
+      "flag": "176",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 27,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_STARDUST",
+      "flag": "177",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 42,
+      "y": 9,
+      "elevation": 0,
+      "script": "FiveIsland_ResortGorgeous_EventScript_168844"
+    }
+  ]
+}
diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc
new file mode 100644
index 000000000..a37695954
--- /dev/null
+++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc
@@ -0,0 +1,44 @@
+FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4
+	map_script 4, FiveIsland_ResortGorgeous_MapScript1_1687EF
+	map_script 2, FiveIsland_ResortGorgeous_MapScript2_1687FE
+	.byte 0
+
+FiveIsland_ResortGorgeous_MapScript1_1687EF:: @ 81687EF
+	map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_1687F9
+	.2byte 0
+
+EventScript_1687F9:: @ 81687F9
+	turnobject 255, 2
+	end
+
+FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE
+	map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_168808
+	.2byte 0
+
+EventScript_168808:: @ 8168808
+	lockall
+	textcolor 1
+	msgbox gUnknown_818A7DB
+	closemessage
+	applymovement 8, Movement_1A75E9
+	waitmovement 0
+	opendoor 39, 8
+	waitdooranim
+	applymovement 8, Movement_168841
+	waitmovement 0
+	closedoor 39, 8
+	waitdooranim
+	removeobject 8
+	clearflag FLAG_0x095
+	setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2
+	releaseall
+	end
+
+Movement_168841:: @ 8168841
+	step_11
+	step_60
+	step_end
+
+FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844
+	msgbox gUnknown_818A7FE, 3
+	end
diff --git a/data/maps/FiveIsland_ResortGorgeous/text.inc b/data/maps/FiveIsland_ResortGorgeous/text.inc
new file mode 100644
index 000000000..d984ab092
--- /dev/null
+++ b/data/maps/FiveIsland_ResortGorgeous/text.inc
@@ -0,0 +1,93 @@
+Text_18A3E2:: @ 818A3E2
+    .string "With these hands, I will create\n"
+    .string "my victory!$"
+
+Text_18A40E:: @ 818A40E
+    .string "The shame of this…\n"
+    .string "I'm red-faced…$"
+
+Text_18A430:: @ 818A430
+    .string "Uh-oh, my paint tubes have\n"
+    .string "scattered everywhere!$"
+
+Text_18A461:: @ 818A461
+    .string "Excuse me!\n"
+    .string "I'm trying to paint.\l"
+    .string "Please keep out of my sight!$"
+
+Text_18A49E:: @ 818A49E
+    .string "This loss…\n"
+    .string "I feel like I'm whiting out…$"
+
+Text_18A4C6:: @ 818A4C6
+    .string "GILLIAN?\n"
+    .string "Please tilt your head slightly…\l"
+    .string "There! That's the look I want!$"
+
+Text_18A50E:: @ 818A50E
+    .string "Hmm…\n"
+    .string "The angle, it is not quite there…$"
+
+Text_18A535:: @ 818A535
+    .string "Oh…\n"
+    .string "My feelings, they are blue…$"
+
+Text_18A555:: @ 818A555
+    .string "The sky and the sea…\n"
+    .string "They are so fickle.\p"
+    .string "Their changing expressions make\n"
+    .string "them difficult to capture.$"
+
+Text_18A5B9:: @ 818A5B9
+    .string "I am visiting my friend's retreat,\n"
+    .string "if you must know.$"
+
+Text_18A5EE:: @ 818A5EE
+    .string "Oh, my, so strong.$"
+
+Text_18A601:: @ 818A601
+    .string "I find it pleasurable to leisurely\n"
+    .string "battle in the gentle sea breeze.$"
+
+Text_18A645:: @ 818A645
+    .string "I'm thinking of having a pool\n"
+    .string "made specially for POKéMON.$"
+
+Text_18A67F:: @ 818A67F
+    .string "Oh, my goodness gracious!$"
+
+Text_18A699:: @ 818A699
+    .string "A pool would be nice, but I must\n"
+    .string "say, a sun-room may be sublime.$"
+
+Text_18A6DA:: @ 818A6DA
+    .string "I'm a good runner.\n"
+    .string "I'm really fast!$"
+
+Text_18A6FE:: @ 818A6FE
+    .string "Oops!\n"
+    .string "I rushed things!$"
+
+Text_18A715:: @ 818A715
+    .string "When I run with the wind, it feels\n"
+    .string "like I could fly!$"
+
+Text_18A74A:: @ 818A74A
+    .string "I say, this marine life here at\n"
+    .string "this resort agrees with me.$"
+
+Text_18A786:: @ 818A786
+    .string "That's a shocker!\n"
+    .string "You must be joking.$"
+
+Text_18A7AC:: @ 818A7AC
+    .string "Getting so serious over this…\n"
+    .string "How nonsensical.$"
+
+gUnknown_818A7DB:: @ 818A7DB
+    .string "SELPHY: Thank you.\p"
+    .string "You may go now.$"
+
+gUnknown_818A7FE:: @ 818A7FE
+    .string "SELPHY'S HOUSE$"
+
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json
new file mode 100644
index 000000000..f960fe89d
--- /dev/null
+++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
+  "name": "FiveIsland_ResortGorgeous_House",
+  "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_RESORT_GORGEOUS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE",
+      "flag": "149"
+    },
+    {
+      "graphics_id": "61",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_ResortGorgeous_House_EventScript_172062",
+      "flag": "150"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C"
+    }
+  ]
+}
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
new file mode 100644
index 000000000..a4dc96f91
--- /dev/null
+++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
@@ -0,0 +1,149 @@
+FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD
+	.byte 0
+
+FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	checkflag FLAG_0x002
+	goto_if_eq EventScript_172043
+	compare_var_to_value VAR_STORAGE_UNKNOWN, 65535
+	goto_if_eq EventScript_171F0B
+	compare_var_to_value VAR_STORAGE_UNKNOWN, 0
+	goto_if 5, EventScript_171F19
+	msgbox gUnknown_81A42A0
+	goto EventScript_171EFE
+	end
+
+EventScript_171EFE:: @ 8171EFE
+	special sub_80CB0A8
+	msgbox gUnknown_81A4315
+	release
+	end
+
+EventScript_171F0B:: @ 8171F0B
+	msgbox gUnknown_81A437A
+	goto EventScript_171EFE
+	end
+
+EventScript_171F19:: @ 8171F19
+	copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN
+	specialvar VAR_RESULT, sub_80CC48C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171F34
+	goto EventScript_171EFE
+	end
+
+EventScript_171F34:: @ 8171F34
+	special sub_80CB0A8
+	msgbox gUnknown_81A43F7
+	addobject 2
+	applymovement 2, Movement_172060
+	waitmovement 0
+	textcolor 0
+	msgbox gUnknown_81A450B
+	applymovement 1, Movement_1A75E9
+	waitmovement 0
+	textcolor 1
+	msgbox gUnknown_81A4521
+	textcolor 0
+	msgbox gUnknown_81A4566
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_171FCD
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_171FE9
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_171FFE
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_17201A
+	moveobjectoffscreen 2
+	msgbox gUnknown_81A458E
+	giveitem VAR_0x403B
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_172025
+	setflag FLAG_0x002
+	setvar VAR_STORAGE_UNKNOWN, 0
+	release
+	end
+
+EventScript_171FCD:: @ 8171FCD
+	applymovement 1, Movement_1A75ED
+	applymovement 2, Movement_17204D
+	waitmovement 0
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_171FE9:: @ 8171FE9
+	applymovement 2, Movement_172055
+	waitmovement 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_171FFE:: @ 8171FFE
+	applymovement 1, Movement_1A75E7
+	applymovement 2, Movement_172059
+	waitmovement 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_17201A:: @ 817201A
+	applymovement 2, Movement_17205E
+	waitmovement 0
+	return
+
+EventScript_172025:: @ 8172025
+	textcolor 0
+	msgbox gUnknown_81A45E8
+	textcolor 1
+	msgbox gUnknown_81A461B
+	setflag FLAG_0x002
+	setvar VAR_STORAGE_UNKNOWN, 0
+	release
+	end
+
+EventScript_172043:: @ 8172043
+	msgbox gUnknown_81A4632
+	release
+	end
+
+Movement_17204D:: @ 817204D
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_30
+	step_end
+
+Movement_172055:: @ 8172055
+	step_12
+	step_12
+	step_2d
+	step_end
+
+Movement_172059:: @ 8172059
+	step_12
+	step_12
+	step_12
+	step_10
+	step_end
+
+Movement_17205E:: @ 817205E
+	step_11
+	step_end
+
+Movement_172060:: @ 8172060
+	step_25
+	step_end
+
+FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062
+	msgbox gUnknown_81A4657, 2
+	end
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/text.inc b/data/maps/FiveIsland_ResortGorgeous_House/text.inc
new file mode 100644
index 000000000..1d872274b
--- /dev/null
+++ b/data/maps/FiveIsland_ResortGorgeous_House/text.inc
@@ -0,0 +1,68 @@
+gUnknown_81A42A0:: @ 81A42A0
+    .string "SELPHY: Oh?\n"
+    .string "Do I know you from somewhere?\p"
+    .string "Oh, but that doesn't matter.\p"
+    .string "I am exquisitely bored.\n"
+    .string "Please, hear my wish.$"
+
+gUnknown_81A4315:: @ 81A4315
+    .string "I wish to see a POKéMON.\n"
+    .string "A darling {STR_VAR_1}.\p"
+    .string "I want to see one right away.\n"
+    .string "Please, make my wish come true.$"
+
+gUnknown_81A437A:: @ 81A437A
+    .string "SELPHY: Oh, I'm tired of this.\n"
+    .string "I'm tired of waiting for you.\p"
+    .string "I'll forgive you this time, but\n"
+    .string "please don't fail me next time.$"
+
+gUnknown_81A43F7:: @ 81A43F7
+    .string "SELPHY: Oh, hello, there.\p"
+    .string "Oh, my gracious. That must be the\n"
+    .string "{STR_VAR_1} you caught for me.\p"
+    .string "Giggle…\n"
+    .string "I see a resemblance to you.\p"
+    .string "Thank you so kindly.\p"
+    .string "… …  … …  … …\n"
+    .string "Is something the matter?\p"
+    .string "You may leave.\p"
+    .string "… …  … …  … …\n"
+    .string "Oh, fine. I understand now.\p"
+    .string "SEBASTIAN!\n"
+    .string "I need you here this instant!$"
+
+gUnknown_81A450B:: @ 81A450B
+    .string "Butler: Yes, my lady.$"
+
+gUnknown_81A4521:: @ 81A4521
+    .string "SELPHY: See to it that this person\n"
+    .string "is given a token of appreciation.$"
+
+gUnknown_81A4566:: @ 81A4566
+    .string "Butler: I shall do as you bid,\n"
+    .string "my lady.$"
+
+gUnknown_81A458E:: @ 81A458E
+    .string "Butler: I sincerely thank you for\n"
+    .string "pleasing Lady SELPHY.\p"
+    .string "Please accept this as her thanks…$"
+
+gUnknown_81A45E8:: @ 81A45E8
+    .string "Butler: Your BAG appears to be\n"
+    .string "unfortunately full.$"
+
+gUnknown_81A461B:: @ 81A461B
+    .string "Oh…\n"
+    .string "How disappointing.$"
+
+gUnknown_81A4632:: @ 81A4632
+    .string "SELPHY: I wish you the best of\n"
+    .string "luck.$"
+
+gUnknown_81A4657:: @ 81A4657
+    .string "Butler: The smile of Lady SELPHY\n"
+    .string "has the brilliance of the sun.\p"
+    .string "Please, I beg you to bring joy\n"
+    .string "to Lady SELPHY.$"
+
diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
new file mode 100644
index 000000000..2c45cdf29
--- /dev/null
+++ b/data/maps/FiveIsland_RocketWarehouse/map.json
@@ -0,0 +1,366 @@
+{
+  "id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE",
+  "name": "FiveIsland_RocketWarehouse",
+  "layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_ROCKET_WAREHOUSE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 5,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 15,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163FE6",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "49",
+      "x": 17,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163FFD",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "50",
+      "x": 27,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "FiveIsland_RocketWarehouse_EventScript_164087",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "49",
+      "x": 25,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "FiveIsland_RocketWarehouse_EventScript_164014",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "50",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "16",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "FiveIsland_RocketWarehouse_EventScript_164070",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "55",
+      "x": 27,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F93",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 8,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_1BED87",
+      "flag": "500"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_1BED94",
+      "flag": "501"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_1BEDA1",
+      "flag": "502"
+    },
+    {
+      "graphics_id": "92",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_1BEDAE",
+      "flag": "503"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 24,
+      "y": 25,
+      "elevation": 3,
+      "dest_map": "MAP_FIVE_ISLAND_MEADOW",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4088",
+      "var_value": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4088",
+      "var_value": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+    },
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4088",
+      "var_value": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 2,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_3",
+      "x": 26,
+      "y": 11,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F78"
+    },
+    {
+      "type": "hidden_item",
+      "x": 27,
+      "y": 2,
+      "elevation": 0,
+      "item": "ITEM_NEST_BALL",
+      "flag": "68",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 7,
+      "y": 16,
+      "elevation": 0,
+      "item": "ITEM_NET_BALL",
+      "flag": "69",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 2,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 2,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 5,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 5,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 4,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 4,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 4,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 5,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 5,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 3,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 3,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 4,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 5,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+    }
+  ]
+}
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
new file mode 100644
index 000000000..bac115e76
--- /dev/null
+++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
@@ -0,0 +1,186 @@
+FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E
+	map_script 1, FiveIsland_RocketWarehouse_MapScript1_163F3D
+	map_script 3, FiveIsland_RocketWarehouse_MapScript2_163F39
+	.byte 0
+
+FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39
+	setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE
+	end
+
+FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D
+	checktrainerflag FLAG_0x21F
+	call_if 1, EventScript_163F47
+	end
+
+EventScript_163F47:: @ 8163F47
+	setmetatile 26, 20, 672, 0
+	setmetatile 27, 20, 672, 0
+	return
+
+FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A
+	lockall
+	checkflag FLAG_0x2D5
+	goto_if_eq EventScript_163F6E
+	msgbox gUnknown_817B4E3
+	releaseall
+	end
+
+EventScript_163F6E:: @ 8163F6E
+	msgbox gUnknown_817B512
+	releaseall
+	end
+
+FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78
+	msgbox gUnknown_817BB15, 3
+	end
+
+FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
+	lockall
+	applymovement 4, Movement_1A75E7
+	waitmovement 0
+	setvar VAR_0x4088, 1
+	releaseall
+	end
+
+FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
+	trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD
+	checkflag FLAG_0x844
+	goto_if_eq EventScript_163FB7
+	msgbox gUnknown_817BCA3, 6
+	end
+
+EventScript_163FB7:: @ 8163FB7
+	setvar VAR_0x8004, 15
+	setvar VAR_0x8005, 5
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817BCD7, 6
+	end
+
+EventScript_163FCD:: @ 8163FCD
+	msgbox gUnknown_817BC6C
+	setflag FLAG_0x2DC
+	giveitem ITEM_SAPPHIRE
+	release
+	end
+
+FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6
+	trainerbattle 0, 541, 0, Text_17B54D, Text_17B585
+	msgbox gUnknown_817B5A6, 6
+	end
+
+FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD
+	trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9
+	msgbox gUnknown_817B6EF, 6
+	end
+
+FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014
+	trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F
+	msgbox gUnknown_817BA64, 6
+	end
+
+EventScript_16402F:: @ 816402F
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare_var_to_value VAR_0x8004, 24
+	call_if 3, EventScript_164065
+	msgbox gUnknown_817BA64
+	closemessage
+	fadescreen 1
+	removeobject 1
+	removeobject 2
+	removeobject 4
+	removeobject 3
+	setflag FLAG_0x088
+	fadescreen 0
+	setvar VAR_0x4088, 1
+	setflag FLAG_0x2D5
+	release
+	end
+
+EventScript_164065:: @ 8164065
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	return
+
+FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070
+	trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F
+	msgbox gUnknown_817B642, 6
+	end
+
+FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
+	trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2
+	msgbox gUnknown_817B7FA, 6
+	end
+
+EventScript_1640A2:: @ 81640A2
+	getplayerxy VAR_0x8004, VAR_0x8005
+	specialvar VAR_RESULT, player_get_direction_lower_nybble
+	compare_var_to_value VAR_RESULT, 2
+	call_if 1, EventScript_16412E
+	msgbox gUnknown_817B7AE
+	closemessage
+	compare_var_to_value VAR_0x8004, 24
+	call_if 3, EventScript_164144
+	compare_var_to_value VAR_0x8004, 25
+	call_if 1, EventScript_16414F
+	compare_var_to_value VAR_0x8004, 26
+	call_if 1, EventScript_16415A
+	compare_var_to_value VAR_0x8004, 27
+	call_if 1, EventScript_16415A
+	playse SE_PIN
+	call EventScript_163F47
+	special DrawWholeMapView
+	waitse
+	compare_var_to_value VAR_0x8004, 24
+	call_if 3, EventScript_164165
+	compare_var_to_value VAR_0x8004, 25
+	call_if 1, EventScript_164165
+	compare_var_to_value VAR_0x8004, 26
+	call_if 1, EventScript_164165
+	compare_var_to_value VAR_0x8004, 27
+	call_if 1, EventScript_164170
+	msgbox gUnknown_817B7FA
+	release
+	end
+
+EventScript_16412E:: @ 816412E
+	compare_var_to_value VAR_0x8004, 27
+	goto_if_eq EventScript_1A77A9
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	return
+
+EventScript_164144:: @ 8164144
+	applymovement 3, Movement_16417B
+	waitmovement 0
+	return
+
+EventScript_16414F:: @ 816414F
+	applymovement 3, Movement_16417F
+	waitmovement 0
+	return
+
+EventScript_16415A:: @ 816415A
+	applymovement 3, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_164165:: @ 8164165
+	applymovement 3, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_164170:: @ 8164170
+	applymovement 3, Movement_1A75ED
+	waitmovement 0
+	return
+
+Movement_16417B:: @ 816417B
+	step_13
+	step_13
+	step_2e
+	step_end
+
+Movement_16417F:: @ 816417F
+	step_13
+	step_2e
+	step_end
diff --git a/data/maps/FiveIsland_RocketWarehouse/text.inc b/data/maps/FiveIsland_RocketWarehouse/text.inc
new file mode 100644
index 000000000..b77ebd7c8
--- /dev/null
+++ b/data/maps/FiveIsland_RocketWarehouse/text.inc
@@ -0,0 +1,137 @@
+gUnknown_817B4E3:: @ 817B4E3
+    .string "There are many POKéMON locked\n"
+    .string "away in the pen…$"
+
+gUnknown_817B512:: @ 817B512
+    .string "The pen door is unlocked.\n"
+    .string "The POKéMON appear to have fled.$"
+
+Text_17B54D:: @ 817B54D
+    .string "Did you come here knowing it's\n"
+    .string "TEAM ROCKET's WAREHOUSE?$"
+
+Text_17B585:: @ 817B585
+    .string "What do you think you're doing?!$"
+
+gUnknown_817B5A6:: @ 817B5A6
+    .string "TEAM ROCKET broke up?\n"
+    .string "What planet are you from?$"
+
+Text_17B5D6:: @ 817B5D6
+    .string "Oh, now your POKéMON look strong.\n"
+    .string "You're willing to sell them?\p"
+    .string "Oh?\n"
+    .string "You wanted to battle?$"
+
+Text_17B62F:: @ 817B62F
+    .string "Oh, but…\n"
+    .string "Too much!$"
+
+gUnknown_817B642:: @ 817B642
+    .string "We can give you a great price.\n"
+    .string "Sell us your POKéMON!$"
+
+Text_17B677:: @ 817B677
+    .string "I got word about you from the\n"
+    .string "others.\p"
+    .string "But there's no way a kid like you'd\n"
+    .string "know our BOSS GIOVANNI!$"
+
+Text_17B6D9:: @ 817B6D9
+    .string "Don't…you…dare…laugh…$"
+
+gUnknown_817B6EF:: @ 817B6EF
+    .string "Don't mess in the doings of adults,\n"
+    .string "you jumped-up pip-squeak!$"
+
+Text_17B72D:: @ 817B72D
+    .string "I don't know or care if what I'm\n"
+    .string "doing is right or wrong…\p"
+    .string "I just put my faith in GIOVANNI\n"
+    .string "and do as I am told.$"
+
+Text_17B79C:: @ 817B79C
+    .string "I…\n"
+    .string "I'm shattered…$"
+
+gUnknown_817B7AE:: @ 817B7AE
+    .string "You're doing things according to\n"
+    .string "your beliefs and morals.\p"
+    .string "I understand now…$"
+
+gUnknown_817B7FA:: @ 817B7FA
+    .string "I've made it so you can come back\n"
+    .string "in through there.\p"
+    .string "Why don't you go get rested and\n"
+    .string "refreshed for what lies ahead?\p"
+    .string "The ADMIN after me outranks me\n"
+    .string "thoroughly as a TRAINER.\p"
+    .string "You'd better steel yourself for one\n"
+    .string "harsh challenge.$"
+
+Text_17B8DA:: @ 817B8DA
+    .string "That's quite enough of you \n"
+    .string "playing the hero, kid.\p"
+    .string "Spreading lies about how TEAM\n"
+    .string "ROCKET has disbanded…\p"
+    .string "It's such an obvious attempt to\n"
+    .string "cause confusion in our ranks.\p"
+    .string "Fortunately, we're not so ignorant\n"
+    .string "to fall for the lies of a child!\p"
+    .string "And now, I'll show you how scary\n"
+    .string "an angry adult can be!$"
+
+Text_17B9FB:: @ 817B9FB
+    .string "Urgh…\n"
+    .string "You were too strong…\p"
+    .string "…\n"
+    .string "Th-that's GIOVANNI's BADGE!\p"
+    .string "So it's true?\n"
+    .string "TEAM ROCKET really has disbanded?$"
+
+gUnknown_817BA64:: @ 817BA64
+    .string "We will abandon this WAREHOUSE…\p"
+    .string "But don't think this is over.\n"
+    .string "I won't let this be the end.\p"
+    .string "I will find GIOVANNI.\n"
+    .string "And I will resurrect TEAM ROCKET!\l"
+    .string "I will…\p"
+    .string "Until then, farewell!$"
+
+gUnknown_817BB15:: @ 817BB15
+    .string "A report with graphs and text is on\n"
+    .string "the PC monitor.\p"
+    .string "“The Influence of Magnetic Waves\n"
+    .string "on POKéMON Evolution”…\p"
+    .string "… … … … … …\p"
+    .string "It's too difficult to understand…$"
+
+Text_17BBAF:: @ 817BBAF
+    .string "I almost managed to sell the\n"
+    .string "SAPPHIRE for huge money…\p"
+    .string "Then, you just had to come along\n"
+    .string "and blow the whole deal apart!\p"
+    .string "Fufu… Fufufufu…\n"
+    .string "There's no forgiveness for you!$"
+
+Text_17BC55:: @ 817BC55
+    .string "Gah! Darn!\n"
+    .string "Darn! Darn!$"
+
+gUnknown_817BC6C:: @ 817BC6C
+    .string "If I can't sell it, it's worthless!\n"
+    .string "Go ahead, take it!$"
+
+gUnknown_817BCA3:: @ 817BCA3
+    .string "What do you want now?\n"
+    .string "Go on, get lost, leave me be.$"
+
+gUnknown_817BCD7:: @ 817BCD7
+    .string "What, you again?\p"
+    .string "You… You're not GIOVANNI's kid,\n"
+    .string "are you?\p"
+    .string "No, that can't be right!\n"
+    .string "GIOVANNI's kid has red hair.\p"
+    .string "You don't have any reasons for\n"
+    .string "bugging me. Leave me alone!$"
+
diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json
new file mode 100644
index 000000000..97a0961fd
--- /dev/null
+++ b/data/maps/FiveIsland_WaterLabyrinth/map.json
@@ -0,0 +1,57 @@
+{
+  "id": "MAP_FIVE_ISLAND_WATER_LABYRINTH",
+  "name": "FiveIsland_WaterLabyrinth",
+  "layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_WATER_LABYRINTH",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
+      "offset": 48,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_FIVE_ISLAND",
+      "offset": 48,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FiveIsland_WaterLabyrinth_EventScript_16884E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FiveIsland_WaterLabyrinth_EventScript_1AC2D9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
new file mode 100644
index 000000000..b3b6243ab
--- /dev/null
+++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
@@ -0,0 +1,74 @@
+FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D
+	.byte 0
+
+FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	checkflag FLAG_0x2DA
+	goto_if_eq EventScript_1688E3
+	checkflag FLAG_0x2DB
+	goto_if_eq EventScript_16892C
+	msgbox gUnknown_818A80D
+	specialvar VAR_RESULT, sub_80CA76C
+	compare_var_to_value VAR_RESULT, 6
+	goto_if_eq EventScript_1688AC
+	msgbox gUnknown_818A88F
+	release
+	end
+
+EventScript_168895:: @ 8168895
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_818AA0C
+	release
+	end
+
+EventScript_1688AC:: @ 81688AC
+	msgbox gUnknown_818A8A6
+	goto EventScript_1688BA
+	end
+
+EventScript_1688BA:: @ 81688BA
+	countpokemon
+	compare_var_to_value VAR_RESULT, 6
+	goto_if_eq EventScript_16891F
+	setflag FLAG_0x2DA
+	giveegg SPECIES_TOGEPI
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message Text_18A91F
+	waitfanfare
+	waitmessage
+	call EventScript_1A6675
+	goto EventScript_1688E3
+	end
+
+EventScript_1688E3:: @ 81688E3
+	getspeciesname 1, SPECIES_TOGEPI
+	setvar VAR_0x8004, 175
+	specialvar VAR_RESULT, sub_80CD0F4
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_168895
+	getspeciesname 1, SPECIES_TOGETIC
+	setvar VAR_0x8004, 176
+	specialvar VAR_RESULT, sub_80CD0F4
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_168895
+	msgbox gUnknown_818A9C0
+	release
+	end
+
+EventScript_16891F:: @ 816891F
+	setflag FLAG_0x2DB
+	msgbox gUnknown_818A940
+	release
+	end
+
+EventScript_16892C:: @ 816892C
+	goto EventScript_1688BA
+	end
diff --git a/data/maps/FiveIsland_WaterLabyrinth/text.inc b/data/maps/FiveIsland_WaterLabyrinth/text.inc
new file mode 100644
index 000000000..111671eb9
--- /dev/null
+++ b/data/maps/FiveIsland_WaterLabyrinth/text.inc
@@ -0,0 +1,49 @@
+gUnknown_818A80D:: @ 818A80D
+    .string "You travel all over the place,\n"
+    .string "don't you?\p"
+    .string "You're not driving your POKéMON\n"
+    .string "too harshly, are you?\p"
+    .string "Let me take a look.\n"
+    .string "… … …   … … …$"
+
+gUnknown_818A88F:: @ 818A88F
+    .string "Ah, hmm…\n"
+    .string "I see, I see…$"
+
+gUnknown_818A8A6:: @ 818A8A6
+    .string "Oh, impressive.\n"
+    .string "You treat your POKéMON right.\p"
+    .string "I think you can be entrusted with\n"
+    .string "this.\p"
+    .string "Please, I'd like you to have this.$"
+
+Text_18A91F:: @ 818A91F
+    .string "{PLAYER} received an EGG\n"
+    .string "from the man!$"
+
+gUnknown_818A940:: @ 818A940
+    .string "…Unfortunately, you don't have\n"
+    .string "space for this in your party.\p"
+    .string "You'd better come back for it\n"
+    .string "another time.$"
+
+Text_18A9A9:: @ 818A9A9
+    .string "やあ\n"
+    .string "タマゴを　もらいに\l"
+    .string "きて　くれたんだね$"
+
+gUnknown_818A9C0:: @ 818A9C0
+    .string "I received that EGG while I was\n"
+    .string "traveling.\p"
+    .string "I'm glad I met someone like you.$"
+
+gUnknown_818AA0C:: @ 818AA0C
+    .string "Oh, hello.\n"
+    .string "That's a cute {STR_VAR_2}.\p"
+    .string "Seeing it reminds me of a sweet \n"
+    .string "little girl I met while traveling.\p"
+    .string "She was gently grooming POKéMON…\n"
+    .string "She was a little angel.\p"
+    .string "That little girl's name…\n"
+    .string "I think it was DAISY.$"
+
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
new file mode 100644
index 000000000..b167e2ba0
--- /dev/null
+++ b/data/maps/FourIsland/map.json
@@ -0,0 +1,266 @@
+{
+  "id": "MAP_FOUR_ISLAND",
+  "name": "FourIsland",
+  "layout": "LAYOUT_FOUR_ISLAND",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 16,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_EventScript_167D55",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "132",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "122",
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "123",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "121",
+      "x": 17,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "35",
+      "x": 26,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_EventScript_167E2E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_EventScript_1BEC28",
+      "flag": "473"
+    },
+    {
+      "graphics_id": "92",
+      "x": 32,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_EventScript_1BEC35",
+      "flag": "474"
+    },
+    {
+      "graphics_id": "72",
+      "x": 8,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "151"
+    },
+    {
+      "graphics_id": "27",
+      "x": 36,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_EventScript_167E73",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 31,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_EventScript_167E5A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 25,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 38,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 33,
+      "y": 23,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_LORELEIS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 25,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 28,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 22,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_MART",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 19,
+      "elevation": 0,
+      "script": "FourIsland_EventScript_167E7C"
+    },
+    {
+      "type": "hidden_item",
+      "x": 22,
+      "y": 34,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "168",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 6,
+      "y": 21,
+      "elevation": 3,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "169",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 31,
+      "y": 23,
+      "elevation": 0,
+      "script": "FourIsland_EventScript_167E85"
+    }
+  ]
+}
diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc
new file mode 100644
index 000000000..3e4348e7b
--- /dev/null
+++ b/data/maps/FourIsland/scripts.inc
@@ -0,0 +1,179 @@
+FourIsland_MapScripts:: @ 8167CAE
+	map_script 3, FourIsland_MapScript1_167CB9
+	map_script 2, FourIsland_MapScript2_167CE2
+	.byte 0
+
+FourIsland_MapScript1_167CB9:: @ 8167CB9
+	setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
+	compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0
+	call_if 1, EventScript_167CCD
+	call EventScript_167CD1
+	end
+
+EventScript_167CCD:: @ 8167CCD
+	clearflag FLAG_0x097
+	return
+
+EventScript_167CD1:: @ 8167CD1
+	checkflag FLAG_PENDING_DAYCARE_EGG
+	goto_if 0, EventScript_167CE1
+	setobjectxyperm 1, 16, 14
+
+EventScript_167CE1:: @ 8167CE1
+	return
+
+FourIsland_MapScript2_167CE2:: @ 8167CE2
+	map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC
+	.2byte 0
+
+EventScript_167CEC:: @ 8167CEC
+	lockall
+	textcolor 0
+	applymovement 10, Movement_1A75ED
+	waitmovement 0
+	playbgm BGM_FRLG_RIVAL, 0
+	applymovement 10, Movement_1A75DB
+	waitmovement 0
+	applymovement 10, Movement_1A75DD
+	waitmovement 0
+	delay 25
+	applymovement 10, Movement_167D49
+	waitmovement 0
+	msgbox gUnknown_8182B37
+	closemessage
+	applymovement 255, Movement_167D52
+	applymovement 10, Movement_167D4E
+	waitmovement 0
+	fadedefaultbgm
+	playse SE_KAIDAN
+	delay 35
+	removeobject 10
+	setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
+	releaseall
+	end
+
+Movement_167D49:: @ 8167D49
+	step_13
+	step_13
+	step_10
+	step_10
+	step_end
+
+Movement_167D4E:: @ 8167D4E
+	step_1c
+	step_1a
+	step_10
+	step_end
+
+Movement_167D52:: @ 8167D52
+	step_12
+	step_30
+	step_end
+
+FourIsland_EventScript_167D55:: @ 8167D55
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	special GetDaycareMonNicknames
+	specialvar VAR_RESULT, GetDaycareState
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_167D9B
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_167E0C
+	compare_var_to_value VAR_RESULT, 3
+	goto_if_eq EventScript_167E19
+	msgbox gUnknown_81BF555
+	release
+	end
+
+EventScript_167D9B:: @ 8167D9B
+	msgbox gUnknown_81BF5E3, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_167DD1
+	msgbox gUnknown_81BF7B6, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_167DD1
+	msgbox gUnknown_81BF6CF
+	clearflag FLAG_PENDING_DAYCARE_EGG
+	special RejectEggFromDayCare
+	release
+	end
+
+EventScript_167DD1:: @ 8167DD1
+	specialvar VAR_RESULT, CalculatePlayerPartyCount
+	compare_var_to_value VAR_RESULT, 6
+	goto_if 5, EventScript_167DEB
+	msgbox gUnknown_81BF6F0
+	release
+	end
+
+EventScript_167DEB:: @ 8167DEB
+	textcolor 3
+	message Text_1BF72A
+	call EventScript_1A6675
+	playfanfare MUS_FANFA1
+	waitfanfare
+	waitbuttonpress
+	msgbox gUnknown_81BF755
+	special GiveEggFromDaycare
+	clearflag FLAG_PENDING_DAYCARE_EGG
+	release
+	end
+
+EventScript_167E0C:: @ 8167E0C
+	special GetDaycareMonNicknames
+	msgbox gUnknown_81BF69A
+	release
+	end
+
+EventScript_167E19:: @ 8167E19
+	special GetDaycareMonNicknames
+	msgbox gUnknown_81BF789
+	special SetDaycareCompatibilityString
+	special sub_80CA68C
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+FourIsland_EventScript_167E2E:: @ 8167E2E
+	lock
+	faceplayer
+	checkflag FLAG_0x844
+	goto_if_eq EventScript_167E43
+	msgbox gUnknown_8182A2B
+	release
+	end
+
+EventScript_167E43:: @ 8167E43
+	setvar VAR_0x8004, 9
+	setvar VAR_0x8005, 5
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8182A75
+	release
+	end
+
+FourIsland_EventScript_167E5A:: @ 8167E5A
+	lock
+	faceplayer
+	setvar VAR_0x8004, 9
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8182CE3
+	release
+	end
+
+FourIsland_EventScript_167E73:: @ 8167E73
+	msgbox gUnknown_8182D8E, 2
+	end
+
+FourIsland_EventScript_167E7C:: @ 8167E7C
+	msgbox gUnknown_8182A03, 3
+	end
+
+FourIsland_EventScript_167E85:: @ 8167E85
+	msgbox gUnknown_8182DEB, 3
+	end
diff --git a/data/maps/FourIsland/text.inc b/data/maps/FourIsland/text.inc
new file mode 100644
index 000000000..04845b223
--- /dev/null
+++ b/data/maps/FourIsland/text.inc
@@ -0,0 +1,56 @@
+gUnknown_8182A03:: @ 8182A03
+    .string "FOUR ISLAND\n"
+    .string "The Warm, Blue, Floe Island$"
+
+gUnknown_8182A2B:: @ 8182A2B
+    .string "LORELEI has returned.\p"
+    .string "Did she find the city life too\n"
+    .string "stressful, I wonder?$"
+
+gUnknown_8182A75:: @ 8182A75
+    .string "LORELEI has gone back.\p"
+    .string "The LAPRAS she has, I imagine it\n"
+    .string "to be the one she met as a child.\p"
+    .string "I believe it was in ICEFALL CAVE\n"
+    .string "that she caught it.\p"
+    .string "Perhaps that POKéMON has been with\n"
+    .string "her ever since.$"
+
+gUnknown_8182B37:: @ 8182B37
+    .string "{RIVAL}: Hey!\n"
+    .string "{PLAYER}!\p"
+    .string "What are you doing here in the\n"
+    .string "SEVII ISLANDS?\p"
+    .string "You should quit copying me,\n"
+    .string "you know?\p"
+    .string "Anyways, I already got my POKéMON\n"
+    .string "EGG, so I'm done with this island.\p"
+    .string "Heh, I bet you don't even know\n"
+    .string "about POKéMON EGGS.\p"
+    .string "You'll never fill your NATIONAL\n"
+    .string "POKéDEX that way.\p"
+    .string "By the way, I saw someone we both\n"
+    .string "know on this island.\p"
+    .string "Why don't you go look around if\n"
+    .string "it makes you curious?\p"
+    .string "Me, I don't have the time to\n"
+    .string "waste.\p"
+    .string "Be smelling ya!$"
+
+gUnknown_8182CE3:: @ 8182CE3
+    .string "Oh, you found me!\n"
+    .string "Please don't tell LORELEI.\p"
+    .string "Did you know that LORELEI has lots\n"
+    .string "and lots of stuffed dolls?\p"
+    .string "Every time she comes back to\n"
+    .string "FOUR ISLAND, her collection grows!$"
+
+gUnknown_8182D8E:: @ 8182D8E
+    .string "Ooh, chilly!\p"
+    .string "I made a slushie using ice I\n"
+    .string "shaved inside ICEFALL CAVE.\p"
+    .string "It's chilly and tasty!$"
+
+gUnknown_8182DEB:: @ 8182DEB
+    .string "LORELEI'S HOUSE$"
+
diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json
new file mode 100644
index 000000000..2ec5e402b
--- /dev/null
+++ b/data/maps/FourIsland_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_FOUR_ISLAND_HARBOR",
+  "name": "FourIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_Harbor_EventScript_171C99",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..2c7fce02f
--- /dev/null
+++ b/data/maps/FourIsland_Harbor/scripts.inc
@@ -0,0 +1,11 @@
+FourIsland_Harbor_MapScripts:: @ 8171C98
+	.byte 0
+
+FourIsland_Harbor_EventScript_171C99:: @ 8171C99
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 4
+	goto EventScript_1A900F
+	end
diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json
new file mode 100644
index 000000000..99eb97da3
--- /dev/null
+++ b/data/maps/FourIsland_House1/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_FOUR_ISLAND_HOUSE1",
+  "name": "FourIsland_House1",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "27",
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_House1_EventScript_1C4D84",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "27",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_House1_EventScript_171C45",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc
new file mode 100644
index 000000000..d7139c370
--- /dev/null
+++ b/data/maps/FourIsland_House1/scripts.inc
@@ -0,0 +1,6 @@
+FourIsland_House1_MapScripts:: @ 8171C44
+	.byte 0
+
+FourIsland_House1_EventScript_171C45:: @ 8171C45
+	msgbox gUnknown_81A3802, 2
+	end
diff --git a/data/maps/FourIsland_House1/text.inc b/data/maps/FourIsland_House1/text.inc
new file mode 100644
index 000000000..2d4f8c4bd
--- /dev/null
+++ b/data/maps/FourIsland_House1/text.inc
@@ -0,0 +1,23 @@
+Text_1A3778:: @ 81A3778
+    .string "そーれ　ぼよーん！\n"
+    .string "どっちが　さきに　へたばるか？\l"
+    .string "のしかかり　しょうぶ　してるんだ\p"
+    .string "きみは　なかまに　はいったら\n"
+    .string "つぶれそうだな‥\l"
+    .string "かわりに　きみの　ポケモンに\l"
+    .string "のしかかり　おしえて　やろっか？$"
+
+Text_1A37DB:: @ 81A37DB
+    .string "また　おいで　ぼよーん！$"
+
+Text_1A37E8:: @ 81A37E8
+    .string "どの　ポケモンに\n"
+    .string "おしえたい　かい？$"
+
+Text_1A37FB:: @ 81A37FB
+    .string "ぼよよーん！$"
+
+gUnknown_81A3802:: @ 81A3802
+    .string "There! Boing!\n"
+    .string "You're awfully heavy!$"
+
diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json
new file mode 100644
index 000000000..6811c33ae
--- /dev/null
+++ b/data/maps/FourIsland_House2/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FOUR_ISLAND_HOUSE2",
+  "name": "FourIsland_House2",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "25",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_House2_EventScript_1B2938",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_House2/scripts.inc b/data/maps/FourIsland_House2/scripts.inc
new file mode 100644
index 000000000..e74407be5
--- /dev/null
+++ b/data/maps/FourIsland_House2/scripts.inc
@@ -0,0 +1,2 @@
+FourIsland_House2_MapScripts:: @ 8171CAC
+	.byte 0
diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json
new file mode 100644
index 000000000..00fa4bac0
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_1F/map.json
@@ -0,0 +1,89 @@
+{
+  "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F",
+  "name": "FourIsland_IcefallCave_1F",
+  "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_ICEFALL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_IcefallCave_1F_EventScript_1BED53",
+      "flag": "496"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_IcefallCave_1F_EventScript_1BED60",
+      "flag": "497"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc
new file mode 100644
index 000000000..866c0c578
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc
@@ -0,0 +1,33 @@
+FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44
+	map_script 5, FourIsland_IcefallCave_1F_MapScript1_163D54
+	map_script 1, FourIsland_IcefallCave_1F_MapScript2_163D57
+	map_script 2, FourIsland_IcefallCave_1F_MapScript3_163D5B
+	.byte 0
+
+FourIsland_IcefallCave_1F_MapScript1_163D54:: @ 8163D54
+	setstepcallback 4
+	end
+
+FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57
+	special sub_806E99C
+	end
+
+FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B
+	map_script_2 VAR_0x4001, 1, EventScript_163D65
+	.2byte 0
+
+EventScript_163D65:: @ 8163D65
+	lockall
+	delay 20
+	applymovement 255, Movement_163D7F
+	waitmovement 0
+	playse SE_FU_ZAKU
+	delay 60
+	warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F
+	waitstate
+	releaseall
+	end
+
+Movement_163D7F:: @ 8163D7F
+	step_60
+	step_end
diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json
new file mode 100644
index 000000000..940d888f1
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_B1F/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F",
+  "name": "FourIsland_IcefallCave_B1F",
+  "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_ICEFALL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 10,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_IcefallCave_B1F_EventScript_1BED6D",
+      "flag": "498"
+    },
+    {
+      "graphics_id": "92",
+      "x": 21,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_IcefallCave_B1F_EventScript_1BED7A",
+      "flag": "499"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 15,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_IcefallCave_B1F/scripts.inc b/data/maps/FourIsland_IcefallCave_B1F/scripts.inc
new file mode 100644
index 000000000..a3ec3cf54
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_B1F/scripts.inc
@@ -0,0 +1,2 @@
+FourIsland_IcefallCave_B1F_MapScripts:: @ 8163D81
+	.byte 0
diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json
new file mode 100644
index 000000000..0b3ca6e97
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_Back/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK",
+  "name": "FourIsland_IcefallCave_Back",
+  "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_ICEFALL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 11,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "141"
+    },
+    {
+      "graphics_id": "49",
+      "x": 13,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "141"
+    },
+    {
+      "graphics_id": "77",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_IcefallCave_Back_EventScript_163F25",
+      "flag": "139"
+    },
+    {
+      "graphics_id": "49",
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "141"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 23,
+      "elevation": 0,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_0x4080",
+      "var_value": 0,
+      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_0x4080",
+      "var_value": 0,
+      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_0x4080",
+      "var_value": 0,
+      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
new file mode 100644
index 000000000..b2451b2ec
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
@@ -0,0 +1,192 @@
+FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82
+	map_script 3, FourIsland_IcefallCave_Back_MapScript1_163D88
+	.byte 0
+
+FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88
+	compare_var_to_value VAR_0x4080, 1
+	call_if 1, EventScript_163D94
+	end
+
+EventScript_163D94:: @ 8163D94
+	setflag FLAG_0x08B
+	return
+
+FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
+	lockall
+	textcolor 1
+	msgbox gUnknown_817B04F
+	applymovement 1, Movement_163EE8
+	waitmovement 0
+	textcolor 0
+	msgbox gUnknown_817B0B9
+	closemessage
+	playse SE_PIN
+	applymovement 3, Movement_1A75DB
+	waitmovement 0
+	applymovement 3, Movement_1A75ED
+	waitmovement 0
+	applymovement 3, Movement_1A75DD
+	waitmovement 0
+	textcolor 1
+	msgbox gUnknown_817B109
+	closemessage
+	applymovement 3, Movement_1A75EB
+	waitmovement 0
+	delay 18
+	applymovement 3, Movement_1A75ED
+	waitmovement 0
+	delay 35
+	applymovement 4, Movement_163F11
+	applymovement 3, Movement_163F18
+	applymovement 255, Movement_163EDD
+	waitmovement 0
+	applymovement 2, Movement_163EE8
+	waitmovement 0
+	playbgm BGM_FRLG_SUSPICIOUS_EYE, 0
+	textcolor 0
+	msgbox gUnknown_817B20B
+	setvar VAR_LAST_TALKED, 4
+	trainerbattle 3, 539, 0, Text_17B251
+	applymovement 3, Movement_163F1B
+	waitmovement 0
+	textcolor 1
+	msgbox gUnknown_817B269
+	textcolor 0
+	msgbox gUnknown_817B2EF
+	textcolor 1
+	message Text_17B313
+	waitmessage
+	waitse
+	playmoncry SPECIES_LAPRAS, 2
+	waitbuttonpress
+	waitmoncry
+	applymovement 1, Movement_163EEE
+	waitmovement 0
+	textcolor 0
+	msgbox gUnknown_817B399
+	closemessage
+	applymovement 3, Movement_163F1D
+	applymovement 255, Movement_163EE2
+	applymovement 1, Movement_163EF0
+	applymovement 2, Movement_163EFA
+	applymovement 4, Movement_163F05
+	waitmovement 0
+	removeobject 1
+	removeobject 2
+	removeobject 4
+	delay 50
+	applymovement 3, Movement_163F23
+	waitmovement 0
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	textcolor 1
+	msgbox gUnknown_817B457
+	setflag FLAG_0x08E
+	clearflag FLAG_0x08C
+	setvar VAR_0x4080, 1
+	releaseall
+	end
+
+Movement_163EDD:: @ 8163EDD
+	step_11
+	step_11
+	step_13
+	step_11
+	step_end
+
+Movement_163EE2:: @ 8163EE2
+	step_1c
+	step_2f
+	step_1c
+	step_1c
+	step_2d
+	step_end
+
+Movement_163EE8:: @ 8163EE8
+	step_25
+	step_end
+
+gUnknown_163EEA:: @ 8163EEA
+	step_4c
+	step_13
+	step_4d
+	step_end
+
+Movement_163EEE:: @ 8163EEE
+	step_29
+	step_end
+
+Movement_163EF0:: @ 8163EF0
+	step_13
+	step_10
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_end
+
+Movement_163EFA:: @ 8163EFA
+	step_1c
+	step_12
+	step_10
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_end
+
+Movement_163F05:: @ 8163F05
+	step_1c
+	step_10
+	step_1c
+	step_10
+	step_20
+	step_20
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_end
+
+Movement_163F11:: @ 8163F11
+	step_1c
+	step_1b
+	step_30
+	step_end
+
+Movement_163F15:: @ 8163F15
+	step_12
+	step_12
+	step_end
+
+Movement_163F18:: @ 8163F18
+	step_12
+	step_11
+	step_end
+
+Movement_163F1B:: @ 8163F1B
+	step_26
+	step_end
+
+Movement_163F1D:: @ 8163F1D
+	step_1b
+	step_30
+	step_1c
+	step_1c
+	step_2d
+	step_end
+
+Movement_163F23:: @ 8163F23
+	step_13
+	step_end
+
+FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25
+	msgbox gUnknown_817B457, 2
+	end
diff --git a/data/maps/FourIsland_IcefallCave_Back/text.inc b/data/maps/FourIsland_IcefallCave_Back/text.inc
new file mode 100644
index 000000000..f65e95854
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_Back/text.inc
@@ -0,0 +1,73 @@
+gUnknown_817B04F:: @ 817B04F
+    .string "LORELEI: Keep your filthy hands\n"
+    .string "off the POKéMON in the cave!\p"
+    .string "Do as I say, or you'll have me to\n"
+    .string "answer to!$"
+
+gUnknown_817B0B9:: @ 817B0B9
+    .string "Aww, shut it, lady, and leave\n"
+    .string "us be.\p"
+    .string "Don't let your glasses get all\n"
+    .string "steamed up!$"
+
+gUnknown_817B109:: @ 817B109
+    .string "LORELEI: {PLAYER}?!\n"
+    .string "What are you doing here?\p"
+    .string "No, we can catch up later.\n"
+    .string "Right now, I need your help.\p"
+    .string "Help me kick these poachers out\n"
+    .string "before they do anything else.\p"
+    .string "They've been catching POKéMON\n"
+    .string "here, then selling them off!\p"
+    .string "Are you ready?\n"
+    .string "You take that one, please!$"
+
+gUnknown_817B20B:: @ 817B20B
+    .string "W-what?!\p"
+    .string "Who says we can't do what we want\n"
+    .string "with the POKéMON we catch?$"
+
+Text_17B251:: @ 817B251
+    .string "We didn't plan on this!$"
+
+gUnknown_817B269:: @ 817B269
+    .string "LORELEI: Humph.\n"
+    .string "So despicably weak.\p"
+    .string "You!\n"
+    .string "Tell me!\p"
+    .string "Where have you taken the captured\n"
+    .string "POKéMON?\p"
+    .string "I'm smashing your ring once and\n"
+    .string "for all!$"
+
+gUnknown_817B2EF:: @ 817B2EF
+    .string "N-no way!\n"
+    .string "I'm not telling you that!$"
+
+Text_17B313:: @ 817B313
+    .string "LORELEI: If you won't confess,\n"
+    .string "we'll deep-freeze you.\p"
+    .string "My LAPRAS is furious for what\n"
+    .string "you've done to its friends.\p"
+    .string "Go, LAPRAS!\n"
+    .string "ICE BEAM…$"
+
+gUnknown_817B399:: @ 817B399
+    .string "Wawaah! Okay!\n"
+    .string "I'll talk!\p"
+    .string "The POKéMON are in the ROCKET\n"
+    .string "WAREHOUSE on FIVE ISLAND.\p"
+    .string "There! I said it!\n"
+    .string "We'll be going now!\p"
+    .string "…But I doubt you'll ever make it\n"
+    .string "into the ROCKET WAREHOUSE!\p"
+    .string "Heheheheh!$"
+
+gUnknown_817B457:: @ 817B457
+    .string "{PLAYER}, thank you.\n"
+    .string "But this is awful…\p"
+    .string "I was born and raised here on\n"
+    .string "these islands.\p"
+    .string "I had no idea that those horrible\n"
+    .string "criminals were loose here…$"
+
diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json
new file mode 100644
index 000000000..babdb41da
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE",
+  "name": "FourIsland_IcefallCave_Entrance",
+  "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_ICEFALL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 30,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 10,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc
new file mode 100644
index 000000000..a3c4ea616
--- /dev/null
+++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc
@@ -0,0 +1,7 @@
+FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A
+	map_script 3, FourIsland_IcefallCave_Entrance_MapScript1_163D40
+	.byte 0
+
+FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40
+	setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE
+	end
diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json
new file mode 100644
index 000000000..9c73e30f2
--- /dev/null
+++ b/data/maps/FourIsland_LoreleisHouse/map.json
@@ -0,0 +1,223 @@
+{
+  "id": "MAP_FOUR_ISLAND_LORELEIS_HOUSE",
+  "name": "FourIsland_LoreleisHouse",
+  "layout": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "77",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C58",
+      "flag": "140"
+    },
+    {
+      "graphics_id": "131",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "126",
+      "x": 10,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "120",
+      "x": 9,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "128",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "129",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "121",
+      "x": 6,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "125",
+      "x": 9,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "165"
+    },
+    {
+      "graphics_id": "117",
+      "x": 10,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "166"
+    },
+    {
+      "graphics_id": "115",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "168"
+    },
+    {
+      "graphics_id": "122",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "167"
+    },
+    {
+      "graphics_id": "123",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "169"
+    },
+    {
+      "graphics_id": "114",
+      "x": 9,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "171"
+    },
+    {
+      "graphics_id": "133",
+      "x": 10,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "170"
+    },
+    {
+      "graphics_id": "107",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+      "flag": "172"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc
new file mode 100644
index 000000000..ab7196c62
--- /dev/null
+++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc
@@ -0,0 +1,35 @@
+FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E
+	map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54
+	.byte 0
+
+FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54
+	special sub_80CD154
+	end
+
+FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58
+	lock
+	faceplayer
+	checkflag FLAG_0x2D4
+	goto_if_eq EventScript_171C83
+	checkflag FLAG_0x2D5
+	goto_if_eq EventScript_171C76
+	msgbox gUnknown_81A3826
+	release
+	end
+
+EventScript_171C76:: @ 8171C76
+	setflag FLAG_0x2D4
+	msgbox gUnknown_81A390C
+	release
+	end
+
+EventScript_171C83:: @ 8171C83
+	msgbox gUnknown_81A39D8
+	release
+	end
+
+FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D
+	lock
+	msgbox gUnknown_81A3A42
+	release
+	end
diff --git a/data/maps/FourIsland_LoreleisHouse/text.inc b/data/maps/FourIsland_LoreleisHouse/text.inc
new file mode 100644
index 000000000..5c7d0cd81
--- /dev/null
+++ b/data/maps/FourIsland_LoreleisHouse/text.inc
@@ -0,0 +1,29 @@
+gUnknown_81A3826:: @ 81A3826
+    .string "LORELEI: There's something weighing\n"
+    .string "heavily on my mind.\p"
+    .string "If anything were to happen on\n"
+    .string "the island where I was born…\p"
+    .string "I wouldn't know about it if I were\n"
+    .string "in the POKéMON LEAGUE.\p"
+    .string "I wonder if that would make me\n"
+    .string "irresponsible to my home…$"
+
+gUnknown_81A390C:: @ 81A390C
+    .string "LORELEI: So, you managed to solve\n"
+    .string "all the problems here?\p"
+    .string "That's wonderful.\p"
+    .string "That means there isn't any reason\n"
+    .string "for me to be here all the time.\p"
+    .string "Thank you…\p"
+    .string "I'll return to the POKéMON LEAGUE\n"
+    .string "in a short while.$"
+
+gUnknown_81A39D8:: @ 81A39D8
+    .string "I don't know what will happen in\n"
+    .string "the future, but…\p"
+    .string "I will do what I can here and now.\n"
+    .string "That's all I can do.$"
+
+gUnknown_81A3A42:: @ 81A3A42
+    .string "Stuffed POKéMON dolls galore!$"
+
diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json
new file mode 100644
index 000000000..4fbd02275
--- /dev/null
+++ b/data/maps/FourIsland_Mart/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_FOUR_ISLAND_MART",
+  "name": "FourIsland_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_Mart_EventScript_171CAE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_Mart_EventScript_1ACF46",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_Mart_EventScript_171CE8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc
new file mode 100644
index 000000000..026d172a9
--- /dev/null
+++ b/data/maps/FourIsland_Mart/scripts.inc
@@ -0,0 +1,33 @@
+FourIsland_Mart_MapScripts:: @ 8171CAD
+	.byte 0
+
+FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_171CD4
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_171CD4:: @ 8171CD4
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_ICE_HEAL
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+FourIsland_Mart_EventScript_171CE8:: @ 8171CE8
+	msgbox gUnknown_81A3B14, 2
+	end
diff --git a/data/maps/FourIsland_Mart/text.inc b/data/maps/FourIsland_Mart/text.inc
new file mode 100644
index 000000000..eba66dd37
--- /dev/null
+++ b/data/maps/FourIsland_Mart/text.inc
@@ -0,0 +1,16 @@
+Text_1A3A60:: @ 81A3A60
+    .string "We've had a great and powerful\n"
+    .string "TRAINER grow up on this island.\p"
+    .string "I bet even you'd know her.\n"
+    .string "It's LORELEI of the ELITE FOUR!\p"
+    .string "When LORELEI was just a tyke,\n"
+    .string "I taught her about POKéMON.$"
+
+gUnknown_81A3B14:: @ 81A3B14
+    .string "The SEVII ISLANDS are in a warm\n"
+    .string "region overall.\p"
+    .string "But there is one exception you\n"
+    .string "need to know about.\p"
+    .string "The ICEFALL CAVE is frigid because\n"
+    .string "of the POKéMON that live in it.$"
+
diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..0ff5c17c2
--- /dev/null
+++ b/data/maps/FourIsland_PokemonCenter_1F/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F",
+  "name": "FourIsland_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonCenter_1F_EventScript_171BF9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonCenter_1F_EventScript_171C02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "31",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonCenter_1F_EventScript_171C0B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonCenter_1F_EventScript_171C14",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
+    }
+  ]
+}
diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..cc4cb5ffa
--- /dev/null
+++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,27 @@
+FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA
+	map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5
+	map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5
+	setrespawn SPAWN_FOUR_ISLAND
+	end
+
+FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02
+	msgbox gUnknown_81A3627, 2
+	end
+
+FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B
+	msgbox gUnknown_81A3697, 2
+	end
+
+FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14
+	msgbox gUnknown_81A3734, 2
+	end
diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..59beaf443
--- /dev/null
+++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc
@@ -0,0 +1,44 @@
+Text_1A3505:: @ 81A3505
+    .string "Ready?\n"
+    .string "Boing!\p"
+    .string "We're having a BODY SLAM match\n"
+    .string "to see who wimps out first.\p"
+    .string "If you were to join us, you'd be\n"
+    .string "squashed like a bug, though…\p"
+    .string "How about I teach BODY SLAM to\n"
+    .string "a POKéMON of yours instead?$"
+
+Text_1A35C7:: @ 81A35C7
+    .string "Come again!\n"
+    .string "Boing!$"
+
+Text_1A35DA:: @ 81A35DA
+    .string "Which POKéMON wants to learn how\n"
+    .string "to BODY SLAM?$"
+
+Text_1A3609:: @ 81A3609
+    .string "Boioing!$"
+
+Text_1A3612:: @ 81A3612
+    .string "それ　ぼよーん！\n"
+    .string "おまえ　おもいなあー！$"
+
+gUnknown_81A3627:: @ 81A3627
+    .string "There's a rare kind of ICE POKéMON\n"
+    .string "that lives in the cave.\p"
+    .string "We get a lot of visitors hoping to\n"
+    .string "see that POKéMON.$"
+
+gUnknown_81A3697:: @ 81A3697
+    .string "Oh? A POKéMON EGG?\n"
+    .string "…I have no idea.\p"
+    .string "…Oh, wait. The DAY-CARE people\n"
+    .string "in town were saying something.\p"
+    .string "They said that they'd found EGGS\n"
+    .string "before on their property.$"
+
+gUnknown_81A3734:: @ 81A3734
+    .string "What's this?\p"
+    .string "The new POKéMON JOURNAL hasn't\n"
+    .string "arrived on this island?$"
+
diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..f66cce064
--- /dev/null
+++ b/data/maps/FourIsland_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F",
+  "name": "FourIsland_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..08482ec27
--- /dev/null
+++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D
+	map_script 2, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, FourIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32
+	call EventScript_1BB4A3
+	end
+
+EventScript_171C38:: @ 8171C38
+	call EventScript_1BB6AB
+	end
+
+EventScript_171C3E:: @ 8171C3E
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json
new file mode 100644
index 000000000..b9c45365a
--- /dev/null
+++ b/data/maps/FourIsland_PokemonDayCare/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE",
+  "name": "FourIsland_PokemonDayCare",
+  "layout": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE",
+  "music": "BGM_FRLG_ISLAND_FOUR",
+  "region_map_section": "MAPSEC_FOUR_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "35",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FourIsland_PokemonDayCare_EventScript_171940",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FOUR_ISLAND",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc
new file mode 100644
index 000000000..050e17c06
--- /dev/null
+++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc
@@ -0,0 +1,211 @@
+FourIsland_PokemonDayCare_MapScripts:: @ 817193F
+	.byte 0
+
+FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	specialvar VAR_RESULT, GetDaycareState
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171A2E
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_171A52
+	compare_var_to_value VAR_RESULT, 3
+	goto_if_eq EventScript_171B86
+	msgbox gUnknown_81BF7E4, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171993
+	msgbox gUnknown_81BF916
+	release
+	end
+
+EventScript_171993:: @ 8171993
+	specialvar VAR_RESULT, CountPartyNonEggMons
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171A1A
+	msgbox gUnknown_81BF839
+	fadescreen 1
+	special ChooseSendDaycareMon
+	waitstate
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_1719F7
+	specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_171A24
+	specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
+	waitse
+	playmoncry VAR_0x8005, 0
+	msgbox gUnknown_81BF860
+	waitmoncry
+	special StoreSelectedPokemonInDaycare
+	incrementgamestat 47
+	specialvar VAR_RESULT, GetDaycareState
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_171A01
+	release
+	end
+
+EventScript_1719F7:: @ 81719F7
+	msgbox gUnknown_81BF976
+	release
+	end
+
+EventScript_171A01:: @ 8171A01
+	msgbox gUnknown_81BF89F, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171993
+	goto EventScript_1719F7
+	end
+
+EventScript_171A1A:: @ 8171A1A
+	msgbox gUnknown_81BFAAD
+	release
+	end
+
+EventScript_171A24:: @ 8171A24
+	msgbox gUnknown_81BFB09
+	release
+	end
+
+EventScript_171A2E:: @ 8171A2E
+	msgbox gUnknown_81BF8F6
+	release
+	end
+
+EventScript_171A38:: @ 8171A38
+	msgbox gUnknown_81BF9CC
+	return
+
+EventScript_171A41:: @ 8171A41
+	specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
+	compare_var_to_value VAR_RESULT, 0
+	call_if 5, EventScript_171A38
+	return
+
+EventScript_171A52:: @ 8171A52
+	msgbox gUnknown_81BF988
+	setvar VAR_0x8004, 0
+	call EventScript_171A41
+	msgbox gUnknown_81BF89F, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171993
+	msgbox gUnknown_81BFAE8, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171A90
+	goto EventScript_1719F7
+	end
+
+EventScript_171A90:: @ 8171A90
+	specialvar VAR_RESULT, CalculatePlayerPartyCount
+	compare_var_to_value VAR_RESULT, 6
+	goto_if_eq EventScript_171B67
+	specialvar VAR_RESULT, GetDaycareState
+	setvar VAR_0x8004, 0
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_171ACF
+	special ShowDaycareLevelMenu
+	waitstate
+	copyvar VAR_0x8004, VAR_RESULT
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1719F7
+	goto EventScript_171ACF
+	end
+
+EventScript_171ACF:: @ 8171ACF
+	special GetDaycareCost
+	msgbox gUnknown_81BFA3B, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171AEB
+	goto EventScript_1719F7
+	end
+
+EventScript_171AEB:: @ 8171AEB
+	specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171B05
+	msgbox gUnknown_81BF932
+	release
+	end
+
+EventScript_171B05:: @ 8171B05
+	applymovement 1, Movement_171B71
+	waitmovement 0
+	specialvar VAR_RESULT, TakePokemonFromDaycare
+	special SubtractMoneyFromVar0x8005
+	playse SE_T_KAMI2
+	msgbox gUnknown_81BFA67
+	waitse
+	playmoncry VAR_RESULT, 0
+	textcolor 3
+	msgbox gUnknown_81BFA85
+	call EventScript_1A6675
+	waitmoncry
+	specialvar VAR_RESULT, GetDaycareState
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_171B4E
+	goto EventScript_1719F7
+	end
+
+EventScript_171B4E:: @ 8171B4E
+	msgbox gUnknown_81BF94F, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171A90
+	goto EventScript_1719F7
+	end
+
+EventScript_171B67:: @ 8171B67
+	msgbox gUnknown_81BF9EF
+	release
+	end
+
+Movement_171B71:: @ 8171B71
+	step_1c
+	step_1c
+	step_03
+	step_1c
+	step_1c
+	step_02
+	step_1c
+	step_1c
+	step_01
+	step_up
+	step_60
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_00
+	step_61
+	step_down
+	step_end
+
+EventScript_171B85:: @ 8171B85
+	end
+
+EventScript_171B86:: @ 8171B86
+	msgbox gUnknown_81BF988
+	setvar VAR_0x8004, 0
+	call EventScript_171A41
+	setvar VAR_0x8004, 1
+	call EventScript_171A41
+	msgbox gUnknown_81BFAE8, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171A90
+	msgbox gUnknown_81BF976
+	release
+	end
+
+EventScript_171BBF:: @ 8171BBF
+	special ShowDaycareLevelMenu
+	waitstate
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1719F7
+	copyvar VAR_0x8004, VAR_RESULT
+	specialvar VAR_RESULT, TakePokemonFromDaycare
+	msgbox gUnknown_81BFA67
+	msgbox gUnknown_81BF976
+	release
+	end
diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json
new file mode 100644
index 000000000..4fc30ef40
--- /dev/null
+++ b/data/maps/FuchsiaCity/map.json
@@ -0,0 +1,409 @@
+{
+  "id": "MAP_FUCHSIA_CITY",
+  "name": "FuchsiaCity",
+  "layout": "LAYOUT_FUCHSIA_CITY",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE19",
+      "offset": 12,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE18",
+      "offset": 10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE15",
+      "offset": 10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "27",
+      "x": 37,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_166DAF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "128",
+      "x": 36,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "80",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "127",
+      "x": 33,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 33,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_166DB8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "117",
+      "x": 39,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 14,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_166D9D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "135",
+      "x": 12,
+      "y": 20,
+      "elevation": 1,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 36,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_166DA6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "240",
+      "x": 8,
+      "y": 8,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "119",
+      "x": 16,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 30,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "95",
+      "x": 21,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "95",
+      "x": 32,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_1BDF13",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "95",
+      "x": 24,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_1BDF13",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "20",
+      "x": 15,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_1C4AEE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 40,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_EventScript_166DC1",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 24,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 33,
+      "y": 31,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY_BUILDING1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY_MART",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 28,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY_ZOO_BUILDING",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY_GYM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 31,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY_HOUSE1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 25,
+      "y": 31,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 38,
+      "y": 31,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY_HOUSE2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 39,
+      "y": 28,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY_HOUSE2",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 39,
+      "y": 29,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY_HOUSE2",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 19,
+      "y": 31,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY_HOUSE3",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 31,
+      "y": 18,
+      "elevation": 3,
+      "script": "FuchsiaCity_EventScript_166DDA"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 26,
+      "y": 18,
+      "elevation": 0,
+      "script": "FuchsiaCity_EventScript_166DE3"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 32,
+      "elevation": 0,
+      "script": "FuchsiaCity_EventScript_166E07"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 31,
+      "y": 31,
+      "elevation": 0,
+      "script": "FuchsiaCity_EventScript_166DF5"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 35,
+      "y": 10,
+      "elevation": 0,
+      "script": "FuchsiaCity_EventScript_166E38"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 38,
+      "y": 16,
+      "elevation": 3,
+      "script": "FuchsiaCity_EventScript_166E6A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 41,
+      "y": 10,
+      "elevation": 0,
+      "script": "FuchsiaCity_EventScript_166E1F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 17,
+      "y": 10,
+      "elevation": 0,
+      "script": "FuchsiaCity_EventScript_166E51"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 10,
+      "elevation": 0,
+      "script": "FuchsiaCity_EventScript_166E9C"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 17,
+      "y": 18,
+      "elevation": 3,
+      "script": "FuchsiaCity_EventScript_166E83"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 22,
+      "y": 7,
+      "elevation": 0,
+      "script": "FuchsiaCity_EventScript_166DEC"
+    },
+    {
+      "type": "hidden_item",
+      "x": 33,
+      "y": 26,
+      "elevation": 3,
+      "item": "ITEM_MAX_REVIVE",
+      "flag": "133",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc
new file mode 100644
index 000000000..9fefb3d86
--- /dev/null
+++ b/data/maps/FuchsiaCity/scripts.inc
@@ -0,0 +1,145 @@
+FuchsiaCity_MapScripts:: @ 8166D75
+	map_script 3, FuchsiaCity_MapScript1_166D7B
+	.byte 0
+
+FuchsiaCity_MapScript1_166D7B:: @ 8166D7B
+	setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY
+	checkflag FLAG_0x272
+	call_if 1, EventScript_166D91
+	checkflag FLAG_0x272
+	call_if 0, EventScript_166D97
+	end
+
+EventScript_166D91:: @ 8166D91
+	setvar VAR_0x4010, 118
+	return
+
+EventScript_166D97:: @ 8166D97
+	setvar VAR_0x4010, 147
+	return
+
+FuchsiaCity_EventScript_166D9D:: @ 8166D9D
+	msgbox gUnknown_818056E, 2
+	end
+
+FuchsiaCity_EventScript_166DA6:: @ 8166DA6
+	msgbox gUnknown_81805C6, 2
+	end
+
+FuchsiaCity_EventScript_166DAF:: @ 8166DAF
+	msgbox gUnknown_818062C, 2
+	end
+
+FuchsiaCity_EventScript_166DB8:: @ 8166DB8
+	msgbox gUnknown_818065A, 2
+	end
+
+FuchsiaCity_EventScript_166DC1:: @ 8166DC1
+	lock
+	faceplayer
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 3
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8180ABD
+	release
+	end
+
+FuchsiaCity_EventScript_166DDA:: @ 8166DDA
+	msgbox gUnknown_81806AB, 3
+	end
+
+FuchsiaCity_EventScript_166DE3:: @ 8166DE3
+	msgbox gUnknown_81806D3, 3
+	end
+
+FuchsiaCity_EventScript_166DEC:: @ 8166DEC
+	msgbox gUnknown_81806F0, 3
+	end
+
+FuchsiaCity_EventScript_166DF5:: @ 8166DF5
+	msgbox gUnknown_818070D, 3
+	end
+
+EventScript_166DFE:: @ 8166DFE
+	msgbox gUnknown_8180727, 3
+	end
+
+FuchsiaCity_EventScript_166E07:: @ 8166E07
+	lockall
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8180768
+	releaseall
+	end
+
+FuchsiaCity_EventScript_166E1F:: @ 8166E1F
+	lockall
+	setvar VAR_0x8004, SPECIES_CHANSEY
+	special sub_80CBDCC
+	drawmonpic SPECIES_CHANSEY, 10, 3
+	msgbox gUnknown_81807A9
+	erasemonpic
+	releaseall
+	end
+
+FuchsiaCity_EventScript_166E38:: @ 8166E38
+	lockall
+	setvar VAR_0x8004, SPECIES_VOLTORB
+	special sub_80CBDCC
+	drawmonpic SPECIES_VOLTORB, 10, 3
+	msgbox gUnknown_81807D9
+	erasemonpic
+	releaseall
+	end
+
+FuchsiaCity_EventScript_166E51:: @ 8166E51
+	lockall
+	setvar VAR_0x8004, SPECIES_KANGASKHAN
+	special sub_80CBDCC
+	drawmonpic SPECIES_KANGASKHAN, 10, 3
+	msgbox gUnknown_8180806
+	erasemonpic
+	releaseall
+	end
+
+FuchsiaCity_EventScript_166E6A:: @ 8166E6A
+	lockall
+	setvar VAR_0x8004, SPECIES_SLOWPOKE
+	special sub_80CBDCC
+	drawmonpic SPECIES_SLOWPOKE, 10, 3
+	msgbox gUnknown_8180859
+	erasemonpic
+	releaseall
+	end
+
+FuchsiaCity_EventScript_166E83:: @ 8166E83
+	lockall
+	setvar VAR_0x8004, SPECIES_LAPRAS
+	special sub_80CBDCC
+	drawmonpic SPECIES_LAPRAS, 10, 3
+	msgbox gUnknown_8180887
+	erasemonpic
+	releaseall
+	end
+
+FuchsiaCity_EventScript_166E9C:: @ 8166E9C
+	lockall
+	checkflag FLAG_0x272
+	goto_if_eq EventScript_166EBE
+	setvar VAR_0x8004, SPECIES_KABUTO
+	special sub_80CBDCC
+	drawmonpic SPECIES_KABUTO, 10, 3
+	msgbox gUnknown_81808FA
+	erasemonpic
+	releaseall
+	end
+
+EventScript_166EBE:: @ 8166EBE
+	setvar VAR_0x8004, SPECIES_OMANYTE
+	special sub_80CBDCC
+	drawmonpic SPECIES_OMANYTE, 10, 3
+	msgbox gUnknown_81808AE
+	erasemonpic
+	releaseall
+	end
diff --git a/data/maps/FuchsiaCity/text.inc b/data/maps/FuchsiaCity/text.inc
new file mode 100644
index 000000000..2916a29cf
--- /dev/null
+++ b/data/maps/FuchsiaCity/text.inc
@@ -0,0 +1,111 @@
+gUnknown_818056E:: @ 818056E
+    .string "Did you try the SAFARI GAME?\p"
+    .string "There are some rare POKéMON that\n"
+    .string "can only be caught there.$"
+
+gUnknown_81805C6:: @ 81805C6
+    .string "The SAFARI ZONE has a zoo in front\n"
+    .string "of the entrance.\p"
+    .string "Out back is the SAFARI GAME for\n"
+    .string "catching POKéMON.$"
+
+gUnknown_818062C:: @ 818062C
+    .string "ERIK: Where's SARA?\n"
+    .string "I said I'd meet her here.$"
+
+gUnknown_818065A:: @ 818065A
+    .string "That item ball in there…\n"
+    .string "Were you wanting that?\p"
+    .string "Me, too!\n"
+    .string "…Huh? That's a POKéMON?$"
+
+gUnknown_81806AB:: @ 81806AB
+    .string "FUCHSIA CITY\n"
+    .string "Behold! It's Passion Pink!$"
+
+gUnknown_81806D3:: @ 81806D3
+    .string "POKéMON PARADISE\n"
+    .string "SAFARI ZONE$"
+
+gUnknown_81806F0:: @ 81806F0
+    .string "SAFARI GAME\n"
+    .string "POKéMON-U-CATCH!$"
+
+gUnknown_818070D:: @ 818070D
+    .string "SAFARI ZONE\n"
+    .string "WARDEN'S HOME$"
+
+gUnknown_8180727:: @ 8180727
+    .string "POKéMON PARADISE!\n"
+    .string "Welcome to the SAFARI ZONE!\l"
+    .string "SAFARI ZONE OFFICE$"
+
+gUnknown_8180768:: @ 8180768
+    .string "FUCHSIA CITY POKéMON GYM\n"
+    .string "LEADER: KOGA\l"
+    .string "The Poisonous Ninja Master$"
+
+gUnknown_81807A9:: @ 81807A9
+    .string "Name: CHANSEY\n"
+    .string "Catching one is all up to chance.$"
+
+gUnknown_81807D9:: @ 81807D9
+    .string "Name: VOLTORB\n"
+    .string "The very image of a POKé BALL.$"
+
+gUnknown_8180806:: @ 8180806
+    .string "Name: KANGASKHAN\p"
+    .string "A maternal POKéMON that raises its\n"
+    .string "young in a pouch on its belly.$"
+
+gUnknown_8180859:: @ 8180859
+    .string "Name: SLOWPOKE\n"
+    .string "Friendly and very slow moving.$"
+
+gUnknown_8180887:: @ 8180887
+    .string "Name: LAPRAS\n"
+    .string "AKA the king of the seas.$"
+
+gUnknown_81808AE:: @ 81808AE
+    .string "Name: OMANYTE\n"
+    .string "An extremely rare POKéMON that was\l"
+    .string "regenerated from a fossil.$"
+
+gUnknown_81808FA:: @ 81808FA
+    .string "Name: KABUTO\n"
+    .string "An extremely rare POKéMON that was\l"
+    .string "regenerated from a fossil.$"
+
+Text_180945:: @ 8180945
+    .string "……$"
+
+Text_180948:: @ 8180948
+    .string "Aww, I wish I was a KANGASKHAN\n"
+    .string "baby.\p"
+    .string "I'd love to be a substitute for the\n"
+    .string "baby…\p"
+    .string "And snuggle in the mother\n"
+    .string "KANGASKHAN's belly pouch.\p"
+    .string "But only POKéMON can use the\n"
+    .string "technique SUBSTITUTE…\p"
+    .string "Want me to teach SUBSTITUTE to\n"
+    .string "one of your POKéMON?$"
+
+Text_180A32:: @ 8180A32
+    .string "Oh, really?\n"
+    .string "SUBSTITUTE seems so fun…$"
+
+Text_180A57:: @ 8180A57
+    .string "Which POKéMON wants to learn\n"
+    .string "SUBSTITUTE?$"
+
+Text_180A80:: @ 8180A80
+    .string "Boy, what I'd give to crawl inside\n"
+    .string "a KANGASKHAN belly pouch…$"
+
+gUnknown_8180ABD:: @ 8180ABD
+    .string "My father is the GYM LEADER of\n"
+    .string "this town.\p"
+    .string "I'm training to use POISON POKéMON\n"
+    .string "as well as my father.$"
+
diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json
new file mode 100644
index 000000000..eea444164
--- /dev/null
+++ b/data/maps/FuchsiaCity_Building1/map.json
@@ -0,0 +1,123 @@
+{
+  "id": "MAP_FUCHSIA_CITY_BUILDING1",
+  "name": "FuchsiaCity_Building1",
+  "layout": "LAYOUT_FUCHSIA_CITY_BUILDING1",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "33",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Building1_EventScript_16D74C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Building1_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Building1_EventScript_1BEAA2",
+      "flag": "441"
+    },
+    {
+      "graphics_id": "0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Building1_EventScript_1ACEB8",
+      "flag": "159"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 4,
+      "elevation": 0,
+      "script": "FuchsiaCity_Building1_EventScript_16D80D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "script": "FuchsiaCity_Building1_EventScript_16D804"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "script": "FuchsiaCity_Building1_EventScript_16D804"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 4,
+      "elevation": 0,
+      "script": "FuchsiaCity_Building1_EventScript_16D80D"
+    }
+  ]
+}
diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc
new file mode 100644
index 000000000..58cacf92e
--- /dev/null
+++ b/data/maps/FuchsiaCity_Building1/scripts.inc
@@ -0,0 +1,66 @@
+FuchsiaCity_Building1_MapScripts:: @ 816D74B
+	.byte 0
+
+FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
+	lock
+	faceplayer
+	checkflag FLAG_0x23A
+	goto_if_eq EventScript_16D7FA
+	checkflag FLAG_0x189
+	goto_if_eq EventScript_16D780
+	msgbox gUnknown_8198DF9, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_16D7E8
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16D7F1
+	release
+	end
+
+EventScript_16D780:: @ 816D780
+	textcolor 3
+	playfanfare MUS_ME_WAZA
+	message Text_198E84
+	waitmessage
+	waitfanfare
+	msgbox gUnknown_8198EAA
+	call EventScript_1A6675
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16D7D6
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_16D7DF
+	additem ITEM_HM04, 1
+	giveitemfanfaremsg gUnknown_8199068, ITEM_HM04
+	setflag FLAG_0x23A
+	removeitem ITEM_GOLD_TEETH, 1
+	release
+	end
+
+EventScript_16D7D6:: @ 816D7D6
+	msgbox gUnknown_8198ECA
+	return
+
+EventScript_16D7DF:: @ 816D7DF
+	msgbox gUnknown_8198F96
+	return
+
+EventScript_16D7E8:: @ 816D7E8
+	msgbox gUnknown_8198E3F
+	return
+
+EventScript_16D7F1:: @ 816D7F1
+	msgbox gUnknown_8198E63
+	return
+
+EventScript_16D7FA:: @ 816D7FA
+	msgbox gUnknown_819908A
+	release
+	end
+
+FuchsiaCity_Building1_EventScript_16D804:: @ 816D804
+	msgbox gUnknown_819913C, 3
+	end
+
+FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D
+	msgbox gUnknown_8199167, 3
+	end
diff --git a/data/maps/FuchsiaCity_Building1/text.inc b/data/maps/FuchsiaCity_Building1/text.inc
new file mode 100644
index 000000000..dd4069e1f
--- /dev/null
+++ b/data/maps/FuchsiaCity_Building1/text.inc
@@ -0,0 +1,64 @@
+gUnknown_8198DF9:: @ 8198DF9
+    .string "WARDEN: Hif fuff hefifoo!\p"
+    .string "Ha lof ha feef ee hafahi ho.\n"
+    .string "Heff hee fwee!$"
+
+gUnknown_8198E3F:: @ 8198E3F
+    .string "Ah howhee ho hoo!\n"
+    .string "Eef ee hafahi ho!$"
+
+gUnknown_8198E63:: @ 8198E63
+    .string "Ha?\n"
+    .string "He ohay heh ha hoo ee haheh!$"
+
+Text_198E84:: @ 8198E84
+    .string "{PLAYER} gave the GOLD TEETH\n"
+    .string "to the WARDEN.$"
+
+gUnknown_8198EAA:: @ 8198EAA
+    .string "The WARDEN popped in his teeth!$"
+
+gUnknown_8198ECA:: @ 8198ECA
+    .string "WARDEN: Thanks, son!\n"
+    .string "You're a real lifesaver!\p"
+    .string "No one could understand a word\n"
+    .string "that I said, not a one!\p"
+    .string "I was too ashamed to show my face\n"
+    .string "around the OFFICE, even.\p"
+    .string "Let me give you something for your\n"
+    .string "trouble.$"
+
+gUnknown_8198F96:: @ 8198F96
+    .string "WARDEN: Thank you, lassie!\n"
+    .string "You're a real lifesaver!\p"
+    .string "No one could understand a word\n"
+    .string "that I said, not a one!\p"
+    .string "I was too ashamed to show my face\n"
+    .string "around the OFFICE, even.\p"
+    .string "Let me give you something for your\n"
+    .string "trouble.$"
+
+gUnknown_8199068:: @ 8199068
+    .string "{PLAYER} received HM04\n"
+    .string "from the WARDEN.$"
+
+gUnknown_819908A:: @ 819908A
+    .string "WARDEN: Inside HM04 you'll find\n"
+    .string "STRENGTH.\p"
+    .string "It lets POKéMON move boulders when\n"
+    .string "you're outside of battle.\p"
+    .string "Oh yes, did you find the SECRET\n"
+    .string "HOUSE in the SAFARI ZONE?$"
+
+Text_19912B:: @ 819912B
+    .string "なんや　にもつ\n"
+    .string "いっぱいやんけ！$"
+
+gUnknown_819913C:: @ 819913C
+    .string "POKéMON photos and fossils are on\n"
+    .string "display.$"
+
+gUnknown_8199167:: @ 8199167
+    .string "Old POKéMON merchandise is on\n"
+    .string "display.$"
+
diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json
new file mode 100644
index 000000000..c1106fb9c
--- /dev/null
+++ b/data/maps/FuchsiaCity_Gym/map.json
@@ -0,0 +1,161 @@
+{
+  "id": "MAP_FUCHSIA_CITY_GYM",
+  "name": "FuchsiaCity_Gym",
+  "layout": "LAYOUT_FUCHSIA_CITY_GYM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "26",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "FuchsiaCity_Gym_EventScript_16D65A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 2,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "FuchsiaCity_Gym_EventScript_16D643",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "FuchsiaCity_Gym_EventScript_16D61F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "FuchsiaCity_Gym_EventScript_16D608",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "FuchsiaCity_Gym_EventScript_16D5F1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 2,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "FuchsiaCity_Gym_EventScript_16D671",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "84",
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Gym_EventScript_16D54E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 11,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Gym_EventScript_16D688",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 7,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 8,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 19,
+      "elevation": 0,
+      "script": "FuchsiaCity_Gym_EventScript_16D6A7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 19,
+      "elevation": 0,
+      "script": "FuchsiaCity_Gym_EventScript_16D6A7"
+    }
+  ]
+}
diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc
new file mode 100644
index 000000000..6b57f6377
--- /dev/null
+++ b/data/maps/FuchsiaCity_Gym/scripts.inc
@@ -0,0 +1,102 @@
+FuchsiaCity_Gym_MapScripts:: @ 816D54D
+	.byte 0
+
+FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, 418, 0, Text_19832E, Text_198444, EventScript_16D580
+	checkflag FLAG_0x259
+	goto_if 0, EventScript_16D5A6
+	msgbox gUnknown_8198481
+	release
+	end
+
+EventScript_16D580:: @ 816D580
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	clearflag FLAG_0x09F
+	setflag FLAG_0x4B4
+	setflag FLAG_UNK824
+	setvar VAR_0x8008, 5
+	call EventScript_1A6B18
+	goto EventScript_16D5A6
+	end
+
+EventScript_16D5A6:: @ 816D5A6
+	msgbox gUnknown_819850E
+	checkitemspace ITEM_TM06, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16D5E7
+	additem ITEM_TM06, 1
+	giveitemfanfaremsg gUnknown_819858F, ITEM_TM06
+	setflag FLAG_0x259
+	msgbox gUnknown_81985AB
+	release
+	end
+
+EventScript_16D5E7:: @ 816D5E7
+	msgbox gUnknown_819860D
+	release
+	end
+
+FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1
+	trainerbattle 0, 294, 0, Text_198866, Text_1988B6
+	msgbox gUnknown_81988CB, 6
+	end
+
+FuchsiaCity_Gym_EventScript_16D608:: @ 816D608
+	trainerbattle 0, 295, 0, Text_19891F, Text_19897F
+	msgbox gUnknown_8198985, 6
+	end
+
+FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F
+	trainerbattle 0, 288, 0, Text_19871E, Text_198779
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8198787, 6
+	end
+
+FuchsiaCity_Gym_EventScript_16D643:: @ 816D643
+	trainerbattle 0, 289, 0, Text_1989A1, Text_1989EA
+	msgbox gUnknown_8198A10, 6
+	end
+
+FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A
+	trainerbattle 0, 292, 0, Text_198629, Text_1986B4
+	msgbox gUnknown_81986C9, 6
+	end
+
+FuchsiaCity_Gym_EventScript_16D671:: @ 816D671
+	trainerbattle 0, 293, 0, Text_1987E8, Text_198812
+	msgbox gUnknown_8198825, 6
+	end
+
+FuchsiaCity_Gym_EventScript_16D688:: @ 816D688
+	lock
+	faceplayer
+	checkflag FLAG_0x4B4
+	goto_if_eq EventScript_16D69D
+	msgbox gUnknown_8198A5E
+	release
+	end
+
+EventScript_16D69D:: @ 816D69D
+	msgbox gUnknown_8198B1D
+	release
+	end
+
+FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7
+	lockall
+	checkflag FLAG_UNK824
+	goto_if_eq EventScript_16D6BB
+	msgbox gUnknown_8198B4B
+	releaseall
+	end
+
+EventScript_16D6BB:: @ 816D6BB
+	msgbox gUnknown_8198B81
+	releaseall
+	end
diff --git a/data/maps/FuchsiaCity_Gym/text.inc b/data/maps/FuchsiaCity_Gym/text.inc
new file mode 100644
index 000000000..3967461b5
--- /dev/null
+++ b/data/maps/FuchsiaCity_Gym/text.inc
@@ -0,0 +1,156 @@
+Text_19832E:: @ 819832E
+    .string "KOGA: Fwahahaha!\p"
+    .string "A mere child like you dares to\n"
+    .string "challenge me?\p"
+    .string "The very idea makes me shiver\n"
+    .string "with mirth!\p"
+    .string "Very well, I shall show you true\n"
+    .string "terror as a ninja master.\p"
+    .string "Poison brings steady doom.\n"
+    .string "Sleep renders foes helpless.\p"
+    .string "Despair to the creeping horror of\n"
+    .string "POISON-type POKéMON!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+Text_198444:: @ 8198444
+    .string "Humph!\n"
+    .string "You have proven your worth!\p"
+    .string "Here!\n"
+    .string "Take the SOULBADGE!$"
+
+gUnknown_8198481:: @ 8198481
+    .string "When afflicted by TOXIC, a POKéMON\n"
+    .string "suffers more and more.\p"
+    .string "It suffers worsening damage as the\n"
+    .string "battle wears on!\p"
+    .string "It will surely terrorize foes!$"
+
+gUnknown_819850E:: @ 819850E
+    .string "Now that you have the SOULBADGE,\n"
+    .string "the DEFENSE of your POKéMON rises.\p"
+    .string "It also lets you SURF outside of\n"
+    .string "battle.\p"
+    .string "Ah!\n"
+    .string "Take this, too!$"
+
+gUnknown_819858F:: @ 819858F
+    .string "{PLAYER} received TM06\n"
+    .string "from KOGA.$"
+
+gUnknown_81985AB:: @ 81985AB
+    .string "Sealed within that TM06 lies\n"
+    .string "TOXIC!\p"
+    .string "It is a secret technique dating\n"
+    .string "back some four hundred years.$"
+
+gUnknown_819860D:: @ 819860D
+    .string "Make space for this, child!$"
+
+Text_198629:: @ 8198629
+    .string "Strength isn't the key for POKéMON.\n"
+    .string "Do you understand this?\p"
+    .string "POKéMON is about strategy!\p"
+    .string "I'll show you how strategy can\n"
+    .string "beat brute strength.$"
+
+Text_1986B4:: @ 81986B4
+    .string "What?\n"
+    .string "Extraordinary!$"
+
+gUnknown_81986C9:: @ 81986C9
+    .string "So, you mix brawn with brains?\n"
+    .string "Good strategy!\p"
+    .string "That's remarkable for a child\n"
+    .string "TRAINER.$"
+
+Text_19871E:: @ 819871E
+    .string "I was a magician once upon a time.\p"
+    .string "But I dreamt of becoming a ninja,\n"
+    .string "so I joined this GYM.$"
+
+Text_198779:: @ 8198779
+    .string "I'm done for!$"
+
+gUnknown_8198787:: @ 8198787
+    .string "Even though I've lost, I will keep\n"
+    .string "training according to the teachings\l"
+    .string "of KOGA, my ninja master.$"
+
+Text_1987E8:: @ 81987E8
+    .string "Let's see you beat my special\n"
+    .string "techniques!$"
+
+Text_198812:: @ 8198812
+    .string "You had me fooled!$"
+
+gUnknown_8198825:: @ 8198825
+    .string "I like poison and sleep techniques,\n"
+    .string "as they linger after battle!$"
+
+Text_198866:: @ 8198866
+    .string "Stop right there!\p"
+    .string "The famed invisible walls of\n"
+    .string "FUCHSIA GYM have you frustrated?$"
+
+Text_1988B6:: @ 81988B6
+    .string "Whoa!\n"
+    .string "You've got it!$"
+
+gUnknown_81988CB:: @ 81988CB
+    .string "You impressed me!\n"
+    .string "Here's a hint!\p"
+    .string "Look very closely for gaps in the\n"
+    .string "invisible walls!$"
+
+Text_19891F:: @ 819891F
+    .string "I also study the way of the ninja\n"
+    .string "with Master KOGA!\p"
+    .string "Ninja have a long history of using\n"
+    .string "animals!$"
+
+Text_19897F:: @ 819897F
+    .string "Awoo!$"
+
+gUnknown_8198985:: @ 8198985
+    .string "I still have much to learn.$"
+
+Text_1989A1:: @ 81989A1
+    .string "Master KOGA comes from a long line\n"
+    .string "of ninjas.\p"
+    .string "What did you descend from?$"
+
+Text_1989EA:: @ 81989EA
+    .string "You're more skilled than I'd\n"
+    .string "thought!$"
+
+gUnknown_8198A10:: @ 8198A10
+    .string "Where there is light, there is\n"
+    .string "shadow!\p"
+    .string "Light and shadow!\n"
+    .string "Which do you choose?$"
+
+gUnknown_8198A5E:: @ 8198A5E
+    .string "Yo!\n"
+    .string "Champ in the making!\p"
+    .string "FUCHSIA GYM is a tricked-up place.\n"
+    .string "It's riddled with invisible walls!\p"
+    .string "KOGA might appear close, but he's\n"
+    .string "blocked off.\p"
+    .string "You have to find gaps in the walls\n"
+    .string "to reach him.$"
+
+gUnknown_8198B1D:: @ 8198B1D
+    .string "It's amazing how ninja can terrify,\n"
+    .string "even now!$"
+
+gUnknown_8198B4B:: @ 8198B4B
+    .string "FUCHSIA POKéMON GYM\n"
+    .string "LEADER: KOGA\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}$"
+
+gUnknown_8198B81:: @ 8198B81
+    .string "FUCHSIA POKéMON GYM\n"
+    .string "LEADER: KOGA\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}, {PLAYER}$"
+
diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json
new file mode 100644
index 000000000..8e4d8ad8c
--- /dev/null
+++ b/data/maps/FuchsiaCity_House1/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_FUCHSIA_CITY_HOUSE1",
+  "name": "FuchsiaCity_House1",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_House1_EventScript_16D6CF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_House1_EventScript_16D6C6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_House1_EventScript_16D6E8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc
new file mode 100644
index 000000000..9ff2ecb93
--- /dev/null
+++ b/data/maps/FuchsiaCity_House1/scripts.inc
@@ -0,0 +1,20 @@
+FuchsiaCity_House1_MapScripts:: @ 816D6C5
+	.byte 0
+
+FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6
+	msgbox gUnknown_8198BBB, 2
+	end
+
+FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF
+	lock
+	faceplayer
+	setvar VAR_0x8004, 13 @ FAMECHECKER_BILL
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8198C1F
+	release
+	end
+
+FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8
+	msgbox gUnknown_8198C7B, 2
+	end
diff --git a/data/maps/FuchsiaCity_House1/text.inc b/data/maps/FuchsiaCity_House1/text.inc
new file mode 100644
index 000000000..e34e5d19e
--- /dev/null
+++ b/data/maps/FuchsiaCity_House1/text.inc
@@ -0,0 +1,17 @@
+gUnknown_8198BBB:: @ 8198BBB
+    .string "The SAFARI ZONE's WARDEN is old, \n"
+    .string "but he's still very much active.\p"
+    .string "All his teeth are false, though.$"
+
+gUnknown_8198C1F:: @ 8198C1F
+    .string "Hmm?\n"
+    .string "You've met BILL?\p"
+    .string "He's my grandson!\p"
+    .string "He always liked collecting things,\n"
+    .string "even as a child!$"
+
+gUnknown_8198C7B:: @ 8198C7B
+    .string "BILL files his own POKéMON data on\n"
+    .string "his PC.\p"
+    .string "Did he show you?$"
+
diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json
new file mode 100644
index 000000000..0e443e100
--- /dev/null
+++ b/data/maps/FuchsiaCity_House2/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_FUCHSIA_CITY_HOUSE2",
+  "name": "FuchsiaCity_House2",
+  "layout": "LAYOUT_FUCHSIA_CITY_HOUSE2",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_House2_EventScript_16D817",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc
new file mode 100644
index 000000000..0568d4e4f
--- /dev/null
+++ b/data/maps/FuchsiaCity_House2/scripts.inc
@@ -0,0 +1,36 @@
+FuchsiaCity_House2_MapScripts:: @ 816D816
+	.byte 0
+
+FuchsiaCity_House2_EventScript_16D817:: @ 816D817
+	lock
+	faceplayer
+	checkflag FLAG_0x244
+	goto_if_eq EventScript_16D83F
+	msgbox gUnknown_819918E, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16D849
+	msgbox gUnknown_8199337
+	release
+	end
+
+EventScript_16D83F:: @ 816D83F
+	msgbox gUnknown_8199354
+	release
+	end
+
+EventScript_16D849:: @ 816D849
+	msgbox gUnknown_8199207
+	checkitemspace ITEM_GOOD_ROD, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16D88A
+	additem ITEM_GOOD_ROD, 1
+	giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD
+	msgbox gUnknown_8199296
+	setflag FLAG_0x244
+	release
+	end
+
+EventScript_16D88A:: @ 816D88A
+	msgbox gUnknown_819937E
+	release
+	end
diff --git a/data/maps/FuchsiaCity_House2/text.inc b/data/maps/FuchsiaCity_House2/text.inc
new file mode 100644
index 000000000..bf425f98e
--- /dev/null
+++ b/data/maps/FuchsiaCity_House2/text.inc
@@ -0,0 +1,37 @@
+gUnknown_819918E:: @ 819918E
+    .string "I'm the FISHING GURU's older\n"
+    .string "brother.\p"
+    .string "I simply looove fishing!\n"
+    .string "I can't bear to go without.\p"
+    .string "Tell me, do you like to fish?$"
+
+gUnknown_8199207:: @ 8199207
+    .string "Grand! I like your style.\n"
+    .string "I think we can be friends.\p"
+    .string "Take this and fish, young friend!$"
+
+gUnknown_819925E:: @ 819925E
+    .string "{PLAYER} received a GOOD ROD from\n"
+    .string "the FISHING GURU's brother.$"
+
+gUnknown_8199296:: @ 8199296
+    .string "Fishing is a way of life!\n"
+    .string "It is like the finest poetry.\p"
+    .string "A crummy OLD ROD could only catch\n"
+    .string "MAGIKARP, yes?\p"
+    .string "But with a GOOD ROD, you can\n"
+    .string "catch much better POKéMON.$"
+
+gUnknown_8199337:: @ 8199337
+    .string "Oh…\n"
+    .string "That's so disappointing…$"
+
+gUnknown_8199354:: @ 8199354
+    .string "Hello there, {PLAYER}!\p"
+    .string "How are the fish biting?$"
+
+gUnknown_819937E:: @ 819937E
+    .string "Oh, no!\p"
+    .string "I had a gift for you, but you have\n"
+    .string "no room for it!$"
+
diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json
new file mode 100644
index 000000000..dc819ebfc
--- /dev/null
+++ b/data/maps/FuchsiaCity_House3/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_FUCHSIA_CITY_HOUSE3",
+  "name": "FuchsiaCity_House3",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_House3_EventScript_16D895",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 10
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc
new file mode 100644
index 000000000..e295ad46d
--- /dev/null
+++ b/data/maps/FuchsiaCity_House3/scripts.inc
@@ -0,0 +1,60 @@
+FuchsiaCity_House3_MapScripts:: @ 816D894
+	.byte 0
+
+FuchsiaCity_House3_EventScript_16D895:: @ 816D895
+	lock
+	faceplayer
+	msgbox gUnknown_81993B9, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16D8B0
+	goto EventScript_16D941
+	end
+
+EventScript_16D8B0:: @ 816D8B0
+	msgbox gUnknown_8199421
+	special sub_80BF8FC
+	waitstate
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16D941
+	special sub_80BFC14
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16D937
+	special ScrSpecial_CountPokemonMoves
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16D92A
+	msgbox gUnknown_8199445
+	fadescreen 1
+	special sub_80BF9BC
+	fadescreen 0
+	compare_var_to_value VAR_0x8005, 4
+	goto_if_eq EventScript_16D8B0
+	special ScrSpecial_GetPokemonNicknameAndMoveName
+	msgbox gUnknown_8199485, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16D919
+	goto EventScript_16D941
+	end
+
+EventScript_16D919:: @ 816D919
+	special sub_80BFBA8
+	playfanfare MUS_ME_WASURE
+	waitfanfare
+	msgbox gUnknown_81994B1
+	release
+	end
+
+EventScript_16D92A:: @ 816D92A
+	special ScrSpecial_GetPokemonNicknameAndMoveName
+	msgbox gUnknown_8199465
+	release
+	end
+
+EventScript_16D937:: @ 816D937
+	msgbox gUnknown_819951F
+	release
+	end
+
+EventScript_16D941:: @ 816D941
+	msgbox gUnknown_81994EA
+	release
+	end
diff --git a/data/maps/FuchsiaCity_House3/text.inc b/data/maps/FuchsiaCity_House3/text.inc
new file mode 100644
index 000000000..e4fbd2f6a
--- /dev/null
+++ b/data/maps/FuchsiaCity_House3/text.inc
@@ -0,0 +1,35 @@
+gUnknown_81993B9:: @ 81993B9
+    .string "Uh…\n"
+    .string "Oh, yes, I'm the MOVE DELETER.\p"
+    .string "I can make POKéMON forget their\n"
+    .string "moves.\p"
+    .string "Would you like me to do that?$"
+
+gUnknown_8199421:: @ 8199421
+    .string "Which POKéMON should forget a\n"
+    .string "move?$"
+
+gUnknown_8199445:: @ 8199445
+    .string "Which move should be forgotten?$"
+
+gUnknown_8199465:: @ 8199465
+    .string "{STR_VAR_1} seems to know only one\n"
+    .string "move…$"
+
+gUnknown_8199485:: @ 8199485
+    .string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n"
+    .string "That move should be forgotten?$"
+
+gUnknown_81994B1:: @ 81994B1
+    .string "It worked to perfection!\p"
+    .string "{STR_VAR_1} has forgotten\n"
+    .string "{STR_VAR_2} completely.$"
+
+gUnknown_81994EA:: @ 81994EA
+    .string "Come again if there are other\n"
+    .string "moves to be forgotten.$"
+
+gUnknown_819951F:: @ 819951F
+    .string "What?\n"
+    .string "No EGG should know any moves.$"
+
diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json
new file mode 100644
index 000000000..bfd8fe520
--- /dev/null
+++ b/data/maps/FuchsiaCity_Mart/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_FUCHSIA_CITY_MART",
+  "name": "FuchsiaCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Mart_EventScript_16D4F3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Mart_EventScript_16D4EA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_Mart_EventScript_16D4E1",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc
new file mode 100644
index 000000000..fe95c748c
--- /dev/null
+++ b/data/maps/FuchsiaCity_Mart/scripts.inc
@@ -0,0 +1,35 @@
+FuchsiaCity_Mart_MapScripts:: @ 816D4E0
+	.byte 0
+
+FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1
+	msgbox gUnknown_8198134, 2
+	end
+
+FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA
+	msgbox gUnknown_81980BC, 2
+	end
+
+FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16D518
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16D518:: @ 816D518
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_SUPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/FuchsiaCity_Mart/text.inc b/data/maps/FuchsiaCity_Mart/text.inc
new file mode 100644
index 000000000..69f9bc5f8
--- /dev/null
+++ b/data/maps/FuchsiaCity_Mart/text.inc
@@ -0,0 +1,10 @@
+gUnknown_81980BC:: @ 81980BC
+    .string "Don't they have any pennants\n"
+    .string "promoting the SAFARI ZONE?\p"
+    .string "How about some paper lanterns?\n"
+    .string "Aren't there even any calendars?$"
+
+gUnknown_8198134:: @ 8198134
+    .string "Did you try X SPEED?\n"
+    .string "It speeds up a POKéMON in battle.$"
+
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..bbf19625b
--- /dev/null
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F",
+  "name": "FuchsiaCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D700",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D709",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D712",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D71B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..062f93acc
--- /dev/null
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,27 @@
+FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1
+	map_script 3, FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC
+	map_script 5, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC
+	setrespawn SPAWN_FUCHSIA_CITY
+	end
+
+FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709
+	msgbox gUnknown_8198CB7, 2
+	end
+
+FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712
+	msgbox gUnknown_8198D2E, 2
+	end
+
+FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B
+	msgbox gUnknown_8198D9B, 2
+	end
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..7d3a627be
--- /dev/null
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc
@@ -0,0 +1,18 @@
+gUnknown_8198CB7:: @ 8198CB7
+    .string "You can't become a good TRAINER\n"
+    .string "with just one strong POKéMON.\p"
+    .string "But raising many POKéMON evenly\n"
+    .string "is no easy task, either.$"
+
+gUnknown_8198D2E:: @ 8198D2E
+    .string "There's a narrow trail west of\n"
+    .string "VIRIDIAN CITY.\p"
+    .string "It goes to the POKéMON LEAGUE HQ.\n"
+    .string "The HQ governs all TRAINERS.$"
+
+gUnknown_8198D9B:: @ 8198D9B
+    .string "If you're working on a POKéDEX,\n"
+    .string "visit the SAFARI ZONE.\p"
+    .string "All sorts of rare POKéMON breed\n"
+    .string "there.$"
+
diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..62e56bf0b
--- /dev/null
+++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F",
+  "name": "FuchsiaCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..322dd3930
--- /dev/null
+++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724
+	map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739
+	call EventScript_1BB4A3
+	end
+
+EventScript_16D73F:: @ 816D73F
+	call EventScript_1BB6AB
+	end
+
+EventScript_16D745:: @ 816D745
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
new file mode 100644
index 000000000..d986f0c05
--- /dev/null
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
@@ -0,0 +1,103 @@
+{
+  "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
+  "name": "FuchsiaCity_SafariZone_Entrance",
+  "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "47",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D36D"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D379"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D385"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
new file mode 100644
index 000000000..a2ee86113
--- /dev/null
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
@@ -0,0 +1,216 @@
+FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8
+	map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE
+	.byte 0
+
+FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE
+	map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, EventScript_16D2F2
+	map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, EventScript_16D312
+	map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, EventScript_16D2C8
+	.2byte 0
+
+EventScript_16D2C8:: @ 816D2C8
+	lockall
+	textcolor 0
+	applymovement 255, Movement_16D36A
+	waitmovement 0
+	msgbox gUnknown_8197E85
+	closemessage
+	applymovement 255, Movement_16D367
+	waitmovement 0
+	special sub_80A0EEC
+	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
+	releaseall
+	end
+
+EventScript_16D2F2:: @ 816D2F2
+	lockall
+	textcolor 0
+	msgbox gUnknown_8197E85
+	closemessage
+	applymovement 255, Movement_16D362
+	waitmovement 0
+	special sub_80A0EEC
+	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
+	releaseall
+	end
+
+EventScript_16D312:: @ 816D312
+	lockall
+	textcolor 0
+	msgbox gUnknown_8197E1A, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16D345
+	msgbox gUnknown_8197E48
+	closemessage
+	applymovement 255, Movement_16D362
+	waitmovement 0
+	special sub_80A0EEC
+	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
+	releaseall
+	end
+
+EventScript_16D345:: @ 816D345
+	msgbox gUnknown_8197E7A
+	closemessage
+	applymovement 255, Movement_16D365
+	waitmovement 0
+	warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
+	waitstate
+	end
+
+Movement_16D362:: @ 816D362
+	step_10
+	step_10
+	step_end
+
+Movement_16D365:: @ 816D365
+	step_11
+	step_end
+
+Movement_16D367:: @ 816D367
+	step_10
+	step_10
+	step_end
+
+Movement_16D36A:: @ 816D36A
+	step_10
+	step_1b
+	step_end
+
+FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D
+	lockall
+	setvar VAR_0x4002, 0
+	goto EventScript_16D391
+	end
+
+FuchsiaCity_SafariZone_Entrance_EventScript_16D379:: @ 816D379
+	lockall
+	setvar VAR_0x4002, 1
+	goto EventScript_16D391
+	end
+
+FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385
+	lockall
+	setvar VAR_0x4002, 2
+	goto EventScript_16D391
+	end
+
+EventScript_16D391:: @ 816D391
+	textcolor 0
+	msgbox gUnknown_8197C6B
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	showmoneybox 0, 0, 0
+	msgbox gUnknown_8197C87, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16D3CA
+	msgbox gUnknown_8197DE9
+	goto EventScript_16D49A
+	end
+
+EventScript_16D3CA:: @ 816D3CA
+	call EventScript_16D462
+	checkmoney 500, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16D48C
+	takemoney 500, 0
+	updatemoneybox 0, 0, 0
+	msgbox gUnknown_8197D07
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message Text_197D50
+	waitfanfare
+	call EventScript_1A6675
+	msgbox gUnknown_8197D80
+	closemessage
+	hidemoneybox
+	.byte 0
+	.byte 0
+	compare_var_to_value VAR_0x4002, 0
+	call_if 1, EventScript_16D44C
+	compare_var_to_value VAR_0x4002, 1
+	call_if 1, EventScript_16D441
+	compare_var_to_value VAR_0x4002, 2
+	call_if 1, EventScript_16D457
+	special sub_80A0EC4
+	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2
+	warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
+	waitstate
+	end
+
+EventScript_16D441:: @ 816D441
+	applymovement 255, Movement_16D4AF
+	waitmovement 0
+	return
+
+EventScript_16D44C:: @ 816D44C
+	applymovement 255, Movement_16D4AC
+	waitmovement 0
+	return
+
+EventScript_16D457:: @ 816D457
+	applymovement 255, Movement_16D4B3
+	waitmovement 0
+	return
+
+EventScript_16D462:: @ 816D462
+	countpokemon
+	compare_var_to_value VAR_RESULT, 6
+	goto_if 5, EventScript_1A77A9
+	specialvar VAR_RESULT, sub_80CABD0
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1A77A9
+	msgbox gUnknown_81BFEAC
+	goto EventScript_16D49A
+	end
+
+EventScript_16D48C:: @ 816D48C
+	msgbox gUnknown_8197E02
+	goto EventScript_16D49A
+	end
+
+EventScript_16D49A:: @ 816D49A
+	closemessage
+	hidemoneybox
+	.byte 0
+	.byte 0
+	applymovement 255, Movement_16D4AA
+	waitmovement 0
+	releaseall
+	end
+
+Movement_16D4AA:: @ 816D4AA
+	step_10
+	step_end
+
+Movement_16D4AC:: @ 816D4AC
+	step_11
+	step_11
+	step_end
+
+Movement_16D4AF:: @ 816D4AF
+	step_11
+	step_12
+	step_11
+	step_end
+
+Movement_16D4B3:: @ 816D4B3
+	step_11
+	step_13
+	step_11
+	step_end
+
+FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7
+	lock
+	faceplayer
+	msgbox gUnknown_8197EB0, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16D4D6
+	msgbox gUnknown_819809E
+	release
+	end
+
+EventScript_16D4D6:: @ 816D4D6
+	msgbox gUnknown_8197EE3
+	release
+	end
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc
new file mode 100644
index 000000000..bda1357a4
--- /dev/null
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc
@@ -0,0 +1,73 @@
+gUnknown_8197C6B:: @ 8197C6B
+    .string "Welcome to the SAFARI ZONE!$"
+
+gUnknown_8197C87:: @ 8197C87
+    .string "For just ¥500, you can play the\n"
+    .string "SAFARI GAME.\p"
+    .string "You can roam the wide-open safari\n"
+    .string "and catch what you like.\p"
+    .string "Would you like to play?$"
+
+gUnknown_8197D07:: @ 8197D07
+    .string "That'll be ¥500, please!\p"
+    .string "We only use a special kind of \n"
+    .string "POKé BALLS here.$"
+
+Text_197D50:: @ 8197D50
+    .string "{PLAYER} received 30 SAFARI BALLS\n"
+    .string "from the attendant.$"
+
+gUnknown_8197D80:: @ 8197D80
+    .string "We'll call you on the PA when you\n"
+    .string "run out of time or SAFARI BALLS.\p"
+    .string "Well, I'll wish you the best of\n"
+    .string "luck!$"
+
+gUnknown_8197DE9:: @ 8197DE9
+    .string "Okay.\n"
+    .string "Please come again!$"
+
+gUnknown_8197E02:: @ 8197E02
+    .string "Oops!\n"
+    .string "Not enough money!$"
+
+gUnknown_8197E1A:: @ 8197E1A
+    .string "Are you going to leave the\n"
+    .string "SAFARI ZONE early?$"
+
+gUnknown_8197E48:: @ 8197E48
+    .string "Please return any SAFARI BALLS\n"
+    .string "you may have left.$"
+
+gUnknown_8197E7A:: @ 8197E7A
+    .string "Good luck!$"
+
+gUnknown_8197E85:: @ 8197E85
+    .string "Did you catch your fair share?\n"
+    .string "Come again!$"
+
+gUnknown_8197EB0:: @ 8197EB0
+    .string "Hi! Is it your first time here at\n"
+    .string "the SAFARI ZONE?$"
+
+gUnknown_8197EE3:: @ 8197EE3
+    .string "The SAFARI ZONE actually has\n"
+    .string "four zones in it.\p"
+    .string "Each zone has different kinds of\n"
+    .string "POKéMON, even some rare ones.\p"
+    .string "Use the supplied SAFARI BALLS to\n"
+    .string "catch them.\p"
+    .string "You can also throw BAIT or ROCKS\n"
+    .string "besides the SAFARI BALLS.\p"
+    .string "If you throw BAIT, the POKéMON\n"
+    .string "becomes less likely to flee, but\l"
+    .string "harder to catch.\p"
+    .string "If you throw ROCKS, the POKéMON\n"
+    .string "becomes more likely to flee, but\l"
+    .string "easier to catch.\p"
+    .string "When you run out of time or SAFARI\n"
+    .string "BALLS, it's game over for you!$"
+
+gUnknown_819809E:: @ 819809E
+    .string "Sorry, you're a regular here!$"
+
diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json
new file mode 100644
index 000000000..de3962e96
--- /dev/null
+++ b/data/maps/FuchsiaCity_ZooBuilding/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_FUCHSIA_CITY_ZOO_BUILDING",
+  "name": "FuchsiaCity_ZooBuilding",
+  "layout": "LAYOUT_FUCHSIA_CITY_ZOO_BUILDING",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_FUCHSIA_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "47",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_ZooBuilding_EventScript_16D532",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_ZooBuilding_EventScript_16D53B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_ZooBuilding_EventScript_16D529",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "FuchsiaCity_ZooBuilding_EventScript_16D544",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc
new file mode 100644
index 000000000..bbff0b929
--- /dev/null
+++ b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc
@@ -0,0 +1,18 @@
+FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528
+	.byte 0
+
+FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529
+	msgbox gUnknown_819816B, 2
+	end
+
+FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532
+	msgbox gUnknown_81981C2, 2
+	end
+
+FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B
+	msgbox gUnknown_819822A, 2
+	end
+
+FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544
+	msgbox gUnknown_8198285, 2
+	end
diff --git a/data/maps/FuchsiaCity_ZooBuilding/text.inc b/data/maps/FuchsiaCity_ZooBuilding/text.inc
new file mode 100644
index 000000000..36b7e8a3e
--- /dev/null
+++ b/data/maps/FuchsiaCity_ZooBuilding/text.inc
@@ -0,0 +1,25 @@
+gUnknown_819816B:: @ 819816B
+    .string "We nicknamed the WARDEN\n"
+    .string "“SLOWPOKE.”\p"
+    .string "You know, he has that vacant look\n"
+    .string "like a SLOWPOKE.$"
+
+gUnknown_81981C2:: @ 81981C2
+    .string "WARDEN SLOWPOKE is very\n"
+    .string "knowledgeable about POKéMON.\p"
+    .string "He even has some fossils of rare,\n"
+    .string "extinct POKéMON.$"
+
+gUnknown_819822A:: @ 819822A
+    .string "WARDEN SLOWPOKE came in, but\n"
+    .string "I couldn't understand him.\p"
+    .string "I think he's got a speech problem!$"
+
+gUnknown_8198285:: @ 8198285
+    .string "WARDEN SLOWPOKE is running a\n"
+    .string "promotion campaign right now.\p"
+    .string "Try to get to the farthest corner\n"
+    .string "of the SAFARI ZONE.\p"
+    .string "If you can make it, you'll win a\n"
+    .string "very convenient prize.$"
+
diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json
new file mode 100644
index 000000000..de82d21e1
--- /dev/null
+++ b/data/maps/IndigoPlateau_Exterior/map.json
@@ -0,0 +1,60 @@
+{
+  "id": "MAP_INDIGO_PLATEAU_EXTERIOR",
+  "name": "IndigoPlateau_Exterior",
+  "layout": "LAYOUT_INDIGO_PLATEAU_EXTERIOR",
+  "music": "BGM_FRLG_INDIGO_PLATEAU",
+  "region_map_section": "MAPSEC_INDIGO_PLATEAU",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE23",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "72",
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "163"
+    },
+    {
+      "graphics_id": "71",
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "164"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc
new file mode 100644
index 000000000..873224926
--- /dev/null
+++ b/data/maps/IndigoPlateau_Exterior/scripts.inc
@@ -0,0 +1,167 @@
+IndigoPlateau_Exterior_MapScripts:: @ 816723B
+	map_script 3, IndigoPlateau_Exterior_MapScript1_167246
+	map_script 2, IndigoPlateau_Exterior_MapScript2_16725A
+	.byte 0
+
+IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246
+	setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR
+	compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1
+	call_if 1, EventScript_167255
+	end
+
+EventScript_167255:: @ 8167255
+	playbgm BGM_FRLG_CREDITS, 0
+	return
+
+IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A
+	map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_167264
+	.2byte 0
+
+EventScript_167264:: @ 8167264
+	lockall
+	delay 105
+	opendoor 11, 6
+	waitdooranim
+	special SpawnScriptFieldObject
+	addobject 1
+	applymovement 1, Movement_167346
+	applymovement 255, Movement_167337
+	waitmovement 0
+	closedoor 11, 6
+	waitdooranim
+	applymovement 255, Movement_16731B
+	applymovement 1, Movement_16733E
+	waitmovement 0
+	delay 100
+	opendoor 11, 6
+	waitdooranim
+	addobject 2
+	applymovement 2, Movement_16735D
+	waitmovement 0
+	closedoor 11, 6
+	waitdooranim
+	delay 160
+	applymovement 255, Movement_16731F
+	applymovement 2, Movement_167348
+	waitmovement 0
+	delay 100
+	applymovement 255, Movement_16732E
+	waitmovement 0
+	delay 155
+	applymovement 255, Movement_16733C
+	waitmovement 0
+	delay 90
+	applymovement 255, Movement_167335
+	waitmovement 0
+	applymovement 255, Movement_167311
+	waitmovement 0
+	special RemoveScriptFieldObject
+	setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
+	removeobject 1
+	removeobject 2
+	special sub_80F39B4
+	waitstate
+	releaseall
+	end
+
+Movement_167311:: @ 8167311
+	step_3d
+	step_3d
+	step_3d
+	step_3d
+	step_3d
+	step_3d
+	step_end
+
+Movement_167318:: @ 8167318
+	step_10
+	step_10
+	step_end
+
+Movement_16731B:: @ 816731B
+	step_1c
+	step_1a
+	step_2d
+	step_end
+
+Movement_16731F:: @ 816731F
+	step_1b
+	step_30
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_2d
+	step_end
+
+Movement_16732E:: @ 816732E
+	step_13
+	step_1c
+	step_10
+	step_10
+	step_1c
+	step_1c
+	step_end
+
+Movement_167335:: @ 8167335
+	step_2d
+	step_end
+
+Movement_167337:: @ 8167337
+	step_03
+	step_4c
+	step_12
+	step_4d
+	step_end
+
+Movement_16733C:: @ 816733C
+	step_2e
+	step_end
+
+Movement_16733E:: @ 816733E
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_end
+
+Movement_167346:: @ 8167346
+	step_1d
+	step_end
+
+Movement_167348:: @ 8167348
+	step_2f
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_2d
+	step_1c
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_16735D:: @ 816735D
+	step_10
+	step_end
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..a68bf374b
--- /dev/null
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
@@ -0,0 +1,146 @@
+{
+  "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F",
+  "name": "IndigoPlateau_PokemonCenter_1F",
+  "layout": "LAYOUT_INDIGO_PLATEAU_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_INDIGO_PLATEAU",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 0,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EACC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "64",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EB06",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 23,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "0",
+      "x": 22,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "41",
+      "x": 16,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "0",
+      "x": 23,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_INDIGO_PLATEAU_EXTERIOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 14,
+      "elevation": 4,
+      "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..7dae5f353
--- /dev/null
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,76 @@
+IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A
+	map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65
+	map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65
+	setrespawn SPAWN_INDIGO_PLATEAU
+	specialvar VAR_RESULT, sub_806E25C
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_16EA79
+	end
+
+EventScript_16EA79:: @ 816EA79
+	checkflag FLAG_0x844
+	goto_if_eq EventScript_1A77A9
+	setobjectxyperm 4, 4, 2
+	return
+
+IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A
+	lock
+	faceplayer
+	specialvar VAR_RESULT, sub_806E25C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16EAA6
+	msgbox gUnknown_819A8D8
+	release
+	end
+
+EventScript_16EAA6:: @ 816EAA6
+	checkflag FLAG_0x844
+	goto_if_eq EventScript_16EAB9
+	msgbox gUnknown_819A943
+	release
+	end
+
+EventScript_16EAB9:: @ 816EAB9
+	msgbox gUnknown_819A8D8
+	release
+	end
+
+IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3
+	msgbox gUnknown_819A837, 2
+	end
+
+IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16EAF4
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16EAF4:: @ 816EAF4
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..7a4d158b3
--- /dev/null
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
@@ -0,0 +1,24 @@
+gUnknown_819A837:: @ 819A837
+    .string "Yo!\n"
+    .string "Champ in the making!\p"
+    .string "At the POKéMON LEAGUE, you will\n"
+    .string "face the ELITE FOUR all in a row.\p"
+    .string "If you lose, you have to start all\n"
+    .string "over again!\p"
+    .string "This is it!\n"
+    .string "Go for it!$"
+
+gUnknown_819A8D8:: @ 819A8D8
+    .string "From here on, you face the\n"
+    .string "ELITE FOUR one by one.\p"
+    .string "If you win, a door opens to the\n"
+    .string "next TRAINER. Good luck!$"
+
+gUnknown_819A943:: @ 819A943
+    .string "I am so sorry, but you've wasted\n"
+    .string "your time coming here.\p"
+    .string "LORELEI of the ELITE FOUR is\n"
+    .string "absent, you see.\p"
+    .string "As a result, the POKéMON LEAGUE is\n"
+    .string "closed for the time being.$"
+
diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..5273ed61a
--- /dev/null
+++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F",
+  "name": "IndigoPlateau_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_INDIGO_PLATEAU",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..6c2955435
--- /dev/null
+++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F
+	map_script 2, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24
+	call EventScript_1BB4A3
+	end
+
+EventScript_16EB2A:: @ 816EB2A
+	call EventScript_1BB6AB
+	end
+
+EventScript_16EB30:: @ 816EB30
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json
new file mode 100644
index 000000000..32071e5d2
--- /dev/null
+++ b/data/maps/LavenderTown/map.json
@@ -0,0 +1,147 @@
+{
+  "id": "MAP_LAVENDER_TOWN",
+  "name": "LavenderTown",
+  "layout": "LAYOUT_LAVENDER_TOWN",
+  "music": "BGM_FRLG_LAVENDER_TOWN",
+  "region_map_section": "MAPSEC_LAVENDER_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE10",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE12",
+      "offset": 0,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE8",
+      "offset": 0,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "17",
+      "x": 19,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_EventScript_16687D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_EventScript_1668A6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_EventScript_1668AF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_TOWER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 10,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_LAVENDER_TOWN_HOUSE1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 10,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_LAVENDER_TOWN_HOUSE2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_LAVENDER_TOWN_MART",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 4,
+      "elevation": 0,
+      "script": "LavenderTown_EventScript_1668C1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 11,
+      "elevation": 0,
+      "script": "LavenderTown_EventScript_1668B8"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 7,
+      "elevation": 0,
+      "script": "LavenderTown_EventScript_1668D3"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 11,
+      "elevation": 0,
+      "script": "LavenderTown_EventScript_1668CA"
+    }
+  ]
+}
diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc
new file mode 100644
index 000000000..999662e6e
--- /dev/null
+++ b/data/maps/LavenderTown/scripts.inc
@@ -0,0 +1,48 @@
+LavenderTown_MapScripts:: @ 816686B
+	map_script 3, LavenderTown_MapScript1_166871
+	.byte 0
+
+LavenderTown_MapScript1_166871:: @ 8166871
+	setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN
+	setvar VAR_0x405B, 1
+	setflag FLAG_0x03D
+	end
+
+LavenderTown_EventScript_16687D:: @ 816687D
+	lock
+	faceplayer
+	msgbox gUnknown_817F52E, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16689C
+	msgbox gUnknown_817F568
+	release
+	end
+
+EventScript_16689C:: @ 816689C
+	msgbox gUnknown_817F548
+	release
+	end
+
+LavenderTown_EventScript_1668A6:: @ 81668A6
+	msgbox gUnknown_817F5B6, 2
+	end
+
+LavenderTown_EventScript_1668AF:: @ 81668AF
+	msgbox gUnknown_817F614, 2
+	end
+
+LavenderTown_EventScript_1668B8:: @ 81668B8
+	msgbox gUnknown_817F676, 3
+	end
+
+LavenderTown_EventScript_1668C1:: @ 81668C1
+	msgbox gUnknown_817F69A, 3
+	end
+
+LavenderTown_EventScript_1668CA:: @ 81668CA
+	msgbox gUnknown_817F6D6, 3
+	end
+
+LavenderTown_EventScript_1668D3:: @ 81668D3
+	msgbox gUnknown_817F6F7, 3
+	end
diff --git a/data/maps/LavenderTown/text.inc b/data/maps/LavenderTown/text.inc
new file mode 100644
index 000000000..d3d76a189
--- /dev/null
+++ b/data/maps/LavenderTown/text.inc
@@ -0,0 +1,40 @@
+gUnknown_817F52E:: @ 817F52E
+    .string "Do you believe in ghosts?$"
+
+gUnknown_817F548:: @ 817F548
+    .string "Really?\n"
+    .string "So there are believers…$"
+
+gUnknown_817F568:: @ 817F568
+    .string "Hahaha, I guess not.\p"
+    .string "That white hand on your shoulder…\n"
+    .string "I'm just imagining it.$"
+
+gUnknown_817F5B6:: @ 817F5B6
+    .string "This town is known as the grave\n"
+    .string "site of POKéMON.\p"
+    .string "Memorial services are held in\n"
+    .string "POKéMON TOWER.$"
+
+gUnknown_817F614:: @ 817F614
+    .string "Ghosts appeared in POKéMON TOWER.\p"
+    .string "I think they're the spirits of\n"
+    .string "POKéMON that the ROCKETS killed.$"
+
+gUnknown_817F676:: @ 817F676
+    .string "LAVENDER TOWN\n"
+    .string "The Noble Purple Town$"
+
+gUnknown_817F69A:: @ 817F69A
+    .string "New SILPH SCOPE!\n"
+    .string "Make the Invisible Plain to See!\p"
+    .string "SILPH CO.$"
+
+gUnknown_817F6D6:: @ 817F6D6
+    .string "LAVENDER VOLUNTEER\n"
+    .string "POKéMON HOUSE$"
+
+gUnknown_817F6F7:: @ 817F6F7
+    .string "POKéMON TOWER\n"
+    .string "Becalm the Spirits of POKéMON$"
+
diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json
new file mode 100644
index 000000000..b7b255588
--- /dev/null
+++ b/data/maps/LavenderTown_House1/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_LAVENDER_TOWN_HOUSE1",
+  "name": "LavenderTown_House1",
+  "layout": "LAYOUT_HOUSE5",
+  "music": "BGM_FRLG_LAVENDER_TOWN",
+  "region_map_section": "MAPSEC_LAVENDER_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "42",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_House1_EventScript_16B233",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "111",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_House1_EventScript_16B252",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc
new file mode 100644
index 000000000..8f7ba9d44
--- /dev/null
+++ b/data/maps/LavenderTown_House1/scripts.inc
@@ -0,0 +1,26 @@
+LavenderTown_House1_MapScripts:: @ 816B232
+	.byte 0
+
+LavenderTown_House1_EventScript_16B233:: @ 816B233
+	lock
+	faceplayer
+	checkflag FLAG_0x23C
+	goto_if_eq EventScript_16B248
+	msgbox gUnknown_819397D
+	release
+	end
+
+EventScript_16B248:: @ 816B248
+	msgbox gUnknown_81939F8
+	release
+	end
+
+LavenderTown_House1_EventScript_16B252:: @ 816B252
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_CUBONE, 0
+	msgbox gUnknown_819396B
+	waitmoncry
+	release
+	end
diff --git a/data/maps/LavenderTown_House1/text.inc b/data/maps/LavenderTown_House1/text.inc
new file mode 100644
index 000000000..0b61cb72d
--- /dev/null
+++ b/data/maps/LavenderTown_House1/text.inc
@@ -0,0 +1,16 @@
+gUnknown_819396B:: @ 819396B
+    .string "CUBONE: Kyarugoo!$"
+
+gUnknown_819397D:: @ 819397D
+    .string "Those horrible ROCKETS!\n"
+    .string "They deserve no mercy!\p"
+    .string "That poor CUBONE's mother…\p"
+    .string "It was killed trying to escape from\n"
+    .string "TEAM ROCKET.$"
+
+gUnknown_81939F8:: @ 81939F8
+    .string "The ghost of POKéMON TOWER is\n"
+    .string "gone!\p"
+    .string "Someone must have soothed its\n"
+    .string "restless spirit!$"
+
diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json
new file mode 100644
index 000000000..fd7ec4f22
--- /dev/null
+++ b/data/maps/LavenderTown_House2/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_LAVENDER_TOWN_HOUSE2",
+  "name": "LavenderTown_House2",
+  "layout": "LAYOUT_HOUSE5",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_LAVENDER_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_House2_EventScript_16B266",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc
new file mode 100644
index 000000000..0a5c708ab
--- /dev/null
+++ b/data/maps/LavenderTown_House2/scripts.inc
@@ -0,0 +1,72 @@
+LavenderTown_House2_MapScripts:: @ 816B265
+	.byte 0
+
+LavenderTown_House2_EventScript_16B266:: @ 816B266
+	lock
+	faceplayer
+	msgbox gUnknown_8193A4B, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16B287
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B2AA
+	end
+
+EventScript_16B287:: @ 816B287
+	msgbox gUnknown_8193AA6
+	special sub_80BF8FC
+	waitstate
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 0, EventScript_16B2B4
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16B2AA
+	end
+
+EventScript_16B2AA:: @ 816B2AA
+	msgbox gUnknown_8193BD4
+	release
+	end
+
+EventScript_16B2B4:: @ 816B2B4
+	specialvar VAR_RESULT, sub_80CAD54
+	compare_var_to_value VAR_RESULT, SPECIES_EGG
+	goto_if_eq EventScript_16B307
+	special TV_CopyNicknameToStringVar1AndEnsureTerminated
+	special TV_CheckMonOTIDEqualsPlayerID
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16B311
+	specialvar VAR_RESULT, sub_80CAD7C
+	special TV_CopyNicknameToStringVar1AndEnsureTerminated
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16B311
+	msgbox gUnknown_8193AD2, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16B31B
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B2AA
+	end
+
+EventScript_16B307:: @ 816B307
+	msgbox gUnknown_8193CC4
+	release
+	end
+
+EventScript_16B311:: @ 816B311
+	msgbox gUnknown_8193C82
+	release
+	end
+
+EventScript_16B31B:: @ 816B31B
+	msgbox gUnknown_8193B36
+	call EventScript_1A74EB
+	specialvar VAR_RESULT, sub_80CBFA0
+	special TV_CopyNicknameToStringVar1AndEnsureTerminated
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16B345
+	msgbox gUnknown_8193BF0
+	release
+	end
+
+EventScript_16B345:: @ 816B345
+	msgbox gUnknown_8193B66
+	release
+	end
diff --git a/data/maps/LavenderTown_House2/text.inc b/data/maps/LavenderTown_House2/text.inc
new file mode 100644
index 000000000..50fa577ff
--- /dev/null
+++ b/data/maps/LavenderTown_House2/text.inc
@@ -0,0 +1,47 @@
+gUnknown_8193A4B:: @ 8193A4B
+    .string "Hello, hello!\n"
+    .string "I am the official NAME RATER!\p"
+    .string "Want me to rate the nicknames of\n"
+    .string "your POKéMON?$"
+
+gUnknown_8193AA6:: @ 8193AA6
+    .string "Which POKéMON's nickname should\n"
+    .string "I critique?$"
+
+gUnknown_8193AD2:: @ 8193AD2
+    .string "{STR_VAR_1}, is it?\n"
+    .string "That is a decent nickname!\p"
+    .string "But, would you like me to give it\n"
+    .string "a nicer name?\p"
+    .string "How about it?$"
+
+gUnknown_8193B36:: @ 8193B36
+    .string "Ah, good. Then, what shall the new\n"
+    .string "nickname be?$"
+
+gUnknown_8193B66:: @ 8193B66
+    .string "Done! From now on, this POKéMON\n"
+    .string "shall be known as {STR_VAR_1}!\p"
+    .string "It is a better name than before!\n"
+    .string "How fortunate for you!$"
+
+gUnknown_8193BD4:: @ 8193BD4
+    .string "I see.\n"
+    .string "Do come visit again.$"
+
+gUnknown_8193BF0:: @ 8193BF0
+    .string "Done! From now on, this POKéMON\n"
+    .string "shall be known as {STR_VAR_1}!\p"
+    .string "It looks no different from before,\n"
+    .string "and yet, this is vastly superior!\p"
+    .string "How fortunate for you!$"
+
+gUnknown_8193C82:: @ 8193C82
+    .string "{STR_VAR_1}, is it?\n"
+    .string "That is a truly impeccable name!\p"
+    .string "Take good care of {STR_VAR_1}!$"
+
+gUnknown_8193CC4:: @ 8193CC4
+    .string "Now, now.\n"
+    .string "That is merely an EGG!$"
+
diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json
new file mode 100644
index 000000000..441f67cdd
--- /dev/null
+++ b/data/maps/LavenderTown_Mart/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_LAVENDER_TOWN_MART",
+  "name": "LavenderTown_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_LAVENDER_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_Mart_EventScript_16B36B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_Mart_EventScript_16B350",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_Mart_EventScript_16B359",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_Mart_EventScript_16B362",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc
new file mode 100644
index 000000000..380af6e9d
--- /dev/null
+++ b/data/maps/LavenderTown_Mart/scripts.inc
@@ -0,0 +1,42 @@
+LavenderTown_Mart_MapScripts:: @ 816B34F
+	.byte 0
+
+LavenderTown_Mart_EventScript_16B350:: @ 816B350
+	msgbox gUnknown_8193CE5, 2
+	end
+
+LavenderTown_Mart_EventScript_16B359:: @ 816B359
+	msgbox gUnknown_8193DB6, 2
+	end
+
+LavenderTown_Mart_EventScript_16B362:: @ 816B362
+	msgbox gUnknown_8193DF1, 2
+	end
+
+LavenderTown_Mart_EventScript_16B36B:: @ 816B36B
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16B390
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16B390:: @ 816B390
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_SUPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_ANTIDOTE
+	.2byte ITEM_PARALYZE_HEAL
+	.2byte ITEM_BURN_HEAL
+	.2byte ITEM_ICE_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_SUPER_REPEL
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/LavenderTown_Mart/text.inc b/data/maps/LavenderTown_Mart/text.inc
new file mode 100644
index 000000000..024f526ed
--- /dev/null
+++ b/data/maps/LavenderTown_Mart/text.inc
@@ -0,0 +1,20 @@
+gUnknown_8193CE5:: @ 8193CE5
+    .string "I'm searching for items that raise\n"
+    .string "the stats of POKéMON.\p"
+    .string "They're effective over the course\n"
+    .string "of a single battle.\p"
+    .string "X ATTACK, X DEFEND, X SPEED, \n"
+    .string "and X SPECIAL are what I'm after.\p"
+    .string "Do you know where I can get them?$"
+
+gUnknown_8193DB6:: @ 8193DB6
+    .string "Did you buy some REVIVES?\n"
+    .string "They revive any fainted POKéMON!$"
+
+gUnknown_8193DF1:: @ 8193DF1
+    .string "Sometimes, a TRAINER duo will\n"
+    .string "challenge you with two POKéMON\l"
+    .string "at the same time.\p"
+    .string "If that happens, you have to send\n"
+    .string "out two POKéMON to battle, too.$"
+
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..17ab5ac45
--- /dev/null
+++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F",
+  "name": "LavenderTown_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_LAVENDER_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_1F_EventScript_16B0FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_1F_EventScript_16B107",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_1F_EventScript_16B110",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_1F_EventScript_16B119",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_1F_EventScript_1AD0A0",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..f7341b8f9
--- /dev/null
+++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,27 @@
+LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF
+	map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA
+	map_script 5, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA
+	setrespawn SPAWN_LAVENDER_TOWN
+	end
+
+LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107
+	msgbox gUnknown_8193465, 2
+	end
+
+LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110
+	msgbox gUnknown_81934DE, 2
+	end
+
+LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119
+	msgbox gUnknown_819353A, 2
+	end
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/text.inc b/data/maps/LavenderTown_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..f86c82e6e
--- /dev/null
+++ b/data/maps/LavenderTown_PokemonCenter_1F/text.inc
@@ -0,0 +1,16 @@
+gUnknown_8193465:: @ 8193465
+    .string "TEAM ROCKET will do anything for\n"
+    .string "the sake of money!\p"
+    .string "There is no job too dirty, no deed\n"
+    .string "too heinous, no crime too wicked!$"
+
+gUnknown_81934DE:: @ 81934DE
+    .string "I saw CUBONE's mother trying to\n"
+    .string "escape from TEAM ROCKET.\p"
+    .string "She was killed trying to get away…$"
+
+gUnknown_819353A:: @ 819353A
+    .string "You know how the CUBONE species\n"
+    .string "wears skulls, right?\p"
+    .string "People will pay a lot for one.$"
+
diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..8b3675c0f
--- /dev/null
+++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F",
+  "name": "LavenderTown_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_LAVENDER_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..7042c66c8
--- /dev/null
+++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122
+	map_script 2, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, LavenderTown_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137
+	call EventScript_1BB4A3
+	end
+
+EventScript_16B13D:: @ 816B13D
+	call EventScript_1BB6AB
+	end
+
+EventScript_16B143:: @ 816B143
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
new file mode 100644
index 000000000..f5d78cec5
--- /dev/null
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
@@ -0,0 +1,142 @@
+{
+  "id": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE",
+  "name": "LavenderTown_VolunteerPokemonHouse",
+  "layout": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE",
+  "music": "BGM_FRLG_LAVENDER_TOWN",
+  "region_map_section": "MAPSEC_LAVENDER_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "78",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B14A",
+      "flag": "53"
+    },
+    {
+      "graphics_id": "124",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "121",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B211"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229"
+    }
+  ]
+}
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
new file mode 100644
index 000000000..f1a079cde
--- /dev/null
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
@@ -0,0 +1,89 @@
+LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149
+	.byte 0
+
+LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A
+	lock
+	faceplayer
+	checkflag FLAG_0x23D
+	goto_if_eq EventScript_16B196
+	msgbox gUnknown_81936FF
+	checkitemspace ITEM_POKE_FLUTE, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B1A0
+	setflag FLAG_0x23D
+	additem ITEM_POKE_FLUTE, 1
+	giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, BGM_FRLG_ME_KEYITEM
+	msgbox gUnknown_81937E5
+	release
+	end
+
+EventScript_16B196:: @ 816B196
+	msgbox gUnknown_8193878
+	release
+	end
+
+EventScript_16B1A0:: @ 816B1A0
+	msgbox gUnknown_819385B
+	release
+	end
+
+LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA
+	lock
+	faceplayer
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8193652
+	release
+	end
+
+LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3
+	msgbox gUnknown_81936B4, 2
+	end
+
+LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC
+	lock
+	faceplayer
+	checkflag FLAG_0x23C
+	goto_if_eq EventScript_16B1E1
+	msgbox gUnknown_81935ED
+	release
+	end
+
+EventScript_16B1E1:: @ 816B1E1
+	msgbox gUnknown_819361D
+	release
+	end
+
+LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB:: @ 816B1EB
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_NIDORINO, 0
+	msgbox gUnknown_81936DE
+	waitmoncry
+	release
+	end
+
+LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE:: @ 816B1FE
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_PSYDUCK, 0
+	msgbox gUnknown_81936EE
+	waitmoncry
+	release
+	end
+
+LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211
+	lockall
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_81938A0
+	releaseall
+	end
+
+LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229
+	msgbox gUnknown_819392B, 3
+	end
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc
new file mode 100644
index 000000000..c7245da55
--- /dev/null
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc
@@ -0,0 +1,67 @@
+Text_19358E:: @ 819358E
+    .string "I recently moved to this town.\p"
+    .string "I hear that MR. FUJI's not from\n"
+    .string "these parts originally, either.$"
+
+gUnknown_81935ED:: @ 81935ED
+    .string "That's odd, MR. FUJI isn't here.\n"
+    .string "Where'd he go?$"
+
+gUnknown_819361D:: @ 819361D
+    .string "MR. FUJI had been praying alone\n"
+    .string "for CUBONE's mother.$"
+
+gUnknown_8193652:: @ 8193652
+    .string "This is really MR. FUJI's house.\p"
+    .string "He's really kind.\p"
+    .string "He looks after abandoned and\n"
+    .string "orphaned POKéMON.$"
+
+gUnknown_81936B4:: @ 81936B4
+    .string "It's so warm!\n"
+    .string "POKéMON are so nice to hug.$"
+
+gUnknown_81936DE:: @ 81936DE
+    .string "NIDORINO: Gaoo!$"
+
+gUnknown_81936EE:: @ 81936EE
+    .string "PSYDUCK: Gwappa!$"
+
+gUnknown_81936FF:: @ 81936FF
+    .string "MR. FUJI: {PLAYER}…\p"
+    .string "Your POKéDEX quest is one that\n"
+    .string "requires strong dedication.\p"
+    .string "Without deep love for POKéMON,\n"
+    .string "your quest may fail.\p"
+    .string "I'm not sure if this will help you,\n"
+    .string "but I'd like you to have it.$"
+
+gUnknown_81937BD:: @ 81937BD
+    .string "{PLAYER} received a POKé FLUTE\n"
+    .string "from MR. FUJI.$"
+
+gUnknown_81937E5:: @ 81937E5
+    .string "Upon hearing the POKé FLUTE,\n"
+    .string "sleeping POKéMON will spring awake.\p"
+    .string "Try using it on POKéMON that are\n"
+    .string "sleeping obstacles.$"
+
+gUnknown_819385B:: @ 819385B
+    .string "You must make room for this!$"
+
+gUnknown_8193878:: @ 8193878
+    .string "MR. FUJI: Has my POKé FLUTE\n"
+    .string "helped you?$"
+
+gUnknown_81938A0:: @ 81938A0
+    .string "POKéMON FAN MAGAZINE\n"
+    .string "Monthly Grand Prize Drawing!\p"
+    .string "The application form is…\p"
+    .string "Gone! It's been clipped out.\n"
+    .string "Someone must have applied already.$"
+
+gUnknown_819392B:: @ 819392B
+    .string "POKéMON magazines line the shelf.\p"
+    .string "POKéMON INSIDER…\p"
+    .string "POKéMON FAN…$"
+
diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
new file mode 100644
index 000000000..165086636
--- /dev/null
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -0,0 +1,370 @@
+{
+  "id": "MAP_MT_EMBER_EXTERIOR",
+  "name": "MtEmber_Exterior",
+  "layout": "LAYOUT_MT_EMBER_EXTERIOR",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "56",
+      "x": 29,
+      "y": 45,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1C48E6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 41,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_16397F",
+      "flag": "137"
+    },
+    {
+      "graphics_id": "49",
+      "x": 42,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1639F0",
+      "flag": "137"
+    },
+    {
+      "graphics_id": "24",
+      "x": 22,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "46",
+      "movement_range_x": 5,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "MtEmber_Exterior_EventScript_163AE2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 15,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "MtEmber_Exterior_EventScript_163AB4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 14,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "MtEmber_Exterior_EventScript_163ACB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 29,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 30,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "97",
+      "x": 22,
+      "y": 45,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 17,
+      "y": 46,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 36,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 34,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 36,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "97",
+      "x": 35,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 35,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 18,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 19,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BE00C",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "92",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BED2C",
+      "flag": "493"
+    },
+    {
+      "graphics_id": "92",
+      "x": 38,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BED39",
+      "flag": "494"
+    },
+    {
+      "graphics_id": "92",
+      "x": 48,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Exterior_EventScript_1BED46",
+      "flag": "495"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 28,
+      "y": 48,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 29,
+      "y": 48,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 24,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 39,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 29,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_SUMMIT",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 42,
+      "y": 39,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 37,
+      "y": 43,
+      "elevation": 0,
+      "var": "VAR_0x407F",
+      "var_value": 1,
+      "script": "MtEmber_Exterior_EventScript_163A4E"
+    },
+    {
+      "type": "trigger",
+      "x": 38,
+      "y": 43,
+      "elevation": 0,
+      "var": "VAR_0x407F",
+      "var_value": 1,
+      "script": "MtEmber_Exterior_EventScript_163A4E"
+    },
+    {
+      "type": "trigger",
+      "x": 39,
+      "y": 43,
+      "elevation": 0,
+      "var": "VAR_0x407F",
+      "var_value": 1,
+      "script": "MtEmber_Exterior_EventScript_163A4E"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 18,
+      "y": 17,
+      "elevation": 0,
+      "item": "ITEM_FIRE_STONE",
+      "flag": "158",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 30,
+      "elevation": 3,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "162",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc
new file mode 100644
index 000000000..4ff35116d
--- /dev/null
+++ b/data/maps/MtEmber_Exterior/scripts.inc
@@ -0,0 +1,131 @@
+MtEmber_Exterior_MapScripts:: @ 8163946
+	map_script 3, MtEmber_Exterior_MapScript1_163951
+	map_script 1, MtEmber_Exterior_MapScript2_163969
+	.byte 0
+
+MtEmber_Exterior_MapScript1_163951:: @ 8163951
+	setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR
+	compare_var_to_value VAR_0x407F, 2
+	call_if 1, EventScript_163960
+	end
+
+EventScript_163960:: @ 8163960
+	setobjectmovementtype 2, 8
+	setobjectmovementtype 3, 8
+	return
+
+MtEmber_Exterior_MapScript2_163969:: @ 8163969
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	call_if 4, EventScript_163975
+	end
+
+EventScript_163975:: @ 8163975
+	setmetatile 42, 39, 838, 0
+	return
+
+MtEmber_Exterior_EventScript_16397F:: @ 816397F
+	lock
+	checktrainerflag FLAG_0x219
+	goto_if_eq EventScript_16399E
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	goto_if_eq EventScript_1639A8
+	msgbox gUnknown_817A82A
+	release
+	end
+
+EventScript_16399E:: @ 816399E
+	msgbox gUnknown_817AA3F
+	release
+	end
+
+EventScript_1639A8:: @ 81639A8
+	applymovement 2, Movement_1A75E1
+	waitmovement 0
+	playbgm BGM_FRLG_SUSPICIOUS_EYE, 0
+	msgbox gUnknown_817AA06
+	trainerbattle 3, 537, 0, Text_17AA34
+	msgbox gUnknown_817AA3F
+	checktrainerflag FLAG_0x21A
+	goto_if_eq EventScript_1639DB
+	release
+	end
+
+EventScript_1639DB:: @ 81639DB
+	msgbox gUnknown_817AAD7
+	closemessage
+	fadescreen 1
+	removeobject 2
+	removeobject 3
+	fadescreen 0
+	release
+	end
+
+MtEmber_Exterior_EventScript_1639F0:: @ 81639F0
+	lock
+	faceplayer
+	checktrainerflag FLAG_0x21A
+	goto_if_eq EventScript_163A1B
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	goto_if_eq EventScript_163A25
+	msgbox gUnknown_817A88C
+	closemessage
+	applymovement 3, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_163A1B:: @ 8163A1B
+	msgbox gUnknown_817AA99
+	release
+	end
+
+EventScript_163A25:: @ 8163A25
+	playbgm BGM_FRLG_SUSPICIOUS_EYE, 0
+	msgbox gUnknown_817AA56
+	trainerbattle 3, 538, 0, Text_17AA8A
+	msgbox gUnknown_817AA99
+	checktrainerflag FLAG_0x219
+	goto_if_eq EventScript_1639DB
+	release
+	end
+
+MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
+	lockall
+	textcolor 0
+	msgbox gUnknown_817A8B4
+	message Text_17A8EE
+	waitmessage
+	playse SE_PIN
+	applymovement 3, Movement_1A75D9
+	waitmovement 0
+	waitbuttonpress
+	msgbox gUnknown_817A970
+	applymovement 2, Movement_1A75ED
+	waitmovement 0
+	playse SE_PIN
+	applymovement 2, Movement_1A75DB
+	waitmovement 0
+	applymovement 2, Movement_1A75DD
+	waitmovement 0
+	applymovement 3, Movement_1A75ED
+	waitmovement 0
+	call EventScript_163960
+	msgbox gUnknown_817A9E1
+	setvar VAR_0x407F, 2
+	releaseall
+	end
+
+MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4
+	trainerbattle 0, 595, 0, Text_17AB73, Text_17ABAA
+	msgbox gUnknown_817ABD8, 6
+	end
+
+MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB
+	trainerbattle 0, 597, 0, Text_17AC55, Text_17AC82
+	msgbox gUnknown_817ACA2, 6
+	end
+
+MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2
+	trainerbattle 0, 592, 0, Text_17AD06, Text_17AD6B
+	msgbox gUnknown_817AD89, 6
+	end
diff --git a/data/maps/MtEmber_Exterior/text.inc b/data/maps/MtEmber_Exterior/text.inc
new file mode 100644
index 000000000..d9a365f95
--- /dev/null
+++ b/data/maps/MtEmber_Exterior/text.inc
@@ -0,0 +1,143 @@
+Text_17A642:: @ 817A642
+    .string "Can you imagine?\n"
+    .string "If this volcano were to erupt?\p"
+    .string "The explosion would be the end of\n"
+    .string "us. How terrifying is that?\p"
+    .string "While we're terrified, would you\n"
+    .string "like me to teach EXPLOSION?$"
+
+Text_17A6ED:: @ 817A6ED
+    .string "Yeah, you're right.\n"
+    .string "It is too terrifying.$"
+
+Text_17A717:: @ 817A717
+    .string "You're terribly brave!\p"
+    .string "Which POKéMON should I teach\n"
+    .string "EXPLOSION?$"
+
+Text_17A756:: @ 817A756
+    .string "Using EXPLOSION while on this\n"
+    .string "volcano…\p"
+    .string "What a terrifying thrill!$"
+
+Text_17A797:: @ 817A797
+    .string "こ　この　かざんが\n"
+    .string "もし　だいばくはつ　したら\l"
+    .string "お　おれら　ひとたまりも\l"
+    .string "ないなあ　‥ブルブル！\p"
+    .string "こ　こわい　ついでに\n"
+    .string "だいばくはつ　でも　おぼえてみる？$"
+
+Text_17A7E5:: @ 817A7E5
+    .string "や　やっぱ　こわいもんな\n"
+    .string "ブルブル$"
+
+Text_17A7F7:: @ 817A7F7
+    .string "つ　つよきだね！\n"
+    .string "じゃあ　どの　ポケモンに　する？$"
+
+Text_17A811:: @ 817A811
+    .string "かざんで　だいばくはつを‥\n"
+    .string "す　すごい　スリル！$"
+
+gUnknown_817A82A:: @ 817A82A
+    .string "Over here.\n"
+    .string "We'll try digging here.\p"
+    .string "That treasure the ADMINS've been\n"
+    .string "talking about should be here.$"
+
+gUnknown_817A88C:: @ 817A88C
+    .string "What the…?\n"
+    .string "You're in the way. Get lost.$"
+
+gUnknown_817A8B4:: @ 817A8B4
+    .string "Whew, punched through at last.\n"
+    .string "Let's go treasure hunting!$"
+
+Text_17A8EE:: @ 817A8EE
+    .string "Any treasure we find, we haul back\n"
+    .string "to the WAREHOUSE, understood?\p"
+    .string "…Oh, and what're the passwords?\n"
+    .string "At the ROCKET WAREHOUSE, I mean.$"
+
+gUnknown_817A970:: @ 817A970
+    .string "What, you forgot the password?\n"
+    .string "There're actually two.\p"
+    .string "The first one's “GOLDEEN need\n"
+    .string "log.”\p"
+    .string "And the second one is…$"
+
+gUnknown_817A9E1:: @ 817A9E1
+    .string "Hey!\n"
+    .string "This snoop's been listening in!$"
+
+gUnknown_817AA06:: @ 817AA06
+    .string "You've been eavesdropping on us,\n"
+    .string "haven't you?$"
+
+Text_17AA34:: @ 817AA34
+    .string "Huh, what?$"
+
+gUnknown_817AA3F:: @ 817AA3F
+    .string "Why'd you have to win?$"
+
+gUnknown_817AA56:: @ 817AA56
+    .string "Trying to horn in on our treasure?\n"
+    .string "Don't bet on it!$"
+
+Text_17AA8A:: @ 817AA8A
+    .string "Wait!\n"
+    .string "But how?$"
+
+gUnknown_817AA99:: @ 817AA99
+    .string "Develop amnesia conveniently and\n"
+    .string "forget everything you heard!$"
+
+gUnknown_817AAD7:: @ 817AAD7
+    .string "What a setback…\n"
+    .string "We'll have to regroup.\p"
+    .string "You! Don't even think about taking\n"
+    .string "a step inside here!\p"
+    .string "If you know what's good for you,\n"
+    .string "don't even think about this!$"
+
+Text_17AB73:: @ 817AB73
+    .string "An active volcano is one that's\n"
+    .string "erupting, or about to.$"
+
+Text_17ABAA:: @ 817ABAA
+    .string "Whew… That was hot!\n"
+    .string "Sweat's erupting from me!$"
+
+gUnknown_817ABD8:: @ 817ABD8
+    .string "They say there're over 1,500\n"
+    .string "active volcanoes in the world.\p"
+    .string "Just thinking about them makes me\n"
+    .string "feel all hot and gooey inside!$"
+
+Text_17AC55:: @ 817AC55
+    .string "Do you know how caves form inside\n"
+    .string "volcanoes?$"
+
+Text_17AC82:: @ 817AC82
+    .string "Atchah!\n"
+    .string "You're shockingly good!$"
+
+gUnknown_817ACA2:: @ 817ACA2
+    .string "When lava at the surface of magma\n"
+    .string "hardens, and the magma inside flows\l"
+    .string "out, caverns are left behind.$"
+
+Text_17AD06:: @ 817AD06
+    .string "I've been in training so I can mend\n"
+    .string "my broken heart…\p"
+    .string "It toughened me up physically at\n"
+    .string "least! Hi-yah!$"
+
+Text_17AD6B:: @ 817AD6B
+    .string "I think I tried to overdo it…$"
+
+gUnknown_817AD89:: @ 817AD89
+    .string "The way you battle, it reminds me\n"
+    .string "of the guy who dumped me…$"
+
diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json
new file mode 100644
index 000000000..dfd51b629
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_1F/map.json
@@ -0,0 +1,107 @@
+{
+  "id": "MAP_MT_EMBER_RUBY_PATH_1F",
+  "name": "MtEmber_RubyPath_1F",
+  "layout": "LAYOUT_MT_EMBER_RUBY_PATH_1F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "96",
+      "x": 18,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 23,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 20,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 19,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 21,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
+      "flag": "22"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_EXTERIOR",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 24,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_RubyPath_1F/scripts.inc b/data/maps/MtEmber_RubyPath_1F/scripts.inc
new file mode 100644
index 000000000..46d4be447
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_1F/scripts.inc
@@ -0,0 +1,2 @@
+MtEmber_RubyPath_1F_MapScripts:: @ 8163C45
+	.byte 0
diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json
new file mode 100644
index 000000000..e60856ad9
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B1F/map.json
@@ -0,0 +1,87 @@
+{
+  "id": "MAP_MT_EMBER_RUBY_PATH_B1F",
+  "name": "MtEmber_RubyPath_B1F",
+  "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "96",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 1,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 3,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 5,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
+      "flag": "21"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_RubyPath_B1F/scripts.inc b/data/maps/MtEmber_RubyPath_B1F/scripts.inc
new file mode 100644
index 000000000..6a5f9cefb
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B1F/scripts.inc
@@ -0,0 +1,2 @@
+MtEmber_RubyPath_B1F_MapScripts:: @ 8163C46
+	.byte 0
diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
new file mode 100644
index 000000000..c8175b887
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS",
+  "name": "MtEmber_RubyPath_B1F_Stairs",
+  "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C",
+      "flag": "18"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc
new file mode 100644
index 000000000..204b555a1
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc
@@ -0,0 +1,2 @@
+MtEmber_RubyPath_B1F_Stairs_MapScripts:: @ 8163C6F
+	.byte 0
diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json
new file mode 100644
index 000000000..919bcc7c3
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B2F/map.json
@@ -0,0 +1,126 @@
+{
+  "id": "MAP_MT_EMBER_RUBY_PATH_B2F",
+  "name": "MtEmber_RubyPath_B2F",
+  "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "97",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
+      "flag": "21"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 13,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_RubyPath_B2F/scripts.inc b/data/maps/MtEmber_RubyPath_B2F/scripts.inc
new file mode 100644
index 000000000..dc4d85ab6
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B2F/scripts.inc
@@ -0,0 +1,2 @@
+MtEmber_RubyPath_B2F_MapScripts:: @ 8163C47
+	.byte 0
diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
new file mode 100644
index 000000000..e1a7e7dbe
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
@@ -0,0 +1,61 @@
+{
+  "id": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS",
+  "name": "MtEmber_RubyPath_B2F_Stairs",
+  "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C",
+      "flag": "19"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc
new file mode 100644
index 000000000..3646547b1
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc
@@ -0,0 +1,2 @@
+MtEmber_RubyPath_B2F_Stairs_MapScripts:: @ 8163C70
+	.byte 0
diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json
new file mode 100644
index 000000000..bd2088c30
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B3F/map.json
@@ -0,0 +1,172 @@
+{
+  "id": "MAP_MT_EMBER_RUBY_PATH_B3F",
+  "name": "MtEmber_RubyPath_B3F",
+  "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B3F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "97",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 26,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 28,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "97",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 19,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc
new file mode 100644
index 000000000..bc9266e8b
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc
@@ -0,0 +1,13 @@
+MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48
+	.byte 0
+
+MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49
+MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49
+	lock
+	faceplayer
+	setflag FLAG_0x2DD
+	removeobject 1
+	additem ITEM_RUBY, 1
+	giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, BGM_FRLG_ME_KEYITEM
+	release
+	end
diff --git a/data/maps/MtEmber_RubyPath_B3F/text.inc b/data/maps/MtEmber_RubyPath_B3F/text.inc
new file mode 100644
index 000000000..4cf8b5a50
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B3F/text.inc
@@ -0,0 +1,3 @@
+gUnknown_817ADC5:: @ 817ADC5
+    .string "{PLAYER} found a RUBY!$"
+
diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json
new file mode 100644
index 000000000..611d87ef4
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B4F/map.json
@@ -0,0 +1,217 @@
+{
+  "id": "MAP_MT_EMBER_RUBY_PATH_B4F",
+  "name": "MtEmber_RubyPath_B4F",
+  "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B4F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 3,
+      "y": 9,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 3,
+      "y": 11,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 4,
+      "y": 11,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 5,
+      "y": 11,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 3,
+      "y": 13,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163907"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 4,
+      "y": 13,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163907"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 5,
+      "y": 13,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163907"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 7,
+      "y": 7,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163910"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 8,
+      "y": 7,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163910"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 9,
+      "y": 7,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163910"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163919"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163919"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 9,
+      "y": 9,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163919"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 7,
+      "y": 11,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163922"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 11,
+      "y": 7,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163934"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_16393D"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 8,
+      "y": 11,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163922"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 9,
+      "y": 11,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_163922"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 7,
+      "y": 13,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_16392B"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 9,
+      "y": 13,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_16392B"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 8,
+      "y": 13,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B4F_EventScript_16392B"
+    }
+  ]
+}
diff --git a/data/maps/MtEmber_RubyPath_B4F/scripts.inc b/data/maps/MtEmber_RubyPath_B4F/scripts.inc
new file mode 100644
index 000000000..18249a49a
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B4F/scripts.inc
@@ -0,0 +1,72 @@
+MtEmber_RubyPath_B4F_MapScripts:: @ 81638EB
+	.byte 0
+
+MtEmber_RubyPath_B4F_EventScript_1638EC:: @ 81638EC
+	lockall
+	braillemessage gUnknown_81A929F
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_1638F5:: @ 81638F5
+	lockall
+	braillemessage gUnknown_81A92A3
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_1638FE:: @ 81638FE
+	lockall
+	braillemessage gUnknown_81A92A7
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_163907:: @ 8163907
+	lockall
+	braillemessage gUnknown_81A92AB
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_163910:: @ 8163910
+	lockall
+	braillemessage gUnknown_81A92AF
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_163919:: @ 8163919
+	lockall
+	braillemessage gUnknown_81A92B3
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_163922:: @ 8163922
+	lockall
+	braillemessage gUnknown_81A92B7
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_16392B:: @ 816392B
+	lockall
+	braillemessage gUnknown_81A92BC
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_163934:: @ 8163934
+	lockall
+	braillemessage gUnknown_81A92C1
+	waitbuttonpress
+	releaseall
+	end
+
+MtEmber_RubyPath_B4F_EventScript_16393D:: @ 816393D
+	lockall
+	braillemessage gUnknown_81A92C3
+	waitbuttonpress
+	releaseall
+	end
diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json
new file mode 100644
index 000000000..e6b80acc1
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B5F/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_MT_EMBER_RUBY_PATH_B5F",
+  "name": "MtEmber_RubyPath_B5F",
+  "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B5F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "99",
+      "x": 7,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_RubyPath_B5F_EventScript_163C49",
+      "flag": "138"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "script": "MtEmber_RubyPath_B5F_EventScript_163BAB"
+    }
+  ]
+}
diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc
new file mode 100644
index 000000000..c3d8b7320
--- /dev/null
+++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc
@@ -0,0 +1,38 @@
+MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA
+	.byte 0
+
+MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB
+	lockall
+	setvar VAR_0x8005, 130
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A92C5
+	getbraillestringwidth gUnknown_81A92C5
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A92D0
+	getbraillestringwidth gUnknown_81A92D0
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A92DC
+	getbraillestringwidth gUnknown_81A92DC
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A92E6
+	getbraillestringwidth gUnknown_81A92E6
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A92F2
+	getbraillestringwidth gUnknown_81A92F2
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A92FE
+	getbraillestringwidth gUnknown_81A92FE
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A930A
+	getbraillestringwidth gUnknown_81A930A
+	call EventScript_1A926C
+	braillemessage gUnknown_81A9316
+	waitbuttonpress
+	releaseall
+	end
diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json
new file mode 100644
index 000000000..711f6f57d
--- /dev/null
+++ b/data/maps/MtEmber_Summit/map.json
@@ -0,0 +1,93 @@
+{
+  "id": "MAP_MT_EMBER_SUMMIT",
+  "name": "MtEmber_Summit",
+  "layout": "LAYOUT_MT_EMBER_SUMMIT",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "137",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Summit_EventScript_163B33",
+      "flag": "82"
+    },
+    {
+      "graphics_id": "97",
+      "x": 10,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Summit_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Summit_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Summit_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_Summit_EventScript_1BE11D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_EXTERIOR",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc
new file mode 100644
index 000000000..3de162df2
--- /dev/null
+++ b/data/maps/MtEmber_Summit/scripts.inc
@@ -0,0 +1,66 @@
+MtEmber_Summit_MapScripts:: @ 8163AFC
+	map_script 3, MtEmber_Summit_MapScript1_163B25
+	map_script 5, MtEmber_Summit_MapScript2_163B07
+	.byte 0
+
+MtEmber_Summit_MapScript2_163B07:: @ 8163B07
+	checkflag FLAG_0x807
+	call_if 1, EventScript_163B11
+	end
+
+EventScript_163B11:: @ 8163B11
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 7
+	goto_if 5, EventScript_1A77A9
+	removeobject VAR_LAST_TALKED
+	return
+
+MtEmber_Summit_MapScript1_163B25:: @ 8163B25
+	checkflag FLAG_0x2BD
+	call_if 0, EventScript_163B2F
+	end
+
+EventScript_163B2F:: @ 8163B2F
+	clearflag FLAG_0x052
+	return
+
+MtEmber_Summit_EventScript_163B33:: @ 8163B33
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
+	waitse
+	playmoncry SPECIES_MOLTRES, 2
+	message Text_1A6448
+	waitmessage
+	waitmoncry
+	delay 10
+	playbgm BGM_FRLG_LEADER_EYE, 0
+	waitbuttonpress
+	setflag FLAG_0x807
+	special sub_807F9D8
+	waitstate
+	clearflag FLAG_0x807
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_163B96
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_163B9F
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_163B9F
+	setflag FLAG_0x2BD
+	release
+	end
+
+EventScript_163B96:: @ 8163B96
+	setflag FLAG_0x2BD
+	goto EventScript_1A922D
+	end
+
+EventScript_163B9F:: @ 8163B9F
+	setvar VAR_0x8004, SPECIES_MOLTRES
+	goto EventScript_1A9236
+	end
diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json
new file mode 100644
index 000000000..16438a729
--- /dev/null
+++ b/data/maps/MtEmber_SummitPath_1F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_MT_EMBER_SUMMIT_PATH_1F",
+  "name": "MtEmber_SummitPath_1F",
+  "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_EXTERIOR",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 11,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_SummitPath_1F/scripts.inc b/data/maps/MtEmber_SummitPath_1F/scripts.inc
new file mode 100644
index 000000000..22143d713
--- /dev/null
+++ b/data/maps/MtEmber_SummitPath_1F/scripts.inc
@@ -0,0 +1,2 @@
+MtEmber_SummitPath_1F_MapScripts:: @ 8163AF9
+	.byte 0
diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json
new file mode 100644
index 000000000..161cdff31
--- /dev/null
+++ b/data/maps/MtEmber_SummitPath_2F/map.json
@@ -0,0 +1,152 @@
+{
+  "id": "MAP_MT_EMBER_SUMMIT_PATH_2F",
+  "name": "MtEmber_SummitPath_2F",
+  "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "96",
+      "x": 40,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 15,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 13,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 13,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 7,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "96",
+      "x": 9,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "24"
+    },
+    {
+      "graphics_id": "96",
+      "x": 7,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "25"
+    },
+    {
+      "graphics_id": "96",
+      "x": 15,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
+      "flag": "26"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 39,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 39,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_SummitPath_2F/scripts.inc b/data/maps/MtEmber_SummitPath_2F/scripts.inc
new file mode 100644
index 000000000..d8b43df39
--- /dev/null
+++ b/data/maps/MtEmber_SummitPath_2F/scripts.inc
@@ -0,0 +1,2 @@
+MtEmber_SummitPath_2F_MapScripts:: @ 8163AFA
+	.byte 0
diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json
new file mode 100644
index 000000000..0d2f4c7b3
--- /dev/null
+++ b/data/maps/MtEmber_SummitPath_3F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_MT_EMBER_SUMMIT_PATH_3F",
+  "name": "MtEmber_SummitPath_3F",
+  "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_MT_EMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_MT_EMBER_EXTERIOR",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/MtEmber_SummitPath_3F/scripts.inc b/data/maps/MtEmber_SummitPath_3F/scripts.inc
new file mode 100644
index 000000000..e576b321c
--- /dev/null
+++ b/data/maps/MtEmber_SummitPath_3F/scripts.inc
@@ -0,0 +1,2 @@
+MtEmber_SummitPath_3F_MapScripts:: @ 8163AFB
+	.byte 0
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json
new file mode 100644
index 000000000..314eedb18
--- /dev/null
+++ b/data/maps/MtMoon_1F/map.json
@@ -0,0 +1,239 @@
+{
+  "id": "MAP_MT_MOON_1F",
+  "name": "MtMoon_1F",
+  "layout": "LAYOUT_MT_MOON_1F",
+  "music": "BGM_FRLG_MT_MOON",
+  "region_map_section": "MAPSEC_MT_MOON",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 20,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "MtMoon_1F_EventScript_16063C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 36,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "MtMoon_1F_EventScript_160681",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 30,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "MtMoon_1F_EventScript_160653",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 33,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "47",
+      "movement_range_x": 5,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "MtMoon_1F_EventScript_160625",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 7,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "MtMoon_1F_EventScript_16066A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 13,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "MtMoon_1F_EventScript_16060E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "MtMoon_1F_EventScript_1605F7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_1F_EventScript_1BE5CF",
+      "flag": "345"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_1F_EventScript_1BE5DC",
+      "flag": "346"
+    },
+    {
+      "graphics_id": "92",
+      "x": 26,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_1F_EventScript_1BE5E9",
+      "flag": "347"
+    },
+    {
+      "graphics_id": "92",
+      "x": 42,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_1F_EventScript_1BE5F6",
+      "flag": "348"
+    },
+    {
+      "graphics_id": "92",
+      "x": 44,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_1F_EventScript_1BE603",
+      "flag": "349"
+    },
+    {
+      "graphics_id": "92",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_1F_EventScript_1BE610",
+      "flag": "350"
+    },
+    {
+      "graphics_id": "30",
+      "x": 42,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_1F_EventScript_1ACE03",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 31,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 18,
+      "y": 37,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE4",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 19,
+      "y": 26,
+      "elevation": 0,
+      "script": "MtMoon_1F_EventScript_1605EE"
+    }
+  ]
+}
diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc
new file mode 100644
index 000000000..cd8feb26c
--- /dev/null
+++ b/data/maps/MtMoon_1F/scripts.inc
@@ -0,0 +1,46 @@
+MtMoon_1F_MapScripts:: @ 81605E4
+	map_script 3, MtMoon_1F_MapScript1_1605EA
+	.byte 0
+
+MtMoon_1F_MapScript1_1605EA:: @ 81605EA
+	setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F
+	end
+
+MtMoon_1F_EventScript_1605EE:: @ 81605EE
+	msgbox gUnknown_8172AE0, 3
+	end
+
+MtMoon_1F_EventScript_1605F7:: @ 81605F7
+	trainerbattle 0, 181, 0, Text_17279D, Text_1727CB
+	msgbox gUnknown_81727DF, 6
+	end
+
+MtMoon_1F_EventScript_16060E:: @ 816060E
+	trainerbattle 0, 91, 0, Text_17281D, Text_172844
+	msgbox gUnknown_8172863, 6
+	end
+
+MtMoon_1F_EventScript_160625:: @ 8160625
+	trainerbattle 0, 120, 0, Text_172896, Text_1728C3
+	msgbox gUnknown_81728D2, 6
+	end
+
+MtMoon_1F_EventScript_16063C:: @ 816063C
+	trainerbattle 0, 121, 0, Text_172972, Text_1729A4
+	msgbox gUnknown_81729AC, 6
+	end
+
+MtMoon_1F_EventScript_160653:: @ 8160653
+	trainerbattle 0, 169, 0, Text_17290B, Text_172927
+	msgbox gUnknown_817293C, 6
+	end
+
+MtMoon_1F_EventScript_16066A:: @ 816066A
+	trainerbattle 0, 108, 0, Text_1729EA, Text_172A1A
+	msgbox gUnknown_8172A26, 6
+	end
+
+MtMoon_1F_EventScript_160681:: @ 8160681
+	trainerbattle 0, 109, 0, Text_172A55, Text_172A8F
+	msgbox gUnknown_8172A97, 6
+	end
diff --git a/data/maps/MtMoon_1F/text.inc b/data/maps/MtMoon_1F/text.inc
new file mode 100644
index 000000000..86028da5c
--- /dev/null
+++ b/data/maps/MtMoon_1F/text.inc
@@ -0,0 +1,87 @@
+Text_17279D:: @ 817279D
+    .string "WHOA!\n"
+    .string "You shocked me!\l"
+    .string "…Oh, you're just a kid!$"
+
+Text_1727CB:: @ 81727CB
+    .string "Wow!\n"
+    .string "Shocked again!$"
+
+gUnknown_81727DF:: @ 81727DF
+    .string "Kids like you shouldn't be\n"
+    .string "wandering around here in the dark.$"
+
+Text_17281D:: @ 817281D
+    .string "Did you come to explore the cave,\n"
+    .string "too?$"
+
+Text_172844:: @ 8172844
+    .string "Losing stinks!\n"
+    .string "It's so uncool.$"
+
+gUnknown_8172863:: @ 8172863
+    .string "I came all the way down here to\n"
+    .string "show off to girls.$"
+
+Text_172896:: @ 8172896
+    .string "Wow! It's way bigger in here than\n"
+    .string "I thought!$"
+
+Text_1728C3:: @ 81728C3
+    .string "Oh!\n"
+    .string "I lost it!$"
+
+gUnknown_81728D2:: @ 81728D2
+    .string "How do you get out of here?\n"
+    .string "It's so big, I may get lost.$"
+
+Text_17290B:: @ 817290B
+    .string "What!\n"
+    .string "Don't sneak up on me!$"
+
+Text_172927:: @ 8172927
+    .string "My POKéMON won't do!$"
+
+gUnknown_817293C:: @ 817293C
+    .string "I have to find stronger POKéMON.\n"
+    .string "Where might they be?$"
+
+Text_172972:: @ 8172972
+    .string "What?\n"
+    .string "I'm waiting for my friends to find\l"
+    .string "me here.$"
+
+Text_1729A4:: @ 81729A4
+    .string "I lost?$"
+
+gUnknown_81729AC:: @ 81729AC
+    .string "I came because I heard there are\n"
+    .string "some very rare fossils here.$"
+
+Text_1729EA:: @ 81729EA
+    .string "Suspicious men are in the cave.\n"
+    .string "What about you?$"
+
+Text_172A1A:: @ 8172A1A
+    .string "You got me!$"
+
+gUnknown_8172A26:: @ 8172A26
+    .string "I saw them!\n"
+    .string "I'm sure they're from TEAM ROCKET!$"
+
+Text_172A55:: @ 8172A55
+    .string "You need to go through this cave\n"
+    .string "to get to CERULEAN CITY.$"
+
+Text_172A8F:: @ 8172A8F
+    .string "I lost.$"
+
+gUnknown_8172A97:: @ 8172A97
+    .string "ZUBAT is tough!\n"
+    .string "But if you can catch one, you'll\l"
+    .string "be able to count on it.$"
+
+gUnknown_8172AE0:: @ 8172AE0
+    .string "Beware!\n"
+    .string "ZUBAT is a bloodsucker!$"
+
diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json
new file mode 100644
index 000000000..44e8bec9d
--- /dev/null
+++ b/data/maps/MtMoon_B1F/map.json
@@ -0,0 +1,131 @@
+{
+  "id": "MAP_MT_MOON_B1F",
+  "name": "MtMoon_B1F",
+  "layout": "LAYOUT_MT_MOON_B1F",
+  "music": "BGM_FRLG_MT_MOON",
+  "region_map_section": "MAPSEC_MT_MOON",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 25,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 43,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 22,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 26,
+      "y": 36,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 39,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 45,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE4",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 46,
+      "y": 2,
+      "elevation": 0,
+      "item": "ITEM_TINY_MUSHROOM",
+      "flag": "84",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 26,
+      "y": 2,
+      "elevation": 0,
+      "item": "ITEM_TINY_MUSHROOM",
+      "flag": "85",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 39,
+      "y": 34,
+      "elevation": 0,
+      "item": "ITEM_TINY_MUSHROOM",
+      "flag": "86",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 24,
+      "y": 35,
+      "elevation": 0,
+      "item": "ITEM_BIG_MUSHROOM",
+      "flag": "87",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "item": "ITEM_BIG_MUSHROOM",
+      "flag": "88",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 25,
+      "y": 34,
+      "elevation": 0,
+      "item": "ITEM_BIG_MUSHROOM",
+      "flag": "89",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/MtMoon_B1F/scripts.inc b/data/maps/MtMoon_B1F/scripts.inc
new file mode 100644
index 000000000..ecc7676e0
--- /dev/null
+++ b/data/maps/MtMoon_B1F/scripts.inc
@@ -0,0 +1,2 @@
+MtMoon_B1F_MapScripts:: @ 8160698
+	.byte 0
diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json
new file mode 100644
index 000000000..093b40917
--- /dev/null
+++ b/data/maps/MtMoon_B2F/map.json
@@ -0,0 +1,221 @@
+{
+  "id": "MAP_MT_MOON_B2F",
+  "name": "MtMoon_B2F",
+  "layout": "LAYOUT_MT_MOON_B2F",
+  "music": "BGM_FRLG_MT_MOON",
+  "region_map_section": "MAPSEC_MT_MOON",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "98",
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_B2F_EventScript_16071B",
+      "flag": "47"
+    },
+    {
+      "graphics_id": "98",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_B2F_EventScript_16077F",
+      "flag": "48"
+    },
+    {
+      "graphics_id": "55",
+      "x": 13,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_B2F_EventScript_1606C2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 37,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "MtMoon_B2F_EventScript_160829",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 12,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "MtMoon_B2F_EventScript_1607E4",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 35,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "MtMoon_B2F_EventScript_160812",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 18,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "MtMoon_B2F_EventScript_1607FB",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "92",
+      "x": 30,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_B2F_EventScript_1BE61D",
+      "flag": "351"
+    },
+    {
+      "graphics_id": "92",
+      "x": 35,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_B2F_EventScript_1BE62A",
+      "flag": "352"
+    },
+    {
+      "graphics_id": "92",
+      "x": 24,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_B2F_EventScript_1BEAD6",
+      "flag": "447"
+    },
+    {
+      "graphics_id": "92",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtMoon_B2F_EventScript_1BEAE3",
+      "flag": "448"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 25,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 31,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 17,
+      "y": 31,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_B1F",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x408B",
+      "var_value": 0,
+      "script": "MtMoon_B2F_EventScript_1606B0"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 20,
+      "y": 16,
+      "elevation": 3,
+      "item": "ITEM_MOON_STONE",
+      "flag": "2",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 39,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_ETHER",
+      "flag": "3",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc
new file mode 100644
index 000000000..1947a3eb2
--- /dev/null
+++ b/data/maps/MtMoon_B2F/scripts.inc
@@ -0,0 +1,143 @@
+MtMoon_B2F_MapScripts:: @ 8160699
+	map_script 3, MtMoon_B2F_MapScript1_16069F
+	.byte 0
+
+MtMoon_B2F_MapScript1_16069F:: @ 816069F
+	checkflag FLAG_0x232
+	call_if 0, EventScript_1606A9
+	end
+
+EventScript_1606A9:: @ 81606A9
+	clearflag FLAG_0x02F
+	clearflag FLAG_0x030
+	return
+
+MtMoon_B2F_EventScript_1606B0:: @ 81606B0
+	lockall
+	applymovement 3, Movement_1A75EB
+	waitmovement 0
+	call EventScript_1606DD
+	releaseall
+	end
+
+MtMoon_B2F_EventScript_1606C2:: @ 81606C2
+	lock
+	faceplayer
+	checkflag FLAG_0x232
+	goto_if_eq EventScript_160707
+	checktrainerflag FLAG_0x0AA
+	goto_if_eq EventScript_160711
+	call EventScript_1606DD
+	release
+	end
+
+EventScript_1606DD:: @ 81606DD
+	textcolor 0
+	message Text_172B64
+	waitmessage
+	playbgm BGM_FRLG_LEADER_EYE, 0
+	waitbuttonpress
+	setvar VAR_LAST_TALKED, 3
+	trainerbattle 3, 170, 0, Text_172B99
+	setvar VAR_0x408B, 1
+	msgbox gUnknown_8172BAB
+	return
+
+EventScript_160707:: @ 8160707
+	msgbox gUnknown_8172BFB
+	release
+	end
+
+EventScript_160711:: @ 8160711
+	msgbox gUnknown_8172BAB
+	release
+	end
+
+MtMoon_B2F_EventScript_16071B:: @ 816071B
+	lock
+	faceplayer
+	msgbox gUnknown_8172E77, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1607DE
+	removeobject 1
+	additem ITEM_DOME_FOSSIL, 1
+	giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, BGM_FRLG_ME_KEYITEM
+	closemessage
+	special sub_8112364
+	delay 10
+	applymovement 3, Movement_16077A
+	waitmovement 0
+	moveobjectoffscreen 3
+	textcolor 0
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_172BD6
+	waitmessage
+	waitfanfare
+	removeobject 2
+	setflag FLAG_0x272
+	setflag FLAG_0x232
+	release
+	end
+
+Movement_16077A:: @ 816077A
+	step_13
+	step_11
+	step_11
+	step_11
+	step_end
+
+MtMoon_B2F_EventScript_16077F:: @ 816077F
+	lock
+	faceplayer
+	msgbox gUnknown_8172E94, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1607DE
+	removeobject 2
+	additem ITEM_HELIX_FOSSIL, 1
+	giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, BGM_FRLG_ME_KEYITEM
+	closemessage
+	special sub_8112364
+	delay 10
+	applymovement 3, Movement_1607E0
+	waitmovement 0
+	moveobjectoffscreen 3
+	textcolor 0
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_172BD6
+	waitmessage
+	waitfanfare
+	removeobject 1
+	setflag FLAG_0x273
+	setflag FLAG_0x232
+	release
+	end
+
+EventScript_1607DE:: @ 81607DE
+	release
+	end
+
+Movement_1607E0:: @ 81607E0
+	step_11
+	step_11
+	step_11
+	step_end
+
+MtMoon_B2F_EventScript_1607E4:: @ 81607E4
+	trainerbattle 0, 351, 0, Text_172C5A, Text_172CB8
+	msgbox gUnknown_8172CCB, 6
+	end
+
+MtMoon_B2F_EventScript_1607FB:: @ 81607FB
+	trainerbattle 0, 352, 0, Text_172CFC, Text_172D46
+	msgbox gUnknown_8172D51, 6
+	end
+
+MtMoon_B2F_EventScript_160812:: @ 8160812
+	trainerbattle 0, 353, 0, Text_172D82, Text_172DAF
+	msgbox gUnknown_8172DC1, 6
+	end
+
+MtMoon_B2F_EventScript_160829:: @ 8160829
+	trainerbattle 0, 354, 0, Text_172DF0, Text_172E3E
+	msgbox gUnknown_8172E4B, 6
+	end
diff --git a/data/maps/MtMoon_B2F/text.inc b/data/maps/MtMoon_B2F/text.inc
new file mode 100644
index 000000000..2f27312db
--- /dev/null
+++ b/data/maps/MtMoon_B2F/text.inc
@@ -0,0 +1,90 @@
+Text_172B00:: @ 8172B00
+    .string "Hi, I'm excavating for fossils here\n"
+    .string "under MT. MOON.\p"
+    .string "Sometimes, BROCK of PEWTER GYM\n"
+    .string "lends me a hand.$"
+
+Text_172B64:: @ 8172B64
+    .string "Hey, stop!\p"
+    .string "I found these fossils!\n"
+    .string "They're both mine!$"
+
+Text_172B99:: @ 8172B99
+    .string "Okay!\n"
+    .string "I'll share!$"
+
+gUnknown_8172BAB:: @ 8172BAB
+    .string "We'll each take a fossil!\n"
+    .string "No being greedy!$"
+
+Text_172BD6:: @ 8172BD6
+    .string "All right.\n"
+    .string "Then this fossil is mine!$"
+
+gUnknown_8172BFB:: @ 8172BFB
+    .string "Far away, on CINNABAR ISLAND,\n"
+    .string "there's a POKéMON LAB.\p"
+    .string "They do research on regenerating\n"
+    .string "fossils.$"
+
+Text_172C5A:: @ 8172C5A
+    .string "We, TEAM ROCKET, shall find the\n"
+    .string "fossils!\p"
+    .string "Reviving POKéMON from them will\n"
+    .string "earn us huge riches!$"
+
+Text_172CB8:: @ 8172CB8
+    .string "Urgh!\n"
+    .string "Now I'm mad!$"
+
+gUnknown_8172CCB:: @ 8172CCB
+    .string "You made me mad!\n"
+    .string "TEAM ROCKET will blacklist you!$"
+
+Text_172CFC:: @ 8172CFC
+    .string "We, TEAM ROCKET, are POKéMON\n"
+    .string "gangsters!\l"
+    .string "We strike fear with our strength!$"
+
+Text_172D46:: @ 8172D46
+    .string "I blew it!$"
+
+gUnknown_8172D51:: @ 8172D51
+    .string "Darn it all!\n"
+    .string "My associates won't stand for this!$"
+
+Text_172D82:: @ 8172D82
+    .string "We're pulling a big job here!\n"
+    .string "Get lost, kid!$"
+
+Text_172DAF:: @ 8172DAF
+    .string "So, you are good…$"
+
+gUnknown_8172DC1:: @ 8172DC1
+    .string "If you find a fossil, give it to me\n"
+    .string "and scram!$"
+
+Text_172DF0:: @ 8172DF0
+    .string "Little kids shouldn't be messing\n"
+    .string "around with grown-ups!\p"
+    .string "It could be bad news!$"
+
+Text_172E3E:: @ 8172E3E
+    .string "I'm steamed!$"
+
+gUnknown_8172E4B:: @ 8172E4B
+    .string "POKéMON lived here long before\n"
+    .string "people came.$"
+
+gUnknown_8172E77:: @ 8172E77
+    .string "Do you want the DOME FOSSIL?$"
+
+gUnknown_8172E94:: @ 8172E94
+    .string "Do you want the HELIX FOSSIL?$"
+
+gUnknown_8172EB2:: @ 8172EB2
+    .string "Obtained the HELIX FOSSIL!$"
+
+gUnknown_8172ECD:: @ 8172ECD
+    .string "Obtained the DOME FOSSIL!$"
+
diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json
new file mode 100644
index 000000000..9cbfb1918
--- /dev/null
+++ b/data/maps/NavelRock_1F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_1F",
+  "name": "NavelRock_1F",
+  "layout": "LAYOUT_NAVEL_ROCK_1F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_EXTERIOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_1F/scripts.inc b/data/maps/NavelRock_1F/scripts.inc
new file mode 100644
index 000000000..2cf06ab2e
--- /dev/null
+++ b/data/maps/NavelRock_1F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_1F_MapScripts:: @ 8164F9E
+	.byte 0
diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json
new file mode 100644
index 000000000..643051c4a
--- /dev/null
+++ b/data/maps/NavelRock_B1F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_B1F",
+  "name": "NavelRock_B1F",
+  "layout": "LAYOUT_NAVEL_ROCK_B1F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_FORK",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_B1F/scripts.inc b/data/maps/NavelRock_B1F/scripts.inc
new file mode 100644
index 000000000..b25c20c1e
--- /dev/null
+++ b/data/maps/NavelRock_B1F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_B1F_MapScripts:: @ 8165201
+	.byte 0
diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json
new file mode 100644
index 000000000..50742576b
--- /dev/null
+++ b/data/maps/NavelRock_Base/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE",
+  "name": "NavelRock_Base",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "144",
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "NavelRock_Base_EventScript_165134",
+      "flag": "155"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B11F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
new file mode 100644
index 000000000..34cca4e9b
--- /dev/null
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -0,0 +1,91 @@
+NavelRock_Base_MapScripts:: @ 81650E7
+	map_script 3, NavelRock_Base_MapScript1_1650F2
+	map_script 5, NavelRock_Base_MapScript2_165116
+	.byte 0
+
+NavelRock_Base_MapScript1_1650F2:: @ 81650F2
+	checkflag FLAG_0x2F2
+	call_if 1, EventScript_165105
+	checkflag FLAG_0x2F2
+	call_if 0, EventScript_165109
+	end
+
+EventScript_165105:: @ 8165105
+	setflag FLAG_0x09B
+	return
+
+EventScript_165109:: @ 8165109
+	checkflag FLAG_0x2F5
+	goto_if_eq EventScript_1A77A9
+	clearflag FLAG_0x09B
+	return
+
+NavelRock_Base_MapScript2_165116:: @ 8165116
+	checkflag FLAG_0x807
+	call_if 1, EventScript_165120
+	end
+
+EventScript_165120:: @ 8165120
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 7
+	goto_if 5, EventScript_1A77A9
+	removeobject 1
+	return
+
+NavelRock_Base_EventScript_165134:: @ 8165134
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	waitse
+	delay 20
+	playse SE_FUUSEN2
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 4
+	setvar VAR_0x8007, 2
+	special sub_80CAC28
+	delay 30
+	playse SE_FUUSEN2
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 4
+	setvar VAR_0x8007, 2
+	special sub_80CAC28
+	delay 30
+	delay 50
+	waitse
+	playmoncry SPECIES_LUGIA, 2
+	waitmoncry
+	delay 20
+	setvar VAR_0x8004, SPECIES_LUGIA
+	setvar VAR_0x8005, 70
+	setvar VAR_0x8006, 0
+	special sub_8044838
+	setflag FLAG_0x807
+	special sub_807F9D8
+	waitstate
+	clearflag FLAG_0x807
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1651D9
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_1651E7
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_1651E7
+	setflag FLAG_0x2F2
+	release
+	end
+
+EventScript_1651D9:: @ 81651D9
+	setflag FLAG_0x2F5
+	setvar VAR_0x8004, SPECIES_LUGIA
+	goto EventScript_1A9236
+	end
+
+EventScript_1651E7:: @ 81651E7
+	setvar VAR_0x8004, SPECIES_LUGIA
+	goto EventScript_1A9236
+	end
diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json
new file mode 100644
index 000000000..41aaa26fe
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B10F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B10F",
+  "name": "NavelRock_BasePath_B10F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B9F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B11F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B10F/scripts.inc b/data/maps/NavelRock_BasePath_B10F/scripts.inc
new file mode 100644
index 000000000..472814198
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B10F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B10F_MapScripts:: @ 81651FF
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json
new file mode 100644
index 000000000..ca63d3f42
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B11F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B11F",
+  "name": "NavelRock_BasePath_B11F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B10F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B11F/scripts.inc b/data/maps/NavelRock_BasePath_B11F/scripts.inc
new file mode 100644
index 000000000..9157991d1
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B11F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B11F_MapScripts:: @ 8165200
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json
new file mode 100644
index 000000000..d91ec836f
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B1F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B1F",
+  "name": "NavelRock_BasePath_B1F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_FORK",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B1F/scripts.inc b/data/maps/NavelRock_BasePath_B1F/scripts.inc
new file mode 100644
index 000000000..141ec01a0
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B1F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B1F_MapScripts:: @ 81651F6
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json
new file mode 100644
index 000000000..795341b0d
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B2F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B2F",
+  "name": "NavelRock_BasePath_B2F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B2F/scripts.inc b/data/maps/NavelRock_BasePath_B2F/scripts.inc
new file mode 100644
index 000000000..75d2fa066
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B2F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B2F_MapScripts:: @ 81651F7
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json
new file mode 100644
index 000000000..9ecce5260
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B3F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B3F",
+  "name": "NavelRock_BasePath_B3F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B4F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B3F/scripts.inc b/data/maps/NavelRock_BasePath_B3F/scripts.inc
new file mode 100644
index 000000000..4cf947ebc
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B3F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B3F_MapScripts:: @ 81651F8
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json
new file mode 100644
index 000000000..e4b6728a1
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B4F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B4F",
+  "name": "NavelRock_BasePath_B4F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B5F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B4F/scripts.inc b/data/maps/NavelRock_BasePath_B4F/scripts.inc
new file mode 100644
index 000000000..9e7f60f9d
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B4F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B4F_MapScripts:: @ 81651F9
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json
new file mode 100644
index 000000000..2a66f9652
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B5F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B5F",
+  "name": "NavelRock_BasePath_B5F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B4F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B6F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B5F/scripts.inc b/data/maps/NavelRock_BasePath_B5F/scripts.inc
new file mode 100644
index 000000000..43a17fabe
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B5F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B5F_MapScripts:: @ 81651FA
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json
new file mode 100644
index 000000000..4d0f797b0
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B6F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B6F",
+  "name": "NavelRock_BasePath_B6F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B5F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B7F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B6F/scripts.inc b/data/maps/NavelRock_BasePath_B6F/scripts.inc
new file mode 100644
index 000000000..9711ad6a4
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B6F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B6F_MapScripts:: @ 81651FB
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json
new file mode 100644
index 000000000..053282a88
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B7F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B7F",
+  "name": "NavelRock_BasePath_B7F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B6F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B8F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B7F/scripts.inc b/data/maps/NavelRock_BasePath_B7F/scripts.inc
new file mode 100644
index 000000000..276556621
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B7F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B7F_MapScripts:: @ 81651FC
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json
new file mode 100644
index 000000000..d46e80168
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B8F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B8F",
+  "name": "NavelRock_BasePath_B8F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B7F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B9F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B8F/scripts.inc b/data/maps/NavelRock_BasePath_B8F/scripts.inc
new file mode 100644
index 000000000..03458eabf
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B8F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B8F_MapScripts:: @ 81651FD
+	.byte 0
diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json
new file mode 100644
index 000000000..43440ca9c
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B9F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_BASE_PATH_B9F",
+  "name": "NavelRock_BasePath_B9F",
+  "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B8F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B10F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_BasePath_B9F/scripts.inc b/data/maps/NavelRock_BasePath_B9F/scripts.inc
new file mode 100644
index 000000000..b1039fa40
--- /dev/null
+++ b/data/maps/NavelRock_BasePath_B9F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_BasePath_B9F_MapScripts:: @ 81651FE
+	.byte 0
diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json
new file mode 100644
index 000000000..8660ec6af
--- /dev/null
+++ b/data/maps/NavelRock_Exterior/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_EXTERIOR",
+  "name": "NavelRock_Exterior",
+  "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc
new file mode 100644
index 000000000..26ef2885c
--- /dev/null
+++ b/data/maps/NavelRock_Exterior/scripts.inc
@@ -0,0 +1,7 @@
+NavelRock_Exterior_MapScripts:: @ 81646AE
+	map_script 3, NavelRock_Exterior_MapScript1_1646B4
+	.byte 0
+
+NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4
+	setworldmapflag FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR
+	end
diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json
new file mode 100644
index 000000000..55dc110b9
--- /dev/null
+++ b/data/maps/NavelRock_Fork/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_NAVEL_ROCK_FORK",
+  "name": "NavelRock_Fork",
+  "layout": "LAYOUT_NAVEL_ROCK_FORK",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 95,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 26,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_Fork/scripts.inc b/data/maps/NavelRock_Fork/scripts.inc
new file mode 100644
index 000000000..5a98404f8
--- /dev/null
+++ b/data/maps/NavelRock_Fork/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_Fork_MapScripts:: @ 8165202
+	.byte 0
diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json
new file mode 100644
index 000000000..1cd74326e
--- /dev/null
+++ b/data/maps/NavelRock_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_NAVEL_ROCK_HARBOR",
+  "name": "NavelRock_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "NavelRock_Harbor_EventScript_165421",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_EXTERIOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc
new file mode 100644
index 000000000..6e630ca01
--- /dev/null
+++ b/data/maps/NavelRock_Harbor/scripts.inc
@@ -0,0 +1 @@
+@	.include "data/maps/NavelRock_Harbor/scripts.inc"
diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json
new file mode 100644
index 000000000..84bb51d62
--- /dev/null
+++ b/data/maps/NavelRock_Summit/map.json
@@ -0,0 +1,61 @@
+{
+  "id": "MAP_NAVEL_ROCK_SUMMIT",
+  "name": "NavelRock_Summit",
+  "layout": "LAYOUT_NAVEL_ROCK_SUMMIT",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_CLOUDY",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "145",
+      "x": 9,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "156"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "NavelRock_Summit_EventScript_164FFB"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_SACRED_ASH",
+      "flag": "160",
+      "unknown": 129
+    }
+  ]
+}
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
new file mode 100644
index 000000000..cb82149e8
--- /dev/null
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -0,0 +1,130 @@
+NavelRock_Summit_MapScripts:: @ 8164F9F
+	map_script 3, NavelRock_Summit_MapScript1_164FAA
+	map_script 5, NavelRock_Summit_MapScript2_164FDD
+	.byte 0
+
+NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA
+	checkflag FLAG_0x2F3
+	call_if 1, EventScript_164FBD
+	checkflag FLAG_0x2F3
+	call_if 0, EventScript_164FC6
+	end
+
+EventScript_164FBD:: @ 8164FBD
+	setvar VAR_0x4001, 1
+	setflag FLAG_0x09C
+	return
+
+EventScript_164FC6:: @ 8164FC6
+	setvar VAR_0x4001, 1
+	checkflag FLAG_0x2F6
+	goto_if_eq EventScript_1A77A9
+	setvar VAR_0x4001, 0
+	clearflag FLAG_0x09C
+	return
+
+NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD
+	checkflag FLAG_0x807
+	call_if 1, EventScript_164FE7
+	end
+
+EventScript_164FE7:: @ 8164FE7
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 7
+	goto_if 5, EventScript_1A77A9
+	removeobject 1
+	return
+
+NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lockall
+	setvar VAR_0x4001, 1
+	special SpawnScriptFieldObject
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 35
+	special sub_80CD1B4
+	applymovement 1, Movement_1650E0
+	applymovement 127, Movement_1650CD
+	waitmovement 0
+	delay 50
+	setweather 0
+	doweather
+	waitse
+	playmoncry SPECIES_HO_OH, 2
+	delay 30
+	waitmoncry
+	delay 60
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 35
+	special sub_80CD1B4
+	applymovement 127, Movement_1650D1
+	applymovement 1, Movement_1650D7
+	waitmovement 0
+	special RemoveScriptFieldObject
+	setvar VAR_0x8004, SPECIES_HO_OH
+	setvar VAR_0x8005, 70
+	setvar VAR_0x8006, 0
+	special sub_8044838
+	setflag FLAG_0x807
+	special sub_807F9D8
+	waitstate
+	clearflag FLAG_0x807
+	setvar VAR_LAST_TALKED, 1
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1650B4
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_1650C2
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_1650C2
+	setflag FLAG_0x2F3
+	releaseall
+	end
+
+EventScript_1650B4:: @ 81650B4
+	setflag FLAG_0x2F6
+	setvar VAR_0x8004, SPECIES_HO_OH
+	goto EventScript_1A9236
+	end
+
+EventScript_1650C2:: @ 81650C2
+	setvar VAR_0x8004, SPECIES_HO_OH
+	goto EventScript_1A9236
+	end
+
+Movement_1650CD:: @ 81650CD
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_1650D1:: @ 81650D1
+	step_1c
+	step_1c
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_1650D7:: @ 81650D7
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_25
+	step_1c
+	step_1c
+	step_end
+
+Movement_1650E0:: @ 81650E0
+	step_1c
+	step_1c
+	step_25
+	step_25
+	step_25
+	step_25
+	step_end
diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json
new file mode 100644
index 000000000..5ed9016d8
--- /dev/null
+++ b/data/maps/NavelRock_SummitPath_2F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F",
+  "name": "NavelRock_SummitPath_2F",
+  "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_FORK",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_SummitPath_2F/scripts.inc b/data/maps/NavelRock_SummitPath_2F/scripts.inc
new file mode 100644
index 000000000..c37b5a750
--- /dev/null
+++ b/data/maps/NavelRock_SummitPath_2F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_SummitPath_2F_MapScripts:: @ 81651F2
+	.byte 0
diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json
new file mode 100644
index 000000000..02873fa1a
--- /dev/null
+++ b/data/maps/NavelRock_SummitPath_3F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F",
+  "name": "NavelRock_SummitPath_3F",
+  "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_SummitPath_3F/scripts.inc b/data/maps/NavelRock_SummitPath_3F/scripts.inc
new file mode 100644
index 000000000..f98f50cb3
--- /dev/null
+++ b/data/maps/NavelRock_SummitPath_3F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_SummitPath_3F_MapScripts:: @ 81651F3
+	.byte 0
diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json
new file mode 100644
index 000000000..cb655601a
--- /dev/null
+++ b/data/maps/NavelRock_SummitPath_4F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F",
+  "name": "NavelRock_SummitPath_4F",
+  "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_SummitPath_4F/scripts.inc b/data/maps/NavelRock_SummitPath_4F/scripts.inc
new file mode 100644
index 000000000..8cc10b870
--- /dev/null
+++ b/data/maps/NavelRock_SummitPath_4F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_SummitPath_4F_MapScripts:: @ 81651F4
+	.byte 0
diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json
new file mode 100644
index 000000000..4ff37dd34
--- /dev/null
+++ b/data/maps/NavelRock_SummitPath_5F/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F",
+  "name": "NavelRock_SummitPath_5F",
+  "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_SUMMIT",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/NavelRock_SummitPath_5F/scripts.inc b/data/maps/NavelRock_SummitPath_5F/scripts.inc
new file mode 100644
index 000000000..e159cf2e6
--- /dev/null
+++ b/data/maps/NavelRock_SummitPath_5F/scripts.inc
@@ -0,0 +1,2 @@
+NavelRock_SummitPath_5F_MapScripts:: @ 81651F5
+	.byte 0
diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json
new file mode 100644
index 000000000..3a1bc3f42
--- /dev/null
+++ b/data/maps/OneIsland/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_ONE_ISLAND",
+  "name": "OneIsland",
+  "layout": "LAYOUT_ONE_ISLAND",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_ONE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ONE_ISLAND_TREASURE_BEACH",
+      "offset": 0,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ONE_ISLAND_KINDLE_ROAD",
+      "offset": -120,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "73",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "113"
+    },
+    {
+      "graphics_id": "32",
+      "x": 16,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_EventScript_167517",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 13,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_EventScript_167549",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_ONE_ISLAND_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_ONE_ISLAND_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 13,
+      "elevation": 0,
+      "script": "OneIsland_EventScript_167552"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 6,
+      "elevation": 0,
+      "script": "OneIsland_EventScript_16755B"
+    }
+  ]
+}
diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc
new file mode 100644
index 000000000..540980a3e
--- /dev/null
+++ b/data/maps/OneIsland/scripts.inc
@@ -0,0 +1,114 @@
+OneIsland_MapScripts:: @ 8167484
+	map_script 3, OneIsland_MapScript1_16748F
+	map_script 2, OneIsland_MapScript2_167493
+	.byte 0
+
+OneIsland_MapScript1_16748F:: @ 816748F
+	setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND
+	end
+
+OneIsland_MapScript2_167493:: @ 8167493
+	map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D
+	.2byte 0
+
+EventScript_16749D:: @ 816749D
+	lockall
+	textcolor 0
+	applymovement 255, Movement_167505
+	waitmovement 0
+	msgbox gUnknown_818161B
+	closemessage
+	applymovement 1, Movement_167507
+	applymovement 255, Movement_1674F4
+	waitmovement 0
+	opendoor 14, 5
+	waitdooranim
+	applymovement 1, Movement_167514
+	applymovement 255, Movement_167501
+	waitmovement 0
+	closedoor 14, 5
+	waitdooranim
+	removeobject 1
+	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3
+	warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9
+	waitstate
+	releaseall
+	end
+
+Movement_1674F4:: @ 81674F4
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_13
+	step_13
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_167501:: @ 8167501
+	step_11
+	step_11
+	step_60
+	step_end
+
+Movement_167505:: @ 8167505
+	step_11
+	step_end
+
+Movement_167507:: @ 8167507
+	step_11
+	step_11
+	step_11
+	step_11
+	step_13
+	step_13
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_167514:: @ 8167514
+	step_11
+	step_60
+	step_end
+
+OneIsland_EventScript_167517:: @ 8167517
+	lock
+	faceplayer
+	checkflag FLAG_0x844
+	goto_if_eq EventScript_16753F
+	checkflag FLAG_0x2A1
+	goto_if_eq EventScript_167535
+	msgbox gUnknown_818174E
+	release
+	end
+
+EventScript_167535:: @ 8167535
+	msgbox gUnknown_8181858
+	release
+	end
+
+EventScript_16753F:: @ 816753F
+	msgbox gUnknown_8181901
+	release
+	end
+
+OneIsland_EventScript_167549:: @ 8167549
+	msgbox gUnknown_8181A4A, 2
+	end
+
+OneIsland_EventScript_167552:: @ 8167552
+	msgbox gUnknown_81819E1, 3
+	end
+
+OneIsland_EventScript_16755B:: @ 816755B
+	msgbox gUnknown_8181A0A, 3
+	end
diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc
new file mode 100644
index 000000000..f3777a036
--- /dev/null
+++ b/data/maps/OneIsland/text.inc
@@ -0,0 +1,70 @@
+Text_181569:: @ 8181569
+    .string "This FAN CLUB…\n"
+    .string "No one here has a clue!\p"
+    .string "How could they not recognize\n"
+    .string "the brilliance that is LANCE?\p"
+    .string "He stands for justice!\n"
+    .string "He's cool, and yet passionate!\l"
+    .string "He's the greatest, LANCE!$"
+
+gUnknown_818161B:: @ 818161B
+    .string "BILL: Here we are!\n"
+    .string "This is ONE ISLAND.\p"
+    .string "There are several islands around\n"
+    .string "here, and this is one of them.\p"
+    .string "My friend CELIO sent the boat to\n"
+    .string "fetch me here.\p"
+    .string "He's in charge of the island's PC\n"
+    .string "network by his lonesome.\p"
+    .string "…Why am I telling you this now?\n"
+    .string "Let's just go see CELIO!$"
+
+Text_181726:: @ 8181726
+    .string "Ahoy, there!\n"
+    .string "Where do you want to sail?$"
+
+gUnknown_818174E:: @ 818174E
+    .string "Here we are on an island smack in\n"
+    .string "the middle of nowhere.\p"
+    .string "We're lucky to have an upstanding\n"
+    .string "young man like CELIO here.\p"
+    .string "My granddaughter was in a tizzy\n"
+    .string "over CELIO's friend.\p"
+    .string "Something about a famous\n"
+    .string "POKéMANIAC?\p"
+    .string "I'm not sure what that means, but\n"
+    .string "CELIO is quite the man!$"
+
+gUnknown_8181858:: @ 8181858
+    .string "My granddaughter was in a tizzy\n"
+    .string "over a new breakthrough.\p"
+    .string "She said we now have PC linkage\n"
+    .string "with people in KANTO.\p"
+    .string "I'm not sure what that means, but\n"
+    .string "CELIO is quite the man!$"
+
+gUnknown_8181901:: @ 8181901
+    .string "My granddaughter was in a tizzy\n"
+    .string "over a new breakthrough.\p"
+    .string "She said we finally have PC linkage\n"
+    .string "with people in HOENN.\p"
+    .string "I'm not sure what that means, but\n"
+    .string "CELIO is quite the man.\p"
+    .string "He would make a fine husband for\n"
+    .string "my granddaughter!$"
+
+gUnknown_81819E1:: @ 81819E1
+    .string "ONE ISLAND\n"
+    .string "Friends Gather at Knot Island$"
+
+gUnknown_8181A0A:: @ 8181A0A
+    .string "Expanding the POKéMON World!\n"
+    .string "POKéMON NET CENTER$"
+
+Text_181A3A:: @ 8181A3A
+    .string "グレンタウンに　もどりますか？$"
+
+gUnknown_8181A4A:: @ 8181A4A
+    .string "Hi, sight-seeing, are you?\n"
+    .string "Isn't the warm climate here great?$"
+
diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json
new file mode 100644
index 000000000..553c9156a
--- /dev/null
+++ b/data/maps/OneIsland_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_ONE_ISLAND_HARBOR",
+  "name": "OneIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_ONE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_Harbor_EventScript_1713BD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..44c18ff60
--- /dev/null
+++ b/data/maps/OneIsland_Harbor/scripts.inc
@@ -0,0 +1,42 @@
+OneIsland_Harbor_MapScripts:: @ 8171378
+	map_script 4, OneIsland_Harbor_MapScript1_171383
+	map_script 2, OneIsland_Harbor_MapScript2_171392
+	.byte 0
+
+OneIsland_Harbor_MapScript1_171383:: @ 8171383
+	map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17138D
+	.2byte 0
+
+EventScript_17138D:: @ 817138D
+	turnobject 255, 2
+	end
+
+OneIsland_Harbor_MapScript2_171392:: @ 8171392
+	map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17139C
+	.2byte 0
+
+EventScript_17139C:: @ 817139C
+	lockall
+	textcolor 0
+	applymovement 255, Movement_1713B9
+	waitmovement 0
+	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2
+	warp MAP_ONE_ISLAND, 255, 12, 18
+	waitstate
+	releaseall
+	end
+
+Movement_1713B9:: @ 81713B9
+	step_11
+	step_11
+	step_11
+	step_end
+
+OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 1
+	goto EventScript_1A8EC5
+	end
diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json
new file mode 100644
index 000000000..17900e786
--- /dev/null
+++ b/data/maps/OneIsland_House1/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_ONE_ISLAND_HOUSE1",
+  "name": "OneIsland_House1",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_ONE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_House1_EventScript_17135C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "35",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_House1_EventScript_171365",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc
new file mode 100644
index 000000000..957dcada9
--- /dev/null
+++ b/data/maps/OneIsland_House1/scripts.inc
@@ -0,0 +1,10 @@
+OneIsland_House1_MapScripts:: @ 817135B
+	.byte 0
+
+OneIsland_House1_EventScript_17135C:: @ 817135C
+	msgbox gUnknown_81A2332, 2
+	end
+
+OneIsland_House1_EventScript_171365:: @ 8171365
+	msgbox gUnknown_81A2380, 2
+	end
diff --git a/data/maps/OneIsland_House1/text.inc b/data/maps/OneIsland_House1/text.inc
new file mode 100644
index 000000000..a050b31b0
--- /dev/null
+++ b/data/maps/OneIsland_House1/text.inc
@@ -0,0 +1,9 @@
+gUnknown_81A2332:: @ 81A2332
+    .string "On sunny days, I step out and gaze\n"
+    .string "upon the volcano.\p"
+    .string "That's my daily routine.$"
+
+gUnknown_81A2380:: @ 81A2380
+    .string "Let me think… When was the last\n"
+    .string "time MT. EMBER erupted?$"
+
diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json
new file mode 100644
index 000000000..2eb71606a
--- /dev/null
+++ b/data/maps/OneIsland_House2/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_ONE_ISLAND_HOUSE2",
+  "name": "OneIsland_House2",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_ONE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_House2_EventScript_17136F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc
new file mode 100644
index 000000000..9966217cd
--- /dev/null
+++ b/data/maps/OneIsland_House2/scripts.inc
@@ -0,0 +1,6 @@
+OneIsland_House2_MapScripts:: @ 817136E
+	.byte 0
+
+OneIsland_House2_EventScript_17136F:: @ 817136F
+	msgbox gUnknown_81A23B8, 2
+	end
diff --git a/data/maps/OneIsland_House2/text.inc b/data/maps/OneIsland_House2/text.inc
new file mode 100644
index 000000000..c147325c1
--- /dev/null
+++ b/data/maps/OneIsland_House2/text.inc
@@ -0,0 +1,5 @@
+gUnknown_81A23B8:: @ 81A23B8
+    .string "Young people all want to go off to\n"
+    .string "big cities.\p"
+    .string "But I want to stay here forever!$"
+
diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json
new file mode 100644
index 000000000..b14e36b13
--- /dev/null
+++ b/data/maps/OneIsland_KindleRoad/map.json
@@ -0,0 +1,440 @@
+{
+  "id": "MAP_ONE_ISLAND_KINDLE_ROAD",
+  "name": "OneIsland_KindleRoad",
+  "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_KINDLE_ROAD",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ONE_ISLAND",
+      "offset": 120,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "44",
+      "x": 11,
+      "y": 32,
+      "elevation": 1,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "OneIsland_KindleRoad_EventScript_1ABBF1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "46",
+      "x": 17,
+      "y": 132,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "OneIsland_KindleRoad_EventScript_1ABC2F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 7,
+      "y": 39,
+      "elevation": 1,
+      "movement_type": "52",
+      "movement_range_x": 6,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABC6D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "45",
+      "x": 19,
+      "y": 79,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABCAB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 15,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1ABCE9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "24",
+      "x": 9,
+      "y": 53,
+      "elevation": 3,
+      "movement_type": "26",
+      "movement_range_x": 1,
+      "movement_range_y": 7,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABD27",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "24",
+      "x": 18,
+      "y": 105,
+      "elevation": 4,
+      "movement_type": "50",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABD65",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 16,
+      "y": 64,
+      "elevation": 3,
+      "movement_type": "27",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABDA3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 11,
+      "y": 64,
+      "elevation": 3,
+      "movement_type": "28",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABDE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 11,
+      "y": 89,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "OneIsland_KindleRoad_EventScript_1ABE1F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 9,
+      "y": 108,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABE5D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 8,
+      "y": 68,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABEE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "24",
+      "x": 9,
+      "y": 68,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_KindleRoad_EventScript_1ABE9B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 8,
+      "y": 104,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 11,
+      "y": 95,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 12,
+      "y": 96,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 10,
+      "y": 95,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "96",
+      "x": 9,
+      "y": 105,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "24"
+    },
+    {
+      "graphics_id": "96",
+      "x": 15,
+      "y": 75,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "25"
+    },
+    {
+      "graphics_id": "96",
+      "x": 9,
+      "y": 84,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "26"
+    },
+    {
+      "graphics_id": "96",
+      "x": 15,
+      "y": 74,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "27"
+    },
+    {
+      "graphics_id": "96",
+      "x": 15,
+      "y": 73,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "28"
+    },
+    {
+      "graphics_id": "96",
+      "x": 18,
+      "y": 111,
+      "elevation": 4,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "29"
+    },
+    {
+      "graphics_id": "96",
+      "x": 10,
+      "y": 86,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "30"
+    },
+    {
+      "graphics_id": "96",
+      "x": 9,
+      "y": 110,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "31"
+    },
+    {
+      "graphics_id": "96",
+      "x": 18,
+      "y": 112,
+      "elevation": 4,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BE00C",
+      "flag": "17"
+    },
+    {
+      "graphics_id": "92",
+      "x": 15,
+      "y": 70,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BEC42",
+      "flag": "475"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 103,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BEC4F",
+      "flag": "476"
+    },
+    {
+      "graphics_id": "92",
+      "x": 18,
+      "y": 114,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EventScript_1BEC5C",
+      "flag": "477"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_EXTERIOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_MT_EMBER_EXTERIOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 58,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 59,
+      "elevation": 0,
+      "script": "OneIsland_KindleRoad_EventScript_168762"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 115,
+      "elevation": 0,
+      "script": "OneIsland_KindleRoad_EventScript_168759"
+    }
+  ]
+}
diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc
new file mode 100644
index 000000000..78c2efb13
--- /dev/null
+++ b/data/maps/OneIsland_KindleRoad/scripts.inc
@@ -0,0 +1,10 @@
+OneIsland_KindleRoad_MapScripts:: @ 8168758
+	.byte 0
+
+OneIsland_KindleRoad_EventScript_168759:: @ 8168759
+	msgbox gUnknown_8189D02, 3
+	end
+
+OneIsland_KindleRoad_EventScript_168762:: @ 8168762
+	msgbox gUnknown_8189D32, 3
+	end
diff --git a/data/maps/OneIsland_KindleRoad/text.inc b/data/maps/OneIsland_KindleRoad/text.inc
new file mode 100644
index 000000000..93537a5f3
--- /dev/null
+++ b/data/maps/OneIsland_KindleRoad/text.inc
@@ -0,0 +1,164 @@
+Text_18961F:: @ 818961F
+    .string "The weather's gorgeous!\n"
+    .string "Perfect for a battle!$"
+
+Text_18964D:: @ 818964D
+    .string "Aiyeeeeh!$"
+
+Text_189657:: @ 8189657
+    .string "Please don't splash my face!\n"
+    .string "You'll ruin the makeup.$"
+
+Text_18968C:: @ 818968C
+    .string "I'm beginning to get a sunburn…$"
+
+Text_1896AC:: @ 81896AC
+    .string "Oh, you're so awful.$"
+
+Text_1896C1:: @ 81896C1
+    .string "I like that cap you have.\n"
+    .string "Maybe I should wear one, too…$"
+
+Text_1896F9:: @ 81896F9
+    .string "Seen from here, MT. EMBER towers\n"
+    .string "into the sky.$"
+
+Text_189728:: @ 8189728
+    .string "Well, aren't you tough?$"
+
+Text_189740:: @ 8189740
+    .string "The sky is immense around these\n"
+    .string "parts.$"
+
+Text_189767:: @ 8189767
+    .string "I took a break from swimming,\n"
+    .string "only to have you challenge me?$"
+
+Text_1897A4:: @ 81897A4
+    .string "Hey, what the…\n"
+    .string "You're good, you!$"
+
+Text_1897C5:: @ 81897C5
+    .string "Instead of using SURF all the time,\n"
+    .string "you should swim some.$"
+
+Text_1897FF:: @ 81897FF
+    .string "Wait! Wait a second!\n"
+    .string "I think I've hooked a big one!$"
+
+Text_189833:: @ 8189833
+    .string "I've lost it all again…$"
+
+Text_18984B:: @ 818984B
+    .string "Not only did I lose, the big one\n"
+    .string "got away from me, too!$"
+
+Text_189883:: @ 8189883
+    .string "Could you help me out with my\n"
+    .string "training?$"
+
+Text_1898AB:: @ 81898AB
+    .string "You were a cut above me.$"
+
+Text_1898C4:: @ 81898C4
+    .string "It's clear that you're skilled.\n"
+    .string "I like you!$"
+
+Text_1898F0:: @ 81898F0
+    .string "There isn't a day in which we don't\n"
+    .string "train!$"
+
+Text_18991B:: @ 818991B
+    .string "I'm such a fool!$"
+
+Text_18992C:: @ 818992C
+    .string "I'll train even harder from now on!$"
+
+Text_189950:: @ 8189950
+    .string "Every morning, before breakfast,\n"
+    .string "I swim around this island.$"
+
+Text_18998C:: @ 818998C
+    .string "Gasp…\n"
+    .string "Gasp…$"
+
+Text_189998:: @ 8189998
+    .string "I lost because I'm pooped from all\n"
+    .string "the running I did…$"
+
+Text_1899CE:: @ 81899CE
+    .string "Dress appropriately for battle!\n"
+    .string "Lose that frivolous outfit!$"
+
+Text_189A0A:: @ 8189A0A
+    .string "Why me?!$"
+
+Text_189A13:: @ 8189A13
+    .string "Even martial artists are becoming\n"
+    .string "fashion conscious these days…$"
+
+Text_189A53:: @ 8189A53
+    .string "You know, everything tastes great\n"
+    .string "when you're out in the wild.$"
+
+Text_189A92:: @ 8189A92
+    .string "Awww, blown!$"
+
+Text_189A9F:: @ 8189A9F
+    .string "The water in volcanic regions is\n"
+    .string "delicious.$"
+
+Text_189ACB:: @ 8189ACB
+    .string "My lunch filled us up, so will you\n"
+    .string "battle us for some exercise?$"
+
+Text_189B0B:: @ 8189B0B
+    .string "That made me all sweaty.$"
+
+Text_189B24:: @ 8189B24
+    .string "What should I do?\n"
+    .string "I feel famished again.$"
+
+Text_189B4D:: @ 8189B4D
+    .string "KIA: My big brother and I make\n"
+    .string "an awesome combination!$"
+
+Text_189B84:: @ 8189B84
+    .string "KIA: Huh?!\n"
+    .string "I can't believe it!$"
+
+Text_189BA3:: @ 8189BA3
+    .string "KIA: How could there be anyone\n"
+    .string "better than my big brother?$"
+
+Text_189BDE:: @ 8189BDE
+    .string "KIA: If you want to battle with\n"
+    .string "us, you have to bring at least two\l"
+    .string "POKéMON with you.$"
+
+Text_189C33:: @ 8189C33
+    .string "MIK: Together with KIA, I'm afraid\n"
+    .string "of nothing!$"
+
+Text_189C62:: @ 8189C62
+    .string "MIK: Whoa!\n"
+    .string "That's too much!$"
+
+Text_189C7E:: @ 8189C7E
+    .string "MIK: How could my combination\n"
+    .string "with KIA fail?$"
+
+Text_189CAB:: @ 8189CAB
+    .string "MIK: Hey, do you want to battle\n"
+    .string "with us two?\p"
+    .string "Bring two or more POKéMON with\n"
+    .string "you, then.$"
+
+gUnknown_8189D02:: @ 8189D02
+    .string "This is KINDLE ROAD.\p"
+    .string "Go straight for MT. EMBER.$"
+
+gUnknown_8189D32:: @ 8189D32
+    .string "Light the Fire in Your Heart!\n"
+    .string "EMBER SPA$"
+
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
new file mode 100644
index 000000000..1fc1d1cc4
--- /dev/null
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
@@ -0,0 +1,116 @@
+{
+  "id": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA",
+  "name": "OneIsland_KindleRoad_EmberSpa",
+  "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_EMBER_SPA",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 11,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16535C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 15,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165365",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "35",
+      "x": 20,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165377",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165399",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 11,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16536E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 36,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "OneIsland_KindleRoad_EmberSpa_EventScript_1653CF"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
new file mode 100644
index 000000000..fbb4fb622
--- /dev/null
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
@@ -0,0 +1,55 @@
+OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B
+	.byte 0
+
+OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C
+	msgbox gUnknown_817D34A, 2
+	end
+
+OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365
+	msgbox gUnknown_817D3DE, 2
+	end
+
+OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E
+	msgbox gUnknown_817D4AA, 2
+	end
+
+OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377
+	msgbox gUnknown_817D4E3, 2
+	end
+
+OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380
+	lock
+	faceplayer
+	setvar VAR_0x8004, 10
+	setvar VAR_0x8005, 3
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817D550
+	release
+	end
+
+OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399
+	lock
+	faceplayer
+	checkflag FLAG_0x2EF
+	goto_if_eq EventScript_1653C5
+	msgbox gUnknown_817D622
+	giveitem ITEM_HM06
+	setflag FLAG_0x2EF
+	msgbox gUnknown_817D6F3
+	release
+	end
+
+EventScript_1653C5:: @ 81653C5
+	msgbox gUnknown_817D6F3
+	release
+	end
+
+OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF
+	lockall
+	fadescreen 3
+	special sp000_heal_pokemon
+	fadescreen 2
+	msgbox gUnknown_817D450
+	setvar VAR_0x4001, 1
+	releaseall
+	end
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc
new file mode 100644
index 000000000..ffc4fea83
--- /dev/null
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc
@@ -0,0 +1,54 @@
+gUnknown_817D34A:: @ 817D34A
+    .string "Hm!\n"
+    .string "Haaaaaaaaaaah!\p"
+    .string "Aaaah! This is heavenly!\n"
+    .string "The water warms me to my core!\p"
+    .string "You should jump in, too.\p"
+    .string "Go to the middle, relax, and get\n"
+    .string "good and warm!$"
+
+gUnknown_817D3DE:: @ 817D3DE
+    .string "My favorite part of bathing comes\n"
+    .string "up right after this.\p"
+    .string "I enjoy a bowl of chowder to\n"
+    .string "warm me from the inside, too!$"
+
+gUnknown_817D450:: @ 817D450
+    .string "The water is perfectly warm.\n"
+    .string "It feels exquisite…\p"
+    .string "{PLAYER} and the POKéMON were\n"
+    .string "fully refreshed!$"
+
+gUnknown_817D4AA:: @ 817D4AA
+    .string "Soaking in a hot spring pool is\n"
+    .string "therapeutic, people say.$"
+
+gUnknown_817D4E3:: @ 817D4E3
+    .string "Have a look at my face.\n"
+    .string "See how smooth my skin is?\p"
+    .string "The hot spring's water keeps my\n"
+    .string "skin younger than my age.$"
+
+gUnknown_817D550:: @ 817D550
+    .string "After an honest day of training,\n"
+    .string "nothing beats a relaxing soak in\l"
+    .string "the hot spring pool.\p"
+    .string "BRUNO, who's a senior ahead of me,\n"
+    .string "visits the SPA on occasion.\p"
+    .string "He comes to rehab injuries, both\n"
+    .string "his own and his POKéMON's.$"
+
+gUnknown_817D622:: @ 817D622
+    .string "Hot springs go hand-in-hand with\n"
+    .string "volcanoes.\p"
+    .string "The EMBER SPA here, well,\n"
+    .string "I made it years ago.\p"
+    .string "I hewed the pool right out of a\n"
+    .string "gigantic boulder by hand.\p"
+    .string "I was using this at the time.\n"
+    .string "I suppose I can part with it.$"
+
+gUnknown_817D6F3:: @ 817D6F3
+    .string "That shatters boulders as if they\n"
+    .string "were made of crackers.$"
+
diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..ae6597955
--- /dev/null
+++ b/data/maps/OneIsland_PokemonCenter_1F/map.json
@@ -0,0 +1,214 @@
+{
+  "id": "MAP_ONE_ISLAND_POKEMON_CENTER_1F",
+  "name": "OneIsland_PokemonCenter_1F",
+  "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_NETWORK_CENTER",
+  "region_map_section": "MAPSEC_ONE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_170E94",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "73",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_170E9D",
+      "flag": "114"
+    },
+    {
+      "graphics_id": "89",
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_170EC5",
+      "flag": "115"
+    },
+    {
+      "graphics_id": "16",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171148",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171151",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "24",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_17115A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 4,
+      "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F",
+      "var_value": 2,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_1711AA"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F",
+      "var_value": 2,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_1711B6"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F",
+      "var_value": 2,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_1711C2"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F",
+      "var_value": 2,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_1711CE"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 2,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 3,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 4,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 5,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 5,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 16,
+      "y": 5,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 17,
+      "y": 5,
+      "elevation": 0,
+      "script": "OneIsland_PokemonCenter_1F_EventScript_171179"
+    }
+  ]
+}
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..7a1941f72
--- /dev/null
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,596 @@
+OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8
+	map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E
+	map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C
+	map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D
+	map_script 2, OneIsland_PokemonCenter_1F_MapScript4_170CA7
+	.byte 0
+
+OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	call_if 4, EventScript_170C22
+	checkflag FLAG_0x844
+	call_if 1, EventScript_170C36
+	end
+
+EventScript_170C22:: @ 8170C22
+	setmetatile 13, 4, 861, 1
+	return
+
+EventScript_170C2C:: @ 8170C2C
+	setmetatile 16, 4, 863, 1
+	return
+
+EventScript_170C36:: @ 8170C36
+	call EventScript_170C2C
+	setmetatile 14, 4, 858, 1
+	setmetatile 15, 4, 859, 1
+	return
+
+OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E
+	setrespawn SPAWN_ONE_ISLAND
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
+	call_if 1, EventScript_170C73
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
+	call_if 1, EventScript_170C79
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
+	call_if 1, EventScript_170C90
+	end
+
+EventScript_170C73:: @ 8170C73
+	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
+	return
+
+EventScript_170C79:: @ 8170C79
+	setobjectxyperm 2, 9, 8
+	setobjectmovementtype 2, 7
+	setobjectxyperm 3, 15, 6
+	setobjectmovementtype 3, 7
+	return
+
+EventScript_170C90:: @ 8170C90
+	setobjectxyperm 2, 14, 7
+	setobjectmovementtype 2, 9
+	setobjectxyperm 3, 14, 8
+	setobjectmovementtype 3, 9
+	return
+
+OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7
+	map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1
+	.2byte 0
+
+EventScript_170CB1:: @ 8170CB1
+	lockall
+	textcolor 0
+	applymovement 255, Movement_170E7D
+	applymovement 2, Movement_170E86
+	waitmovement 0
+	msgbox gUnknown_81A0CDE
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	playse SE_PIN
+	applymovement 3, Movement_1A75DB
+	waitmovement 0
+	applymovement 3, Movement_1A75E7
+	waitmovement 0
+	applymovement 3, Movement_1A75DD
+	waitmovement 0
+	msgbox gUnknown_81A0CF7
+	msgbox gUnknown_81A0D27
+	applymovement 2, Movement_1A75ED
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	msgbox gUnknown_81A0D72
+	applymovement 2, Movement_1A75EB
+	waitmovement 0
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	checkflag FLAG_0x82C
+	call_if 1, EventScript_170E34
+	checkflag FLAG_0x82C
+	call_if 0, EventScript_170E3D
+	applymovement 3, Movement_1A75ED
+	waitmovement 0
+	msgbox gUnknown_81A0E17
+	msgbox gUnknown_81A0E90
+	applymovement 3, Movement_1A75E7
+	waitmovement 0
+	msgbox gUnknown_81A0ECC
+	closemessage
+	applymovement 2, Movement_1A75E9
+	waitmovement 0
+	msgbox gUnknown_81A0F40
+	applymovement 2, Movement_1A75ED
+	waitmovement 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	msgbox gUnknown_81A0FB1
+	giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, BGM_FRLG_ME_KEYITEM
+	additem ITEM_METEORITE, 1
+	applymovement 3, Movement_1A75ED
+	waitmovement 0
+	msgbox gUnknown_81A1113
+	additem ITEM_TRI_PASS, 1
+	giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, BGM_FRLG_ME_KEYITEM
+	msgbox gUnknown_81A1150
+	compare_var_to_value VAR_0x4058, 2
+	call_if 4, EventScript_170E46
+	compare_var_to_value VAR_0x4058, 2
+	call_if 0, EventScript_170E58
+	setflag FLAG_0x845
+	msgbox gUnknown_81A1230
+	closemessage
+	applymovement 2, Movement_1A75E9
+	waitmovement 0
+	applymovement 3, Movement_1A75E9
+	waitmovement 0
+	setflag FLAG_0x841
+	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
+	releaseall
+	end
+
+EventScript_170E34:: @ 8170E34
+	msgbox gUnknown_81A0DE8
+	return
+
+EventScript_170E3D:: @ 8170E3D
+	msgbox gUnknown_81A0DAC
+	return
+
+EventScript_170E46:: @ 8170E46
+	textcolor 3
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_1A11EC
+	waitmessage
+	waitfanfare
+	call EventScript_1A6675
+	return
+
+EventScript_170E58:: @ 8170E58
+	setflag FLAG_0x039
+	setvar VAR_0x4058, 2
+	additem ITEM_TOWN_MAP, 1
+	giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, BGM_FRLG_ME_KEYITEM
+	return
+
+Movement_170E7D:: @ 8170E7D
+	step_11
+	step_11
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2e
+	step_end
+
+Movement_170E86:: @ 8170E86
+	step_11
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_11
+	step_30
+	step_end
+
+Movement_170E8F:: @ 8170E8F
+	step_11
+	step_end
+
+Movement_170E91:: @ 8170E91
+	step_12
+	step_30
+	step_end
+
+OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
+	lock
+	checkflag FLAG_0x2A1
+	goto_if_eq EventScript_170EB1
+	msgbox gUnknown_81A1266
+	release
+	end
+
+EventScript_170EB1:: @ 8170EB1
+	applymovement 2, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81A128C
+	release
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
+	lock
+	faceplayer
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
+	goto_if_eq EventScript_170F35
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
+	goto_if_eq EventScript_170F9B
+	checkflag FLAG_0x2DC
+	goto_if_eq EventScript_170FA5
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	goto_if_eq EventScript_17103A
+	checkflag FLAG_0x2DD
+	goto_if_eq EventScript_171044
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	goto_if_eq EventScript_1710F2
+	specialvar VAR_RESULT, sub_806E25C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1710FC
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
+	goto_if_eq EventScript_171134
+	msgbox gUnknown_81A1321
+	closemessage
+	applymovement 3, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_170F35:: @ 8170F35
+	msgbox gUnknown_81A1EBD
+	random 3
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_170F6D
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_170F84
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 5
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_81A2076
+	release
+	end
+
+EventScript_170F6D:: @ 8170F6D
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 3
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_81A1EF3
+	release
+	end
+
+EventScript_170F84:: @ 8170F84
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_81A1F7C
+	release
+	end
+
+EventScript_170F9B:: @ 8170F9B
+	msgbox gUnknown_81A1E39
+	release
+	end
+
+EventScript_170FA5:: @ 8170FA5
+	textcolor 3
+	playfanfare MUS_ME_WAZA
+	message Text_1A1C2D
+	waitmessage
+	waitfanfare
+	call EventScript_1A6675
+	removeitem ITEM_SAPPHIRE, 1
+	msgbox gUnknown_81A1C4E
+	closemessage
+	applymovement 3, Movement_171142
+	waitmovement 0
+	playse SE_N
+	call EventScript_170C2C
+	special DrawWholeMapView
+	msgbox gUnknown_81A1D45
+	closemessage
+	delay 60
+	applymovement 3, Movement_17113E
+	waitmovement 0
+	delay 30
+	applymovement 3, Movement_17113E
+	waitmovement 0
+	delay 40
+	playse SE_PC_ON
+	call EventScript_170C36
+	special DrawWholeMapView
+	msgbox gUnknown_81A1D59
+	applymovement 3, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81A1D7D
+	special sub_810B82C
+	setflag FLAG_0x844
+	setflag FLAG_0x05C
+	setflag FLAG_0x08C
+	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
+	special InitRoamer
+	release
+	end
+
+EventScript_17103A:: @ 817103A
+	msgbox gUnknown_81A1BB7
+	release
+	end
+
+EventScript_171044:: @ 8171044
+	msgbox gUnknown_81A197E
+	textcolor 3
+	playfanfare MUS_ME_WAZA
+	message Text_1A198D
+	waitmessage
+	waitfanfare
+	call EventScript_1A6675
+	closemessage
+	applymovement 3, Movement_171142
+	waitmovement 0
+	playse SE_N
+	call EventScript_170C22
+	special DrawWholeMapView
+	delay 30
+	applymovement 3, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81A19AA, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_171099
+	goto EventScript_1710B2
+	end
+
+EventScript_171099:: @ 8171099
+	msgbox gUnknown_81A1A08, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_171099
+	goto EventScript_1710B2
+	end
+
+EventScript_1710B2:: @ 81710B2
+	msgbox gUnknown_81A1A3F
+	removeitem ITEM_RUBY, 1
+	removeitem ITEM_TRI_PASS, 1
+	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	additem ITEM_RAINBOW_PASS, 1
+	setflag FLAG_0x846
+	textcolor 3
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_1A1B56
+	waitmessage
+	waitfanfare
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_1A1B8E
+	waitmessage
+	waitfanfare
+	call EventScript_1A6675
+	goto EventScript_17103A
+	end
+
+EventScript_1710F2:: @ 81710F2
+	msgbox gUnknown_81A1896
+	release
+	end
+
+EventScript_1710FC:: @ 81710FC
+	msgbox gUnknown_81A169B
+	applymovement 3, Movement_1A75E9
+	waitmovement 0
+	msgbox gUnknown_81A1723
+	applymovement 3, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81A17DF
+	setvar VAR_0x407F, 1
+	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
+	release
+	end
+
+EventScript_171134:: @ 8171134
+	msgbox gUnknown_81A15EC
+	release
+	end
+
+Movement_17113E:: @ 817113E
+	step_26
+	step_1b
+	step_26
+	step_end
+
+Movement_171142:: @ 8171142
+	step_2e
+	step_26
+	step_1c
+	step_26
+	step_26
+	step_end
+
+OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148
+	msgbox gUnknown_81A20D5, 2
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151
+	msgbox gUnknown_81A212D, 2
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
+	lock
+	faceplayer
+	checkflag FLAG_0x844
+	goto_if_eq EventScript_17116F
+	msgbox gUnknown_81A218D
+	release
+	end
+
+EventScript_17116F:: @ 817116F
+	msgbox gUnknown_81A21D0
+	release
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
+	lockall
+	checkflag FLAG_0x844
+	goto_if_eq EventScript_1711A0
+	checkflag FLAG_0x2A1
+	goto_if_eq EventScript_171196
+	msgbox gUnknown_81A223F
+	releaseall
+	end
+
+EventScript_171196:: @ 8171196
+	msgbox gUnknown_81A2286
+	releaseall
+	end
+
+EventScript_1711A0:: @ 81711A0
+	msgbox gUnknown_81A22CB
+	releaseall
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_1711DA
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6
+	lockall
+	setvar VAR_0x4001, 2
+	goto EventScript_1711DA
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2
+	lockall
+	setvar VAR_0x4001, 3
+	goto EventScript_1711DA
+	end
+
+OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE
+	lockall
+	setvar VAR_0x4001, 4
+	goto EventScript_1711DA
+	end
+
+EventScript_1711DA:: @ 81711DA
+	textcolor 0
+	playse SE_PIN
+	applymovement 2, Movement_1A75DB
+	waitmovement 0
+	msgbox gUnknown_81A13B8
+	closemessage
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_1712E4
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1712EF
+	compare_var_to_value VAR_0x4001, 3
+	call_if 1, EventScript_1712FA
+	compare_var_to_value VAR_0x4001, 4
+	call_if 1, EventScript_171305
+	delay 10
+	msgbox gUnknown_81A13CB
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	msgbox gUnknown_81A1431
+	applymovement 2, Movement_1A75ED
+	waitmovement 0
+	applymovement 3, Movement_1A75E9
+	waitmovement 0
+	msgbox gUnknown_81A1470
+	msgbox gUnknown_81A14E1
+	closemessage
+	applymovement 2, Movement_1A75E7
+	waitmovement 0
+	delay 10
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	delay 15
+	msgbox gUnknown_81A14FB
+	closemessage
+	applymovement 2, Movement_1A75ED
+	waitmovement 0
+	delay 15
+	applymovement 3, Movement_1A75E7
+	waitmovement 0
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	msgbox gUnknown_81A1574
+	closemessage
+	delay 25
+	applymovement 255, Movement_171326
+	applymovement 2, Movement_17132D
+	waitmovement 0
+	playse SE_KAIDAN
+	setflag FLAG_0x072
+	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
+	clearflag FLAG_0x062
+	setvar VAR_0x4071, 3
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8006, 8
+	goto EventScript_1A90DA
+	end
+
+EventScript_1712E4:: @ 81712E4
+	applymovement 255, Movement_171310
+	waitmovement 0
+	return
+
+EventScript_1712EF:: @ 81712EF
+	applymovement 255, Movement_171314
+	waitmovement 0
+	return
+
+EventScript_1712FA:: @ 81712FA
+	applymovement 255, Movement_171316
+	waitmovement 0
+	return
+
+EventScript_171305:: @ 8171305
+	applymovement 255, Movement_17131A
+	waitmovement 0
+	return
+
+Movement_171310:: @ 8171310
+	step_13
+	step_10
+	step_30
+	step_end
+
+Movement_171314:: @ 8171314
+	step_13
+	step_end
+
+Movement_171316:: @ 8171316
+	step_13
+	step_11
+	step_30
+	step_end
+
+Movement_17131A:: @ 817131A
+	step_13
+	step_11
+	step_11
+	step_30
+	step_end
+
+Movement_17131F:: @ 817131F
+	step_1c
+	step_1c
+	step_1a
+	step_2f
+	step_end
+
+Movement_171324:: @ 8171324
+	step_29
+	step_end
+
+Movement_171326:: @ 8171326
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+Movement_17132D:: @ 817132D
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_end
diff --git a/data/maps/OneIsland_PokemonCenter_1F/text.inc b/data/maps/OneIsland_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..3e9e5b521
--- /dev/null
+++ b/data/maps/OneIsland_PokemonCenter_1F/text.inc
@@ -0,0 +1,357 @@
+gUnknown_81A0CDE:: @ 81A0CDE
+    .string "BILL: Hey, there!\n"
+    .string "CELIO!$"
+
+gUnknown_81A0CF7:: @ 81A0CF7
+    .string "CELIO: BILL!\n"
+    .string "I can't believe you came out here.$"
+
+gUnknown_81A0D27:: @ 81A0D27
+    .string "BILL: Well, absolutely!\n"
+    .string "How's your research coming along?\p"
+    .string "…Oh, wait a sec.$"
+
+gUnknown_81A0D72:: @ 81A0D72
+    .string "{PLAYER}, this is my buddy CELIO.\n"
+    .string "He's one dedicated PC MANIAC!$"
+
+gUnknown_81A0DAC:: @ 81A0DAC
+    .string "CELIO, this is {PLAYER}, a rising\n"
+    .string "contender as the POKéMON CHAMP!$"
+
+gUnknown_81A0DE8:: @ 81A0DE8
+    .string "CELIO, this is {PLAYER}, the\n"
+    .string "reigning POKéMON CHAMP!$"
+
+gUnknown_81A0E17:: @ 81A0E17
+    .string "CELIO: That's really impressive.\p"
+    .string "I hate to say it, but I have zero\n"
+    .string "aptitude for battling.\p"
+    .string "Anyways, I'm glad to meet you.$"
+
+gUnknown_81A0E90:: @ 81A0E90
+    .string "BILL: So, bring me up to speed.\n"
+    .string "How's your machine running?$"
+
+gUnknown_81A0ECC:: @ 81A0ECC
+    .string "CELIO: It's running fine, but we're\n"
+    .string "too remote out here.\p"
+    .string "The PCs on this island just can't\n"
+    .string "link with your PC, BILL.$"
+
+gUnknown_81A0F40:: @ 81A0F40
+    .string "BILL: Oh, yeah?\n"
+    .string "Okay, let me take a look-see.\p"
+    .string "…Hang on here…\n"
+    .string "I think we can make it work.\l"
+    .string "Let me help you, okay?$"
+
+gUnknown_81A0FB1:: @ 81A0FB1
+    .string "{PLAYER}, can I get you to wait for\n"
+    .string "me just a bit?\p"
+    .string "…Actually, can I get you to do\n"
+    .string "me a favor?\p"
+    .string "The island next to this one's\n"
+    .string "called TWO ISLAND.\p"
+    .string "There's a guy there that runs\n"
+    .string "a GAME CORNER.\p"
+    .string "He has this thing for rare rocks\n"
+    .string "and gems.\p"
+    .string "We keep in touch, being fellow\n"
+    .string "maniacs.\p"
+    .string "So, can I get you to deliver this\n"
+    .string "METEORITE to him?$"
+
+gUnknown_81A10EE:: @ 81A10EE
+    .string "{PLAYER} accepted the METEORITE\n"
+    .string "from BILL.$"
+
+gUnknown_81A1113:: @ 81A1113
+    .string "CELIO: {PLAYER}, if you are going\n"
+    .string "to TWO ISLAND, please take this.$"
+
+gUnknown_81A1150:: @ 81A1150
+    .string "It's a PASS for the ferry service\n"
+    .string "serving the local islands.\p"
+    .string "It will let you travel between the\n"
+    .string "ISLANDS ONE, TWO, and THREE.\p"
+    .string "Oh, you should have this, too.$"
+
+Text_1A11EC:: @ 81A11EC
+    .string "{PLAYER} received an extra page\n"
+    .string "for the TOWN MAP!$"
+
+gUnknown_81A1218:: @ 81A1218
+    .string "{PLAYER} received\n"
+    .string "a TOWN MAP!$"
+
+gUnknown_81A1230:: @ 81A1230
+    .string "BILL: I'll catch you later!\n"
+    .string "Say hi to the guy for me!$"
+
+gUnknown_81A1266:: @ 81A1266
+    .string "Hmm…\p"
+    .string "How about we try this like this…$"
+
+gUnknown_81A128C:: @ 81A128C
+    .string "Oh, hey, {PLAYER}!\p"
+    .string "Did you see?\n"
+    .string "We got the PC working!\p"
+    .string "I've got a few things to show\n"
+    .string "CELIO here.\p"
+    .string "Can you go out on a stroll or\n"
+    .string "something for a while more?$"
+
+gUnknown_81A1321:: @ 81A1321
+    .string "I'm sorry for taking up so much of\n"
+    .string "BILL's time.\p"
+    .string "I'm also sorry for being such a \n"
+    .string "poor host on your visit here.$"
+
+Text_1A1390:: @ 81A1390
+    .string "The usual PC services aren't\n"
+    .string "available…$"
+
+gUnknown_81A13B8:: @ 81A13B8
+    .string "BILL: Oh, hey!\n"
+    .string "{PLAYER}!$"
+
+gUnknown_81A13CB:: @ 81A13CB
+    .string "BILL: What kept you so long?\n"
+    .string "Been out having a good time?\p"
+    .string "We got it done.\n"
+    .string "The PCs are up and running!$"
+
+gUnknown_81A1431:: @ 81A1431
+    .string "CELIO: The job went incredibly\n"
+    .string "quick.\p"
+    .string "BILL is one amazing guy…$"
+
+gUnknown_81A1470:: @ 81A1470
+    .string "BILL: No, no! There was almost\n"
+    .string "nothing left for me to do.\p"
+    .string "CELIO, I have to hand it to you.\n"
+    .string "You've learned a lot.$"
+
+gUnknown_81A14E1:: @ 81A14E1
+    .string "CELIO: Oh, really?\n"
+    .string "Ehehe…$"
+
+gUnknown_81A14FB:: @ 81A14FB
+    .string "BILL: Well, there you have it.\n"
+    .string "I'm finished with the job.\l"
+    .string "We should head back to KANTO.\p"
+    .string "CELIO, I'll be seeing you again.$"
+
+gUnknown_81A1574:: @ 81A1574
+    .string "CELIO: {PLAYER}, I'm really sorry\n"
+    .string "that we sent you off alone today.\p"
+    .string "I promise, I will show you around\n"
+    .string "these islands sometime.$"
+
+gUnknown_81A15EC:: @ 81A15EC
+    .string "CELIO: Hello!\n"
+    .string "You look awfully busy as always.\p"
+    .string "How am I doing?\p"
+    .string "Well, I'm modifying my Network\n"
+    .string "Machine.\p"
+    .string "When I get done with the machine,\n"
+    .string "I hope you'll be first to use it,\l"
+    .string "{PLAYER}.$"
+
+gUnknown_81A169B:: @ 81A169B
+    .string "CELIO: {PLAYER}, how have things\n"
+    .string "been for you?\p"
+    .string "Oh, is that right?\n"
+    .string "You've caught more POKéMON.\p"
+    .string "Do you know what?\n"
+    .string "Maybe I can be useful to you.$"
+
+gUnknown_81A1723:: @ 81A1723
+    .string "I'm modifying the Network Machine\n"
+    .string "right now.\p"
+    .string "I'm changing it so it can handle\n"
+    .string "trades over long distances.\p"
+    .string "When I get finished, you'll be\n"
+    .string "trading for exotic POKéMON from\l"
+    .string "TRAINERS far away.$"
+
+gUnknown_81A17DF:: @ 81A17DF
+    .string "But, there is a slight catch.\p"
+    .string "For the link to work, the Machine\n"
+    .string "needs a special gemstone.\p"
+    .string "It's supposed to be on ONE ISLAND,\n"
+    .string "but I haven't found one yet.\p"
+    .string "Who knows where it could be.$"
+
+gUnknown_81A1896:: @ 81A1896
+    .string "I was trying to find the gem\n"
+    .string "even while I was studying.\p"
+    .string "As a result, I've made no headway\n"
+    .string "in both my search and studies…\p"
+    .string "If I relied on BILL, I'm sure my\n"
+    .string "research would progress.\p"
+    .string "But this time, I want to try to do\n"
+    .string "things by myself.$"
+
+gUnknown_81A197E:: @ 81A197E
+    .string "Oh!\n"
+    .string "Th-that's…$"
+
+Text_1A198D:: @ 81A198D
+    .string "{PLAYER} handed the RUBY\n"
+    .string "to CELIO.$"
+
+gUnknown_81A19AA:: @ 81A19AA
+    .string "Thank you!\n"
+    .string "{PLAYER}, you're simply amazing.\p"
+    .string "… … …  … … …\p"
+    .string "Um… May I ask one more giant favor\n"
+    .string "of you?$"
+
+gUnknown_81A1A08:: @ 81A1A08
+    .string "It… It's not anything weird.\n"
+    .string "Please, I need your help.$"
+
+gUnknown_81A1A3F:: @ 81A1A3F
+    .string "While I was studying gemstones,\n"
+    .string "I discovered something important.\p"
+    .string "There is another gem that forms\n"
+    .string "a pair with this RUBY.\p"
+    .string "That other gemstone is supposed to\n"
+    .string "be in the SEVII ISLANDS.\p"
+    .string "{PLAYER}, please, I need you to go\n"
+    .string "find the other gem.\p"
+    .string "{PLAYER}, may I have your ferry\n"
+    .string "PASS and the TOWN MAP?$"
+
+Text_1A1B56:: @ 81A1B56
+    .string "{PLAYER} returned the TRI-PASS and\n"
+    .string "received the RAINBOW PASS.$"
+
+Text_1A1B8E:: @ 81A1B8E
+    .string "Obtained an extra page for the\n"
+    .string "TOWN MAP!$"
+
+gUnknown_81A1BB7:: @ 81A1BB7
+    .string "This is my own ferry PASS.\p"
+    .string "It will let you get to all the\n"
+    .string "SEVII ISLANDS.\p"
+    .string "{PLAYER}, please, I can't do\n"
+    .string "it without your help.$"
+
+Text_1A1C2D:: @ 81A1C2D
+    .string "{PLAYER} handed the SAPPHIRE\n"
+    .string "to CELIO.$"
+
+gUnknown_81A1C4E:: @ 81A1C4E
+    .string "CELIO: So this is the gem that\n"
+    .string "forms a pair with the RUBY…\p"
+    .string "{PLAYER}, you've gone through a lot\n"
+    .string "to get this, didn't you?\p"
+    .string "You don't have to tell me. I know\n"
+    .string "it wasn't easy.\p"
+    .string "Thank you so much!\p"
+    .string "Now it's my turn to work for you!\n"
+    .string "Please give me a little time.$"
+
+gUnknown_81A1D45:: @ 81A1D45
+    .string "Okay, this is good…$"
+
+gUnknown_81A1D59:: @ 81A1D59
+    .string "I did it!\n"
+    .string "I linked up with LANETTE!$"
+
+gUnknown_81A1D7D:: @ 81A1D7D
+    .string "{PLAYER}…\n"
+    .string "{PLAYER}, I did it!\p"
+    .string "I've managed to link up with\n"
+    .string "TRAINERS in the HOENN region!\p"
+    .string "Finally, the Network Machine is\n"
+    .string "fully operational!\p"
+    .string "{PLAYER}, I owe it all to you!\p"
+    .string "Thanks to you, my dream came\n"
+    .string "true…$"
+
+gUnknown_81A1E39:: @ 81A1E39
+    .string "I…\n"
+    .string "I'm not crying.\p"
+    .string "That's enough about me!\p"
+    .string "{PLAYER}, you're going to keep\n"
+    .string "looking for exotic POKéMON, right?\p"
+    .string "I wish you the best of luck!$"
+
+gUnknown_81A1EBD:: @ 81A1EBD
+    .string "CELIO: Hello!\p"
+    .string "{PLAYER}, I've been hearing rumors\n"
+    .string "about you.$"
+
+gUnknown_81A1EF3:: @ 81A1EF3
+    .string "{PLAYER}, what's your favorite kind\n"
+    .string "of POKéMON?\p"
+    .string "BILL is a POKéMANIAC, so he loves\n"
+    .string "every kind.\p"
+    .string "Apparently, the first one he caught\n"
+    .string "was an ABRA.$"
+
+gUnknown_81A1F7C:: @ 81A1F7C
+    .string "By the way, {PLAYER}, you're from\n"
+    .string "PALLET TOWN, aren't you?\p"
+    .string "I've heard that it's a quiet and\n"
+    .string "pleasant place.\p"
+    .string "BILL's hometown is GOLDENROD CITY,\n"
+    .string "where his folks still live.\p"
+    .string "I've heard that it's quite the\n"
+    .string "festive, bustling city.\p"
+    .string "I'd like to go there one day.$"
+
+gUnknown_81A2076:: @ 81A2076
+    .string "{PLAYER}, is there anything that\n"
+    .string "you can't stand?\p"
+    .string "Apparently, BILL simply can't\n"
+    .string "stomach milk at all.$"
+
+gUnknown_81A20D5:: @ 81A20D5
+    .string "Oh, you're a stranger here!\n"
+    .string "Hi! Where did you come from?\p"
+    .string "…PALLET TOWN?\n"
+    .string "I don't know it!$"
+
+gUnknown_81A212D:: @ 81A212D
+    .string "On this island, there's an enormous\n"
+    .string "volcano.\p"
+    .string "It hasn't erupted lately, so why\n"
+    .string "not enjoy a hike?$"
+
+gUnknown_81A218D:: @ 81A218D
+    .string "I wish I could trade POKéMON with\n"
+    .string "my boyfriend who lives far away…$"
+
+gUnknown_81A21D0:: @ 81A21D0
+    .string "I traded POKéMON with my boyfriend\n"
+    .string "far away!\p"
+    .string "Everyone's saying that we can\n"
+    .string "thank you and CELIO.\p"
+    .string "So, thank you!$"
+
+gUnknown_81A223F:: @ 81A223F
+    .string "Network Machine\n"
+    .string "Link Level 0\p"
+    .string "…POKéMON Storage System under\n"
+    .string "adjustment…$"
+
+gUnknown_81A2286:: @ 81A2286
+    .string "Network Machine\n"
+    .string "Link Level 1\p"
+    .string "Link established with the KANTO\n"
+    .string "region.$"
+
+gUnknown_81A22CB:: @ 81A22CB
+    .string "Network Machine\n"
+    .string "Link Level 2\p"
+    .string "Link established with the KANTO\n"
+    .string "and HOENN regions.$"
+
+gUnknown_81A231B:: @ 81A231B
+    .string "Obtained the TRI-PASS!$"
+
diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..f233af596
--- /dev/null
+++ b/data/maps/OneIsland_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_ONE_ISLAND_POKEMON_CENTER_2F",
+  "name": "OneIsland_PokemonCenter_2F",
+  "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_NETWORK_CENTER",
+  "region_map_section": "MAPSEC_ONE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..0948f1cee
--- /dev/null
+++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334
+	map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, OneIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349
+	call EventScript_1BB4A3
+	end
+
+EventScript_17134F:: @ 817134F
+	call EventScript_1BB6AB
+	end
+
+EventScript_171355:: @ 8171355
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json
new file mode 100644
index 000000000..74517e890
--- /dev/null
+++ b/data/maps/OneIsland_TreasureBeach/map.json
@@ -0,0 +1,125 @@
+{
+  "id": "MAP_ONE_ISLAND_TREASURE_BEACH",
+  "name": "OneIsland_TreasureBeach",
+  "layout": "LAYOUT_ONE_ISLAND_TREASURE_BEACH",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_TREASURE_BEACH",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ONE_ISLAND",
+      "offset": 0,
+      "direction": "up"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "44",
+      "x": 8,
+      "y": 11,
+      "elevation": 1,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "OneIsland_TreasureBeach_EventScript_1ABF27",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 13,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_TreasureBeach_EventScript_16876C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 20,
+      "elevation": 3,
+      "item": "ITEM_STARDUST",
+      "flag": "103",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 13,
+      "y": 27,
+      "elevation": 3,
+      "item": "ITEM_STARDUST",
+      "flag": "104",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 31,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "105",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 34,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "106",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 22,
+      "elevation": 3,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "107",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 33,
+      "elevation": 3,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "108",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 29,
+      "elevation": 3,
+      "item": "ITEM_STAR_PIECE",
+      "flag": "109",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 27,
+      "elevation": 3,
+      "item": "ITEM_BIG_PEARL",
+      "flag": "110",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc
new file mode 100644
index 000000000..192cf4898
--- /dev/null
+++ b/data/maps/OneIsland_TreasureBeach/scripts.inc
@@ -0,0 +1,6 @@
+OneIsland_TreasureBeach_MapScripts:: @ 816876B
+	.byte 0
+
+OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C
+	msgbox gUnknown_8189DCE, 2
+	end
diff --git a/data/maps/OneIsland_TreasureBeach/text.inc b/data/maps/OneIsland_TreasureBeach/text.inc
new file mode 100644
index 000000000..344ed5203
--- /dev/null
+++ b/data/maps/OneIsland_TreasureBeach/text.inc
@@ -0,0 +1,18 @@
+Text_189D5A:: @ 8189D5A
+    .string "Lying back, rocked by the waves…\n"
+    .string "It's exquisite.$"
+
+Text_189D8B:: @ 8189D8B
+    .string "I lost…\n"
+    .string "It feels awful.$"
+
+Text_189DA3:: @ 8189DA3
+    .string "The sea is pleasantly warm in these\n"
+    .string "parts.$"
+
+gUnknown_8189DCE:: @ 8189DCE
+    .string "Good things get washed up by the\n"
+    .string "ocean current onto this beach.\p"
+    .string "That's why I often come here for\n"
+    .string "some beachcombing.$"
+
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
new file mode 100644
index 000000000..224a99322
--- /dev/null
+++ b/data/maps/PalletTown/map.json
@@ -0,0 +1,156 @@
+{
+  "id": "MAP_PALLET_TOWN",
+  "name": "PalletTown",
+  "layout": "LAYOUT_PALLET_TOWN",
+  "music": "BGM_FRLG_PALLET_TOWN",
+  "region_map_section": "MAPSEC_PALLET_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE1",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE21_NORTH",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "23",
+      "x": 3,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_EventScript_16575C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "27",
+      "x": 13,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 6,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_EventScript_16582F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "71",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "44"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PALLET_TOWN_GARYS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_PALLET_TOWN",
+      "var_value": 0,
+      "script": "PalletTown_EventScript_1655ED"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_PALLET_TOWN",
+      "var_value": 0,
+      "script": "PalletTown_EventScript_1655F9"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_0x4002",
+      "var_value": 1,
+      "script": "PalletTown_EventScript_16587B"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 16,
+      "y": 16,
+      "elevation": 0,
+      "script": "PalletTown_EventScript_165838"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "script": "PalletTown_EventScript_165850"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 7,
+      "elevation": 0,
+      "script": "PalletTown_EventScript_165859"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 11,
+      "elevation": 0,
+      "script": "PalletTown_EventScript_165862"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 14,
+      "elevation": 0,
+      "script": "PalletTown_EventScript_16586B"
+    }
+  ]
+}
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
new file mode 100644
index 000000000..c1790fb90
--- /dev/null
+++ b/data/maps/PalletTown/scripts.inc
@@ -0,0 +1,509 @@
+PalletTown_MapScripts:: @ 816545A
+	map_script 3, PalletTown_MapScript1_165465
+	map_script 2, PalletTown_MapScript2_1654CE
+	.byte 0
+
+PalletTown_MapScript1_165465:: @ 8165465
+	setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
+	checkflag FLAG_0x291
+	call_if 1, EventScript_165488
+	compare_var_to_value VAR_0x4070, 0
+	call_if 1, EventScript_1654A8
+	compare_var_to_value VAR_0x4070, 1
+	call_if 1, EventScript_1654A2
+	end
+
+EventScript_165488:: @ 8165488
+	checkflag FLAG_0x83E
+	goto_if 0, EventScript_1A77A9
+	compare_var_to_value VAR_0x4070, 1
+	goto_if 4, EventScript_1A77A9
+	setvar VAR_0x4070, 1
+	return
+
+EventScript_1654A2:: @ 81654A2
+	setvar VAR_0x4070, 2
+	return
+
+EventScript_1654A8:: @ 81654A8
+	checkflag FLAG_0x291
+	goto_if_eq EventScript_1654BD
+	setobjectxyperm 1, 5, 15
+	setobjectmovementtype 1, 7
+	return
+
+EventScript_1654BD:: @ 81654BD
+	setobjectxyperm 1, 12, 2
+	setobjectmovementtype 1, 8
+	setvar VAR_0x4002, 1
+	return
+
+PalletTown_MapScript2_1654CE:: @ 81654CE
+	map_script_2 VAR_MAP_SCENE_PALLET_TOWN, 2, EventScript_1654D8
+	.2byte 0
+
+EventScript_1654D8:: @ 81654D8
+	lockall
+	textcolor 0
+	setobjectxyperm 3, 14, 14
+	setobjectmovementtype 3, 9
+	addobject 3
+	applymovement 3, Movement_1655AF
+	waitmovement 0
+	checkflag FLAG_SYS_RIBBON_GET
+	goto_if 0, EventScript_1655A1
+	msgbox gUnknown_817D8BF
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, Special_GetPokedexCount
+	copyvar VAR_0x8008, VAR_0x8005
+	copyvar VAR_0x8009, VAR_0x8006
+	getnumberstring 0, VAR_0x8008
+	getnumberstring 1, VAR_0x8009
+	compare_var_to_value VAR_0x8009, 60
+	goto_if 0, EventScript_165593
+	msgbox gUnknown_817D9AA
+	closemessage
+	playbgm BGM_FRLG_FOLLOW_ME, 0
+	applymovement 255, Movement_1655DD
+	applymovement 3, Movement_1655CC
+	waitmovement 0
+	opendoor 16, 13
+	waitdooranim
+	applymovement 3, Movement_16572E
+	applymovement 255, Movement_165758
+	waitmovement 0
+	closedoor 16, 13
+	waitdooranim
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
+	setvar VAR_MAP_SCENE_PALLET_TOWN, 3
+	setflag FLAG_0x02C
+	warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12
+	waitstate
+	releaseall
+	end
+
+EventScript_16557E:: @ 816557E
+	closemessage
+	applymovement 3, Movement_1655BE
+	waitmovement 0
+	removeobject 3
+	setvar VAR_MAP_SCENE_PALLET_TOWN, 3
+	releaseall
+	end
+
+EventScript_165593:: @ 8165593
+	msgbox gUnknown_817D925
+	goto EventScript_16557E
+	end
+
+EventScript_1655A1:: @ 81655A1
+	msgbox gUnknown_817DA16
+	goto EventScript_16557E
+	end
+
+Movement_1655AF:: @ 81655AF
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_2e
+	step_end
+
+Movement_1655BE:: @ 81655BE
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_1655CC:: @ 81655CC
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2e
+	step_end
+
+Movement_1655DD:: @ 81655DD
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+PalletTown_EventScript_1655ED:: @ 81655ED
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_165605
+	end
+
+PalletTown_EventScript_1655F9:: @ 81655F9
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_165605
+	end
+
+EventScript_165605:: @ 8165605
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	textcolor 0
+	delay 30
+	playbgm BGM_FRLG_PROF_OAK, 0
+	message Text_17D72C
+	waitmessage
+	delay 85
+	closemessage
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	playse SE_PIN
+	applymovement 255, Movement_1A75DB
+	waitmovement 0
+	delay 30
+	addobject 3
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_1656B8
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_1656C3
+	delay 30
+	msgbox gUnknown_817D74A
+	closemessage
+	delay 30
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_1656CE
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_1656E0
+	opendoor 16, 13
+	waitdooranim
+	applymovement 3, Movement_16572E
+	applymovement 255, Movement_165758
+	waitmovement 0
+	closedoor 16, 13
+	waitdooranim
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
+	clearflag FLAG_0x02B
+	setvar VAR_MAP_SCENE_PALLET_TOWN, 1
+	setflag FLAG_0x02C
+	setflag FLAG_SPECIAL_FLAG_0x4001
+	warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12
+	waitstate
+	releaseall
+	end
+
+EventScript_1656B8:: @ 81656B8
+	applymovement 3, Movement_1656F2
+	waitmovement 0
+	return
+
+EventScript_1656C3:: @ 81656C3
+	applymovement 3, Movement_1656FB
+	waitmovement 0
+	return
+
+EventScript_1656CE:: @ 81656CE
+	applymovement 3, Movement_165705
+	applymovement 255, Movement_165731
+	waitmovement 0
+	return
+
+EventScript_1656E0:: @ 81656E0
+	applymovement 3, Movement_165719
+	applymovement 255, Movement_165744
+	waitmovement 0
+	return
+
+Movement_1656F2:: @ 81656F2
+	step_11
+	step_11
+	step_13
+	step_11
+	step_11
+	step_13
+	step_11
+	step_11
+	step_end
+
+Movement_1656FB:: @ 81656FB
+	step_13
+	step_11
+	step_11
+	step_13
+	step_11
+	step_11
+	step_13
+	step_11
+	step_11
+	step_end
+
+Movement_165705:: @ 8165705
+	step_10
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2e
+	step_end
+
+Movement_165719:: @ 8165719
+	step_10
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2e
+	step_end
+
+Movement_16572E:: @ 816572E
+	step_11
+	step_60
+	step_end
+
+Movement_165731:: @ 8165731
+	step_10
+	step_10
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_165744:: @ 8165744
+	step_10
+	step_10
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_165758:: @ 8165758
+	step_13
+	step_11
+	step_60
+	step_end
+
+PalletTown_EventScript_16575C:: @ 816575C
+	lock
+	compare_var_to_value VAR_0x4070, 2
+	goto_if_eq EventScript_1657ED
+	compare_var_to_value VAR_0x4070, 1
+	goto_if_eq EventScript_165815
+	compare_var_to_value VAR_0x4002, 1
+	goto_if_eq EventScript_1658C2
+	checkflag FLAG_0x002
+	goto_if_eq EventScript_165801
+	msgbox gUnknown_81B1C8B
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Movement_1A75DB
+	waitmovement 0
+	applymovement 1, Movement_1A75DD
+	waitmovement 0
+	msgbox gUnknown_81B1C9F
+	closemessage
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_1657D7
+	compare_var_to_value VAR_FACING, 4
+	call_if 5, EventScript_1657E2
+	moveobjectoffscreen 1
+	setflag FLAG_0x002
+	release
+	end
+
+EventScript_1657D7:: @ 81657D7
+	applymovement 1, Movement_165829
+	waitmovement 0
+	return
+
+EventScript_1657E2:: @ 81657E2
+	applymovement 1, Movement_16582C
+	waitmovement 0
+	return
+
+EventScript_1657ED:: @ 81657ED
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_817D7C8
+	release
+	end
+
+EventScript_165801:: @ 8165801
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81B1CAF
+	release
+	end
+
+EventScript_165815:: @ 8165815
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81B1CEC
+	release
+	end
+
+Movement_165829:: @ 8165829
+	step_13
+	step_2f
+	step_end
+
+Movement_16582C:: @ 816582C
+	step_12
+	step_30
+	step_end
+
+PalletTown_EventScript_16582F:: @ 816582F
+	msgbox gUnknown_817D80D, 2
+	end
+
+PalletTown_EventScript_165838:: @ 8165838
+	lockall
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817D866
+	releaseall
+	end
+
+PalletTown_EventScript_165850:: @ 8165850
+	msgbox gUnknown_817D87F, 3
+	end
+
+PalletTown_EventScript_165859:: @ 8165859
+	msgbox gUnknown_817D88A, 3
+	end
+
+PalletTown_EventScript_165862:: @ 8165862
+	msgbox gUnknown_817D895, 3
+	end
+
+PalletTown_EventScript_16586B:: @ 816586B
+	lockall
+	msgbox gUnknown_81B1CC1
+	setvar VAR_0x4070, 1
+	releaseall
+	end
+
+PalletTown_EventScript_16587B:: @ 816587B
+	lockall
+	applymovement 1, Movement_1A75EB
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	call EventScript_165894
+	releaseall
+	end
+
+EventScript_165894:: @ 8165894
+	textcolor 1
+	msgbox gUnknown_81B1D0B
+	closemessage
+	delay 20
+	textcolor 3
+	setflag FLAG_0x83E
+	setvar VAR_0x4070, 1
+	setvar VAR_0x4002, 0
+	special sub_80699E0
+	special sub_80699BC
+	signmsg
+	msgbox gUnknown_81B1D51
+	normalmsg
+	return
+
+EventScript_1658C2:: @ 81658C2
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	call EventScript_165894
+	release
+	end
diff --git a/data/maps/PalletTown/text.inc b/data/maps/PalletTown/text.inc
new file mode 100644
index 000000000..ad476a541
--- /dev/null
+++ b/data/maps/PalletTown/text.inc
@@ -0,0 +1,67 @@
+Text_17D72C:: @ 817D72C
+    .string "OAK: Hey! Wait!\n"
+    .string "Don't go out!$"
+
+gUnknown_817D74A:: @ 817D74A
+    .string "OAK: It's unsafe!\n"
+    .string "Wild POKéMON live in tall grass!\p"
+    .string "You need your own POKéMON for\n"
+    .string "your protection.\p"
+    .string "I know!\n"
+    .string "Here, come with me!$"
+
+gUnknown_817D7C8:: @ 817D7C8
+    .string "I'm raising POKéMON, too.\p"
+    .string "When they get strong, they can\n"
+    .string "protect me.$"
+
+gUnknown_817D80D:: @ 817D80D
+    .string "Technology is incredible!\p"
+    .string "You can now store and recall items\n"
+    .string "and POKéMON as data via PC.$"
+
+gUnknown_817D866:: @ 817D866
+    .string "OAK POKéMON RESEARCH LAB$"
+
+gUnknown_817D87F:: @ 817D87F
+    .string "{PLAYER}'s house$"
+
+gUnknown_817D88A:: @ 817D88A
+    .string "{RIVAL}'s house$"
+
+gUnknown_817D895:: @ 817D895
+    .string "PALLET TOWN\n"
+    .string "Shades of your journey await!$"
+
+gUnknown_817D8BF:: @ 817D8BF
+    .string "OAK: Ah, {PLAYER}!\n"
+    .string "You're back, are you?\p"
+    .string "How much have you filled in your\n"
+    .string "POKéDEX?\p"
+    .string "May I see it?\p"
+    .string "Let's see…$"
+
+gUnknown_817D925:: @ 817D925
+    .string "You've caught {STR_VAR_2}…\p"
+    .string "Hm, it looks as if you're putting\n"
+    .string "in an honest effort.\p"
+    .string "When you manage to fill it some\n"
+    .string "more, come show me, please.$"
+
+gUnknown_817D9AA:: @ 817D9AA
+    .string "You've caught… {STR_VAR_2}!?\n"
+    .string "Now, this is impressive!\p"
+    .string "There's something I wanted to ask\n"
+    .string "of you, {PLAYER}.\p"
+    .string "Come.\n"
+    .string "Follow me.$"
+
+gUnknown_817DA16:: @ 817DA16
+    .string "OAK: Ah, {PLAYER}!\n"
+    .string "You seem to be enjoying traveling.\p"
+    .string "Knowing you, {PLAYER}, I can easily\n"
+    .string "imagine you going out to even more\l"
+    .string "exotic locales.\p"
+    .string "Good for you, good for you.\n"
+    .string "Hohoho.$"
+
diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json
new file mode 100644
index 000000000..5db9cb1f6
--- /dev/null
+++ b/data/maps/PalletTown_GarysHouse/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_PALLET_TOWN_GARYS_HOUSE",
+  "name": "PalletTown_GarysHouse",
+  "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE",
+  "music": "BGM_FRLG_PALLET_TOWN",
+  "region_map_section": "MAPSEC_PALLET_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "76",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_GarysHouse_EventScript_168D56",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "93",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_GarysHouse_EventScript_168F63",
+      "flag": "57"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_GarysHouse_EventScript_168F6C"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_GarysHouse_EventScript_168F6C"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_GarysHouse_EventScript_168F75"
+    }
+  ]
+}
diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc
new file mode 100644
index 000000000..dd3f05aa9
--- /dev/null
+++ b/data/maps/PalletTown_GarysHouse/scripts.inc
@@ -0,0 +1,183 @@
+PalletTown_GarysHouse_MapScripts:: @ 8168D27
+	map_script 3, PalletTown_GarysHouse_MapScript1_168D2D
+	.byte 0
+
+PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D
+	compare_var_to_value VAR_0x4058, 2
+	call_if 0, EventScript_168D44
+	compare_var_to_value VAR_0x4058, 2
+	call_if 4, EventScript_168D50
+	end
+
+EventScript_168D44:: @ 8168D44
+	setobjectmovementtype 1, 10
+	setobjectxyperm 1, 5, 4
+	return
+
+EventScript_168D50:: @ 8168D50
+	setvar VAR_0x4001, 1
+	return
+
+PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56
+	lock
+	faceplayer
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	checkflag FLAG_0x82C
+	goto_if_eq EventScript_168DB9
+	compare_var_to_value VAR_0x4001, 1
+	goto_if_eq EventScript_168EEC
+	compare_var_to_value VAR_0x4058, 2
+	goto_if_eq EventScript_168F59
+	compare_var_to_value VAR_0x4058, 1
+	goto_if_eq EventScript_168EF6
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
+	goto_if 4, EventScript_168DAF
+	msgbox gUnknown_818D58C
+	closemessage
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_168DAF:: @ 8168DAF
+	msgbox gUnknown_818D5C4
+	release
+	end
+
+EventScript_168DB9:: @ 8168DB9
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	compare_var_to_value VAR_MIRAGE_RND_L, 500
+	goto_if 0, EventScript_168E46
+	msgbox gUnknown_818D7D3, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_168E3C
+	msgbox gUnknown_818D8B2
+	special sub_80BF8FC
+	waitstate
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_168E3C
+	specialvar VAR_RESULT, sub_80CAD54
+	compare_var_to_value VAR_RESULT, SPECIES_EGG
+	goto_if_eq EventScript_168E32
+	msgbox gUnknown_818D8CC
+	closemessage
+	fadescreen 1
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special sub_80CC948
+	fadescreen 0
+	special TV_CopyNicknameToStringVar1AndEnsureTerminated
+	msgbox gUnknown_818D8FE
+	release
+	end
+
+EventScript_168E32:: @ 8168E32
+	msgbox gUnknown_818D97B
+	release
+	end
+
+EventScript_168E3C:: @ 8168E3C
+	msgbox gUnknown_818D875
+	release
+	end
+
+EventScript_168E46:: @ 8168E46
+	msgbox gUnknown_818D9A5
+	specialvar VAR_RESULT, sub_80CA76C
+	switch VAR_RESULT
+	case 0, EventScript_168EA6
+	case 1, EventScript_168EB0
+	case 2, EventScript_168EBA
+	case 3, EventScript_168EC4
+	case 4, EventScript_168ECE
+	case 5, EventScript_168ED8
+	case 6, EventScript_168EE2
+	end
+
+EventScript_168EA6:: @ 8168EA6
+	msgbox gUnknown_818DBDD
+	release
+	end
+
+EventScript_168EB0:: @ 8168EB0
+	msgbox gUnknown_818DB88
+	release
+	end
+
+EventScript_168EBA:: @ 8168EBA
+	msgbox gUnknown_818DB2E
+	release
+	end
+
+EventScript_168EC4:: @ 8168EC4
+	msgbox gUnknown_818DAF3
+	release
+	end
+
+EventScript_168ECE:: @ 8168ECE
+	msgbox gUnknown_818DABE
+	release
+	end
+
+EventScript_168ED8:: @ 8168ED8
+	msgbox gUnknown_818DA73
+	release
+	end
+
+EventScript_168EE2:: @ 8168EE2
+	msgbox gUnknown_818DA16
+	release
+	end
+
+EventScript_168EEC:: @ 8168EEC
+	msgbox gUnknown_818D701
+	release
+	end
+
+EventScript_168EF6:: @ 8168EF6
+	msgbox gUnknown_818D60A
+	closemessage
+	checkitemspace ITEM_TOWN_MAP, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_168F4F
+	applymovement 1, Movement_1A75EB
+	waitmovement 0
+	removeobject 2
+	setvar VAR_0x4058, 2
+	delay 15
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	delay 12
+	additem ITEM_TOWN_MAP, 1
+	giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, BGM_FRLG_ME_KEYITEM
+	release
+	end
+
+EventScript_168F4F:: @ 8168F4F
+	msgbox gUnknown_818D684
+	release
+	end
+
+EventScript_168F59:: @ 8168F59
+	msgbox gUnknown_818D6AF
+	release
+	end
+
+PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63
+	msgbox gUnknown_818D763, 2
+	end
+
+PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C
+	msgbox gUnknown_818D7A1, 3
+	end
+
+PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75
+	msgbox gUnknown_818DC47, 3
+	end
diff --git a/data/maps/PalletTown_GarysHouse/text.inc b/data/maps/PalletTown_GarysHouse/text.inc
new file mode 100644
index 000000000..92d05fbef
--- /dev/null
+++ b/data/maps/PalletTown_GarysHouse/text.inc
@@ -0,0 +1,121 @@
+gUnknown_818D58C:: @ 818D58C
+    .string "DAISY: Hi, {PLAYER}!\p"
+    .string "My brother, {RIVAL}, is out at\n"
+    .string "Grandpa's LAB.$"
+
+gUnknown_818D5C4:: @ 818D5C4
+    .string "DAISY: {PLAYER}, I heard you had\n"
+    .string "a battle against {RIVAL}.\p"
+    .string "I wish I'd seen that!$"
+
+gUnknown_818D60A:: @ 818D60A
+    .string "Grandpa asked you to run an\n"
+    .string "errand?\p"
+    .string "Gee, that's lazy of him.\n"
+    .string "Here, this will help you.$"
+
+gUnknown_818D661:: @ 818D661
+    .string "{PLAYER} received a TOWN MAP\n"
+    .string "from DAISY.$"
+
+gUnknown_818D684:: @ 818D684
+    .string "You don't have space for this in\n"
+    .string "your BAG.$"
+
+gUnknown_818D6AF:: @ 818D6AF
+    .string "You can use the TOWN MAP to find\n"
+    .string "out where you are, or check the\l"
+    .string "names of places.$"
+
+gUnknown_818D701:: @ 818D701
+    .string "DAISY: Just like people, POKéMON\n"
+    .string "are living things.\p"
+    .string "When they get tired, please give\n"
+    .string "them a rest.$"
+
+gUnknown_818D763:: @ 818D763
+    .string "It's a big map of the KANTO region.\n"
+    .string "Now this would be useful!$"
+
+gUnknown_818D7A1:: @ 818D7A1
+    .string "The shelves are crammed full of\n"
+    .string "books on POKéMON.$"
+
+gUnknown_818D7D3:: @ 818D7D3
+    .string "DAISY: Hi, {PLAYER}!\n"
+    .string "Good timing.\p"
+    .string "I'm about to have some tea.\n"
+    .string "Would you like to join me?\p"
+    .string "Oh, but look.\n"
+    .string "Your POKéMON are a little dirty.\p"
+    .string "Would you like me to groom one?$"
+
+gUnknown_818D875:: @ 818D875
+    .string "You don't need any grooming done?\n"
+    .string "Okay, we'll just have tea.$"
+
+gUnknown_818D8B2:: @ 818D8B2
+    .string "Which one should I groom?$"
+
+gUnknown_818D8CC:: @ 818D8CC
+    .string "DAISY: Okay, I'll get it looking\n"
+    .string "nice in no time.$"
+
+gUnknown_818D8FE:: @ 818D8FE
+    .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p"
+    .string "{SIZE}ÈDAISY: There you go! All done.\n"
+    .string "See? Doesn't it look nice?\p"
+    .string "Giggle…\n"
+    .string "It's such a cute POKéMON.$"
+
+gUnknown_818D97B:: @ 818D97B
+    .string "Oh, sorry. I honestly can't\n"
+    .string "groom an EGG.$"
+
+gUnknown_818D9A5:: @ 818D9A5
+    .string "DAISY: Your POKéMON grow to love\n"
+    .string "you if you raise them with love.\p"
+    .string "For example, {PLAYER}, may I see\n"
+    .string "your first POKéMON?$"
+
+gUnknown_818DA16:: @ 818DA16
+    .string "It couldn't possibly love you\n"
+    .string "any more than it does now.\p"
+    .string "Your POKéMON is happy beyond\n"
+    .string "words.$"
+
+gUnknown_818DA73:: @ 818DA73
+    .string "It looks very happy.\p"
+    .string "I wish {RIVAL} could see this and\n"
+    .string "learn something from it.$"
+
+gUnknown_818DABE:: @ 818DABE
+    .string "It's quite friendly with you.\n"
+    .string "Keep being good to it!$"
+
+gUnknown_818DAF3:: @ 818DAF3
+    .string "It's warming up to you.\n"
+    .string "Trust must be growing between you.$"
+
+gUnknown_818DB2E:: @ 818DB2E
+    .string "It's not quite familiar with you\n"
+    .string "yet.\p"
+    .string "POKéMON are all quite wary when\n"
+    .string "you first get them.$"
+
+gUnknown_818DB88:: @ 818DB88
+    .string "{PLAYER}, I don't like the way it\n"
+    .string "glares at you.\p"
+    .string "Could you try being a little nicer\n"
+    .string "to it?$"
+
+gUnknown_818DBDD:: @ 818DBDD
+    .string "…Um, it's not easy for me to say\n"
+    .string "this, but…\p"
+    .string "Is there some reason why your\n"
+    .string "POKéMON would hate you so much?$"
+
+gUnknown_818DC47:: @ 818DC47
+    .string "“The lovely and sweet\n"
+    .string "CLEFAIRY”$"
+
diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json
new file mode 100644
index 000000000..3db904de7
--- /dev/null
+++ b/data/maps/PalletTown_PlayersHouse_1F/map.json
@@ -0,0 +1,70 @@
+{
+  "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F",
+  "name": "PalletTown_PlayersHouse_1F",
+  "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F",
+  "music": "BGM_FRLG_PALLET_TOWN",
+  "region_map_section": "MAPSEC_PALLET_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "88",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_PlayersHouse_1F_EventScript_168C09",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_PlayersHouse_1F_EventScript_168C62"
+    }
+  ]
+}
diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
new file mode 100644
index 000000000..89eabeea1
--- /dev/null
+++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
@@ -0,0 +1,59 @@
+PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08
+	.byte 0
+
+PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09
+	lock
+	faceplayer
+	checkflag FLAG_0x258
+	goto_if_eq EventScript_168C4A
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_168C38
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_168C41
+	closemessage
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_168C38:: @ 8168C38
+	msgbox gUnknown_818D2F0
+	return
+
+EventScript_168C41:: @ 8168C41
+	msgbox gUnknown_818D360
+	return
+
+EventScript_168C4A:: @ 8168C4A
+	msgbox gUnknown_818D3D1
+	closemessage
+	call EventScript_1A6C26
+	msgbox gUnknown_818D3F8
+	release
+	end
+
+PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
+	lockall
+	compare_var_to_value VAR_FACING, 2
+	goto_if_eq EventScript_168C78
+	msgbox gUnknown_818D4F9
+	releaseall
+	end
+
+EventScript_168C78:: @ 8168C78
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_168C91
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_168C9A
+	releaseall
+	end
+
+EventScript_168C91:: @ 8168C91
+	msgbox gUnknown_818D43E
+	return
+
+EventScript_168C9A:: @ 8168C9A
+	msgbox gUnknown_818D492
+	return
diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc
new file mode 100644
index 000000000..faa31c9d1
--- /dev/null
+++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc
@@ -0,0 +1,100 @@
+Text_18CF4D:: @ 818CF4D
+    .string "Training by oneself is certainly\n"
+    .string "not a bad thing.\p"
+    .string "But it's also not bad to aim for\n"
+    .string "the top with a partner.\p"
+    .string "Even BRUNO…\n"
+    .string "He trained with a fellow by the\l"
+    .string "name of BRAWLY before.$"
+
+Text_18CFFB:: @ 818CFFB
+    .string "Do you know anything about this\n"
+    .string "stone chamber?$"
+
+Text_18D02A:: @ 818D02A
+    .string "That was uncalled for.\n"
+    .string "You didn't have to be so rough.$"
+
+Text_18D061:: @ 818D061
+    .string "The TANOBY RUINS date back at\n"
+    .string "least 1,500 years.\p"
+    .string "But it's a baffling mystery as to\n"
+    .string "why it was built in the first place.$"
+
+Text_18D0D9:: @ 818D0D9
+    .string "A mystic POKéMON is said to sleep\n"
+    .string "inside here.$"
+
+Text_18D108:: @ 818D108
+    .string "I'm not much good in battle.$"
+
+Text_18D125:: @ 818D125
+    .string "I hear there are other ruins like\n"
+    .string "the one here.\p"
+    .string "Might they be the resting places\n"
+    .string "of other mystic POKéMON?$"
+
+Text_18D18F:: @ 818D18F
+    .string "CLIFFORD is teaching me how to\n"
+    .string "paint.$"
+
+Text_18D1B5:: @ 818D1B5
+    .string "We might get in trouble for being\n"
+    .string "noisy here.$"
+
+Text_18D1E3:: @ 818D1E3
+    .string "I said that I wanted to paint an\n"
+    .string "old building.\p"
+    .string "So CLIFFORD brought me here.$"
+
+Text_18D22F:: @ 818D22F
+    .string "Today, in addition to our lesson,\n"
+    .string "we came to see the chamber.$"
+
+Text_18D26D:: @ 818D26D
+    .string "My, how extraordinary.$"
+
+Text_18D284:: @ 818D284
+    .string "Ah, so you are studying POKéMON\n"
+    .string "on your own…\p"
+    .string "Yes, you certainly are quite the\n"
+    .string "extraordinary person, indeed.$"
+
+gUnknown_818D2F0:: @ 818D2F0
+    .string "MOM: …Right.\n"
+    .string "All boys leave home someday.\l"
+    .string "It said so on TV.\p"
+    .string "Oh, yes. PROF. OAK, next door, was\n"
+    .string "looking for you.$"
+
+gUnknown_818D360:: @ 818D360
+    .string "MOM: …Right.\n"
+    .string "All girls dream of traveling.\l"
+    .string "It said so on TV.\p"
+    .string "Oh, yes. PROF. OAK, next door, was\n"
+    .string "looking for you.$"
+
+gUnknown_818D3D1:: @ 818D3D1
+    .string "MOM: {PLAYER}!\n"
+    .string "You should take a quick rest.$"
+
+gUnknown_818D3F8:: @ 818D3F8
+    .string "MOM: Oh, good! You and your\n"
+    .string "POKéMON are looking great.\l"
+    .string "Take care now!$"
+
+gUnknown_818D43E:: @ 818D43E
+    .string "There's a movie on TV.\n"
+    .string "Four boys are walking on railroad\l"
+    .string "tracks.\p"
+    .string "…I better go, too.$"
+
+gUnknown_818D492:: @ 818D492
+    .string "There's a movie on TV.\n"
+    .string "A girl with her hair in pigtails is\l"
+    .string "walking up a brick road.\p"
+    .string "…I better go, too.$"
+
+gUnknown_818D4F9:: @ 818D4F9
+    .string "Oops, wrong side…$"
+
diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json
new file mode 100644
index 000000000..dd470b406
--- /dev/null
+++ b/data/maps/PalletTown_PlayersHouse_2F/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F",
+  "name": "PalletTown_PlayersHouse_2F",
+  "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F",
+  "music": "BGM_FRLG_PALLET_TOWN",
+  "region_map_section": "MAPSEC_PALLET_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "script": "PalletTown_PlayersHouse_2F_EventScript_168CD2"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_PlayersHouse_2F_EventScript_168CE4"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB"
+    }
+  ]
+}
diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
new file mode 100644
index 000000000..3700d06be
--- /dev/null
+++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
@@ -0,0 +1,56 @@
+PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3
+	map_script 3, PalletTown_PlayersHouse_2F_MapScript1_168CAE
+	map_script 4, PalletTown_PlayersHouse_2F_MapScript2_168CBE
+	.byte 0
+
+PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0
+	call_if 1, EventScript_168CBA
+	end
+
+EventScript_168CBA:: @ 8168CBA
+	setrespawn SPAWN_PALLET_TOWN
+	return
+
+PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE
+	map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8
+	.2byte 0
+
+EventScript_168CC8:: @ 8168CC8
+	turnobject 255, 2
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1
+	end
+
+PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2
+	msgbox gUnknown_818D50B, 3
+	end
+
+PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB
+	msgbox gUnknown_818D53B, 3
+	end
+
+gUnknown_8168CE4:: @ 8168CE4
+PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lockall
+	setvar VAR_0x8004, 32
+	special sub_812B220
+	setvar VAR_0x8004, 1
+	special sub_80CA86C
+	playse SE_PC_ON
+	msgbox gUnknown_81A5420
+	special sub_80EB6AC
+	waitstate
+	special sub_812B35C
+	releaseall
+	end
+
+gUnknown_8168D17:: @ 8168D17
+	setvar VAR_0x8004, 1
+	playse SE_PC_OFF
+	special sub_80CA9A8
+	special sub_812B35C
+	releaseall
+	end
diff --git a/data/maps/PalletTown_PlayersHouse_2F/text.inc b/data/maps/PalletTown_PlayersHouse_2F/text.inc
new file mode 100644
index 000000000..e6c794231
--- /dev/null
+++ b/data/maps/PalletTown_PlayersHouse_2F/text.inc
@@ -0,0 +1,10 @@
+gUnknown_818D50B:: @ 818D50B
+    .string "{PLAYER} played with the NES.\p"
+    .string "…Okay!\n"
+    .string "It's time to go!$"
+
+gUnknown_818D53B:: @ 818D53B
+    .string "It's a posted notice…\p"
+    .string "If you're confused, ask for HELP!\n"
+    .string "Press the L or R Button!$"
+
diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json
new file mode 100644
index 000000000..9d74bea9c
--- /dev/null
+++ b/data/maps/PalletTown_ProfessorOaksLab/map.json
@@ -0,0 +1,256 @@
+{
+  "id": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+  "name": "PalletTown_ProfessorOaksLab",
+  "layout": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+  "music": "BGM_FRLG_OAK_LAB",
+  "region_map_section": "MAPSEC_PALLET_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169DEE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "48",
+      "x": 2,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 0,
+      "movement_range_y": 4,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169E46",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169E1A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "71",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169595",
+      "flag": "43"
+    },
+    {
+      "graphics_id": "92",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB",
+      "flag": "40"
+    },
+    {
+      "graphics_id": "92",
+      "x": 9,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169D78",
+      "flag": "41"
+    },
+    {
+      "graphics_id": "92",
+      "x": 10,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE",
+      "flag": "42"
+    },
+    {
+      "graphics_id": "72",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_16955F",
+      "flag": "45"
+    },
+    {
+      "graphics_id": "94",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
+      "flag": "58"
+    },
+    {
+      "graphics_id": "94",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
+      "flag": "58"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_PALLET_TOWN",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+      "var_value": 2,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+      "var_value": 2,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+      "var_value": 2,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+      "var_value": 3,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_1692E7"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+      "var_value": 3,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_1692F3"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
+      "var_value": 3,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_1692FF"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169E68"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169E68"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169E71"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A"
+    }
+  ]
+}
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
new file mode 100644
index 000000000..449c31027
--- /dev/null
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -0,0 +1,1408 @@
+PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E
+	map_script 3, PalletTown_ProfessorOaksLab_MapScript1_168F8E
+	map_script 4, PalletTown_ProfessorOaksLab_MapScript2_168FE1
+	map_script 2, PalletTown_ProfessorOaksLab_MapScript3_168FF0
+	.byte 0
+
+PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E
+	setflag FLAG_0x2CF
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
+	call_if 1, EventScript_168FC6
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
+	call_if 1, EventScript_168FD5
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
+	call_if 1, EventScript_168FC0
+	checkflag FLAG_0x247
+	call_if 1, EventScript_168FBC
+	end
+
+EventScript_168FBC:: @ 8168FBC
+	setflag FLAG_0x24F
+	return
+
+EventScript_168FC0:: @ 8168FC0
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
+	return
+
+EventScript_168FC6:: @ 8168FC6
+	setobjectxyperm 4, 6, 11
+	setobjectmovementtype 4, 7
+	savebgm BGM_FRLG_PROF_OAK
+	return
+
+EventScript_168FD5:: @ 8168FD5
+	setobjectxyperm 4, 6, 11
+	setobjectmovementtype 4, 7
+	return
+
+PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1
+	map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB
+	.2byte 0
+
+EventScript_168FEB:: @ 8168FEB
+	turnobject 255, 2
+	end
+
+PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0
+	map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E
+	map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002
+	.2byte 0
+
+EventScript_169002:: @ 8169002 
+	lockall
+	setvar VAR_FACING, 2
+	textcolor 0
+	applymovement 4, Movement_1692B0
+	waitmovement 0
+	removeobject 4
+	setobjectxyperm 4, 6, 3
+	setobjectmovementtype 4, 8
+	clearflag FLAG_0x02B
+	applymovement 255, Movement_1692B7
+	waitmovement 0
+	goto EventScript_169035
+	end
+
+EventScript_169035:: @ 8169035
+	msgbox gUnknown_818EE60
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169174
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_1691BB
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_169194
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_169194
+	msgbox gUnknown_818EF59
+	fadedefaultbgm
+	msgbox gUnknown_818F004
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_1691DB
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_1691E6
+	textcolor 3
+	msgbox gUnknown_818F062
+	closemessage
+	call EventScript_1A6675
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_1691F1
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_1691FC
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_169215
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_169227
+	addobject 9
+	addobject 10
+	delay 30
+	msgbox gUnknown_818F085
+	closemessage
+	removeobject 9
+	removeobject 10
+	delay 30
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169845
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_169850
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_16985B
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_16986D
+	textcolor 3
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_18F0E8
+	waitmessage
+	waitfanfare
+	call EventScript_1A6675
+	special EnableNationalPokedex
+	msgbox gUnknown_818F103
+	msgbox gUnknown_818F1DB
+	closemessage
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169B69
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_169B7B
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_169B7B
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_169B7B
+	removeobject 8
+	fadedefaultbgm
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
+	releaseall
+	end
+
+EventScript_169174:: @ 8169174
+	setobjectxyperm 8, 5, 10
+	addobject 8
+	playbgm BGM_FRLG_RIVAL, 0
+	applymovement 255, Movement_169B94
+	applymovement 8, Movement_169B9D
+	waitmovement 0
+	return
+
+EventScript_169194:: @ 8169194
+	setobjectxyperm 8, 6, 10
+	addobject 8
+	playbgm BGM_FRLG_RIVAL, 0
+	applymovement 4, Movement_1A75ED
+	applymovement 255, Movement_169B91
+	applymovement 8, Movement_169B9D
+	waitmovement 0
+	return
+
+EventScript_1691BB:: @ 81691BB
+	setobjectxyperm 8, 6, 10
+	addobject 8
+	playbgm BGM_FRLG_RIVAL, 0
+	applymovement 4, Movement_1A75ED
+	applymovement 8, Movement_169B9D
+	waitmovement 0
+	return
+
+EventScript_1691DB:: @ 81691DB
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_1691E6:: @ 81691E6
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_1691F1:: @ 81691F1
+	applymovement 4, Movement_169232
+	waitmovement 0
+	return
+
+EventScript_1691FC:: @ 81691FC
+	applymovement 4, Movement_169238
+	applymovement 255, Movement_1698C7
+	applymovement 8, Movement_1698C7
+	waitmovement 4
+	return
+
+EventScript_169215:: @ 8169215
+	applymovement 4, Movement_169232
+	applymovement 255, Movement_1698C3
+	waitmovement 4
+	return
+
+EventScript_169227:: @ 8169227
+	applymovement 4, Movement_169232
+	waitmovement 0
+	return
+
+Movement_169232:: @ 8169232
+	step_11
+	step_12
+	step_2e
+	step_1c
+	step_1a
+	step_end
+
+Movement_169238:: @ 8169238
+	step_12
+	step_12
+	step_11
+	step_1c
+	step_1a
+	step_end
+
+EventScript_16923E:: @ 816923E
+	lockall
+	textcolor 0
+	applymovement 4, Movement_1692B0
+	waitmovement 0
+	removeobject 4
+	setobjectxyperm 4, 6, 3
+	setobjectmovementtype 4, 8
+	clearflag FLAG_0x02B
+	applymovement 255, Movement_1692B7
+	waitmovement 0
+	applymovement 8, Movement_1A75E9
+	waitmovement 0
+	clearflag FLAG_SPECIAL_FLAG_0x4001
+	savebgm SE_STOP
+	fadedefaultbgm
+	msgbox gUnknown_818DC94
+	closemessage
+	delay 60
+	msgbox gUnknown_818DFBC
+	closemessage
+	delay 30
+	applymovement 8, Movement_1692C0
+	waitmovement 0
+	msgbox gUnknown_818DCB9
+	msgbox gUnknown_818E0EA
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
+	releaseall
+	end
+
+Movement_1692B0:: @ 81692B0
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_1692B7:: @ 81692B7
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_1692C0:: @ 81692C0
+	step_26
+	step_26
+	step_end
+
+PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3
+	lockall
+	textcolor 0
+	applymovement 4, Movement_1A75F1
+	waitmovement 0
+	msgbox gUnknown_818E177
+	closemessage
+	applymovement 255, Movement_1692E5
+	waitmovement 0
+	releaseall
+	end
+
+Movement_1692E5:: @ 81692E5
+	step_11
+	step_end
+
+PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7
+	lockall
+	setvar VAR_0x4002, 1
+	goto EventScript_16930B
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3
+	lockall
+	setvar VAR_0x4002, 2
+	goto EventScript_16930B
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF
+	lockall
+	setvar VAR_0x4002, 3
+	goto EventScript_16930B
+	end
+
+EventScript_16930B:: @ 816930B
+	textcolor 0
+	playbgm BGM_FRLG_RIVAL, 0
+	applymovement 8, Movement_1A75ED
+	waitmovement 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	msgbox gUnknown_818DDA4
+	closemessage
+	applymovement 4, Movement_1A75F1
+	waitmovement 0
+	compare_var_to_value VAR_STARTER_MON, 0
+	goto_if_eq EventScript_1693D2
+	compare_var_to_value VAR_STARTER_MON, 1
+	goto_if_eq EventScript_16944D
+	compare_var_to_value VAR_STARTER_MON, 2
+	goto_if_eq EventScript_16935A
+	end
+
+EventScript_16935A:: @ 816935A
+	compare_var_to_value VAR_0x4002, 1
+	goto_if_eq EventScript_16937C
+	compare_var_to_value VAR_0x4002, 2
+	goto_if_eq EventScript_16938C
+	compare_var_to_value VAR_0x4002, 3
+	goto_if_eq EventScript_16939C
+	end
+
+EventScript_16937C:: @ 816937C
+	applymovement 8, Movement_1693C0
+	waitmovement 0
+	goto EventScript_1693AC
+	end
+
+EventScript_16938C:: @ 816938C
+	applymovement 8, Movement_1693C7
+	waitmovement 0
+	goto EventScript_1693AC
+	end
+
+EventScript_16939C:: @ 816939C
+	applymovement 8, Movement_1693CD
+	waitmovement 0
+	goto EventScript_1693AC
+	end
+
+EventScript_1693AC:: @ 81693AC
+	trainerbattle 9, 326, 3, Text_18DDEA, Text_18DE1A
+	goto EventScript_1694C2
+	end
+
+Movement_1693C0:: @ 81693C0
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+Movement_1693C7:: @ 81693C7
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+Movement_1693CD:: @ 81693CD
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+EventScript_1693D2:: @ 81693D2
+	compare_var_to_value VAR_0x4002, 1
+	goto_if_eq EventScript_1693F4
+	compare_var_to_value VAR_0x4002, 2
+	goto_if_eq EventScript_169404
+	compare_var_to_value VAR_0x4002, 3
+	goto_if_eq EventScript_169414
+	end
+
+EventScript_1693F4:: @ 81693F4
+	applymovement 8, Movement_169438
+	waitmovement 0
+	goto EventScript_169424
+	end
+
+EventScript_169404:: @ 8169404
+	applymovement 8, Movement_169440
+	waitmovement 0
+	goto EventScript_169424
+	end
+
+EventScript_169414:: @ 8169414
+	applymovement 8, Movement_169447
+	waitmovement 0
+	goto EventScript_169424
+	end
+
+EventScript_169424:: @ 8169424
+	trainerbattle 9, 328, 3, Text_18DDEA, Text_18DE1A
+	goto EventScript_1694C2
+	end
+
+Movement_169438:: @ 8169438
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+Movement_169440:: @ 8169440
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+Movement_169447:: @ 8169447
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+EventScript_16944D:: @ 816944D
+	compare_var_to_value VAR_0x4002, 1
+	goto_if_eq EventScript_16946F
+	compare_var_to_value VAR_0x4002, 2
+	goto_if_eq EventScript_16947F
+	compare_var_to_value VAR_0x4002, 3
+	goto_if_eq EventScript_16948F
+	end
+
+EventScript_16946F:: @ 816946F
+	applymovement 8, Movement_1694B3
+	waitmovement 0
+	goto EventScript_16949F
+	end
+
+EventScript_16947F:: @ 816947F
+	applymovement 8, Movement_1694B9
+	waitmovement 0
+	goto EventScript_16949F
+	end
+
+EventScript_16948F:: @ 816948F
+	applymovement 8, Movement_1694BE
+	waitmovement 0
+	goto EventScript_16949F
+	end
+
+EventScript_16949F:: @ 816949F
+	trainerbattle 9, 327, 3, Text_18DDEA, Text_18DE1A
+	goto EventScript_1694C2
+	end
+
+Movement_1694B3:: @ 81694B3
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+Movement_1694B9:: @ 81694B9
+	step_12
+	step_12
+	step_10
+	step_10
+	step_end
+
+Movement_1694BE:: @ 81694BE
+	step_12
+	step_10
+	step_10
+	step_end
+
+EventScript_1694C2:: @ 81694C2
+	special sp000_heal_pokemon
+	msgbox gUnknown_818DE38
+	closemessage
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	compare_var_to_value VAR_0x4002, 1
+	call_if 1, EventScript_169504
+	compare_var_to_value VAR_0x4002, 2
+	call_if 1, EventScript_169516
+	compare_var_to_value VAR_0x4002, 3
+	call_if 1, EventScript_169528
+	removeobject 8
+	playse SE_KAIDAN
+	fadedefaultbgm
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
+	setflag FLAG_0x258
+	releaseall
+	end
+
+EventScript_169504:: @ 8169504
+	applymovement 8, Movement_16953A
+	applymovement 255, Movement_169553
+	waitmovement 8
+	return
+
+EventScript_169516:: @ 8169516
+	applymovement 8, Movement_16954A
+	applymovement 255, Movement_169553
+	waitmovement 8
+	return
+
+EventScript_169528:: @ 8169528
+	applymovement 8, Movement_169542
+	applymovement 255, Movement_169559
+	waitmovement 8
+	return
+
+Movement_16953A:: @ 816953A
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_1b
+	step_end
+
+Movement_169542:: @ 8169542
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_1b
+	step_end
+
+Movement_16954A:: @ 816954A
+	step_13
+	step_10
+	step_10
+	step_10
+	step_12
+	step_10
+	step_10
+	step_1b
+	step_end
+
+Movement_169553:: @ 8169553
+	step_1c
+	step_1b
+	step_30
+	step_1c
+	step_2d
+	step_end
+
+Movement_169559:: @ 8169559
+	step_1c
+	step_1b
+	step_2f
+	step_1c
+	step_2d
+	step_end
+
+PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F
+	lock
+	faceplayer
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if_eq EventScript_16958B
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
+	goto_if_eq EventScript_169581
+	msgbox gUnknown_818DC67
+	release
+	end
+
+EventScript_169581:: @ 8169581
+	msgbox gUnknown_818DCE2
+	release
+	end
+
+EventScript_16958B:: @ 816958B
+	msgbox gUnknown_818DD75
+	release
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
+	lock
+	faceplayer
+	checkflag FLAG_0x002
+	goto_if_eq EventScript_169600
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
+	goto_if_eq EventScript_169903
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
+	goto_if_eq EventScript_169A6E
+	checkflag FLAG_0x82C
+	goto_if_eq EventScript_1699CE
+	compare_var_to_value VAR_0x4052, 1
+	goto_if_eq EventScript_169903
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
+	goto_if_eq EventScript_1698D6
+	compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
+	goto_if 4, EventScript_16961E
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
+	goto_if_eq EventScript_169614
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if_eq EventScript_16960A
+	msgbox gUnknown_818E116
+	release
+	end
+
+EventScript_169600:: @ 8169600
+	msgbox gUnknown_81A72AD
+	release
+	end
+
+EventScript_16960A:: @ 816960A
+	msgbox gUnknown_818E330
+	release
+	end
+
+EventScript_169614:: @ 8169614
+	msgbox gUnknown_818E3AD
+	release
+	end
+
+EventScript_16961E:: @ 816961E
+	msgbox gUnknown_818E405
+	textcolor 3
+	playfanfare MUS_ME_WAZA
+	message Text_18E4AF
+	waitmessage
+	waitfanfare
+	call EventScript_1A6675
+	removeitem ITEM_OAKS_PARCEL, 1
+	msgbox gUnknown_818E4CA
+	playbgm BGM_FRLG_RIVAL, 0
+	msgbox gUnknown_818DE8D
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169A82
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_169AC1
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_169A9E
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_169A9E
+	fadedefaultbgm
+	msgbox gUnknown_818DE99
+	closemessage
+	delay 30
+	playse SE_PIN
+	applymovement 4, Movement_1A75DB
+	waitmovement 0
+	applymovement 4, Movement_1A75DD
+	waitmovement 0
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_169ADD
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_169B14
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_169AF5
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169B86
+	msgbox gUnknown_818E508
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169882
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_16988D
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_1698A6
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_1698B8
+	msgbox gUnknown_818E536
+	closemessage
+	delay 40
+	msgbox gUnknown_818E5C5
+	closemessage
+	applymovement 4, Movement_1A75E9
+	waitmovement 0
+	removeobject 9
+	delay 10
+	removeobject 10
+	delay 25
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169845
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_169850
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_16985B
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_16986D
+	delay 10
+	textcolor 3
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_18E5EA
+	waitmessage
+	waitfanfare
+	call EventScript_1A6675
+	setflag FLAG_0x829
+	special sub_810B810
+	setvar VAR_0x407C, 1
+	msgbox gUnknown_818E612
+	additem ITEM_POKE_BALL, 5
+	giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5
+	msgbox gUnknown_818E6D0
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_818E784
+	msgbox gUnknown_818DEC8
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169B33
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_169B45
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_169B57
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_169B57
+	msgbox gUnknown_818DEF3
+	closemessage
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169B69
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_169B7B
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_169B7B
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_169B7B
+	removeobject 8
+	fadedefaultbgm
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
+	setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2
+	setvar VAR_0x4051, 1
+	setvar VAR_0x4058, 1
+	setvar VAR_0x4054, 1
+	release
+	end
+
+EventScript_169845:: @ 8169845
+	applymovement 4, Movement_16987C
+	waitmovement 0
+	return
+
+EventScript_169850:: @ 8169850
+	applymovement 4, Movement_16987F
+	waitmovement 0
+	return
+
+EventScript_16985B:: @ 816985B
+	applymovement 4, Movement_16987C
+	applymovement 255, Movement_169878
+	waitmovement 0
+	return
+
+EventScript_16986D:: @ 816986D
+	applymovement 4, Movement_16987C
+	waitmovement 0
+	return
+
+Movement_169878:: @ 8169878
+	step_1c
+	step_1b
+	step_30
+	step_end
+
+Movement_16987C:: @ 816987C
+	step_13
+	step_10
+	step_end
+
+Movement_16987F:: @ 816987F
+	step_10
+	step_13
+	step_end
+
+EventScript_169882:: @ 8169882
+	applymovement 4, Movement_1698CB
+	waitmovement 0
+	return
+
+EventScript_16988D:: @ 816988D
+	applymovement 4, Movement_1698D0
+	applymovement 255, Movement_1698C7
+	applymovement 8, Movement_1698C7
+	waitmovement 4
+	return
+
+EventScript_1698A6:: @ 81698A6
+	applymovement 4, Movement_1698CB
+	applymovement 255, Movement_1698C3
+	waitmovement 4
+	return
+
+EventScript_1698B8:: @ 81698B8
+	applymovement 4, Movement_1698CB
+	waitmovement 0
+	return
+
+Movement_1698C3:: @ 81698C3
+	step_1c
+	step_1b
+	step_2e
+	step_end
+
+Movement_1698C7:: @ 81698C7
+	step_1c
+	step_1b
+	step_2f
+	step_end
+
+Movement_1698CB:: @ 81698CB
+	step_11
+	step_12
+	step_1c
+	step_2d
+	step_end
+
+Movement_1698D0:: @ 81698D0
+	step_12
+	step_12
+	step_11
+	step_1c
+	step_30
+	step_end
+
+EventScript_1698D6:: @ 81698D6
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, Special_GetPokedexCount
+	copyvar VAR_0x8008, VAR_0x8005
+	copyvar VAR_0x8009, VAR_0x8006
+	getnumberstring 0, VAR_0x8008
+	getnumberstring 1, VAR_0x8009
+	compare_var_to_value VAR_0x8009, 1
+	goto_if_eq EventScript_1699FB
+	goto EventScript_169903
+	end
+
+EventScript_169903:: @ 8169903
+	call EventScript_1A737B
+	checkflag FLAG_0x2F4
+	goto_if_eq EventScript_169913
+	release
+	end
+
+EventScript_169913:: @ 8169913
+	closemessage
+	delay 40
+	message Text_1A7291
+	waitmessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_169964
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_16996F
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_16997A
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_169985
+	applymovement 4, Movement_1A75E1
+	waitmovement 0
+	closemessage
+	delay 70
+	msgbox gUnknown_81A72AD
+	setflag FLAG_0x002
+	release
+	end
+
+EventScript_169964:: @ 8169964
+	applymovement 4, Movement_169990
+	waitmovement 0
+	return
+
+EventScript_16996F:: @ 816996F
+	applymovement 4, Movement_169997
+	waitmovement 0
+	return
+
+EventScript_16997A:: @ 816997A
+	applymovement 4, Movement_16999E
+	waitmovement 0
+	return
+
+EventScript_169985:: @ 8169985
+	applymovement 4, Movement_1699A5
+	waitmovement 0
+	return
+
+Movement_169990:: @ 8169990
+	step_25
+	step_29
+	step_25
+	step_25
+	step_29
+	step_25
+	step_end
+
+Movement_169997:: @ 8169997
+	step_26
+	step_2a
+	step_26
+	step_26
+	step_2a
+	step_26
+	step_end
+
+Movement_16999E:: @ 816999E
+	step_27
+	step_2b
+	step_27
+	step_27
+	step_2b
+	step_27
+	step_end
+
+Movement_1699A5:: @ 81699A5
+	step_28
+	step_2c
+	step_28
+	step_28
+	step_2c
+	step_28
+	step_end
+
+Movement_1699AC:: @ 81699AC
+	step_12
+	step_2d
+	step_1b
+	step_30
+	step_1b
+	step_2e
+	step_1b
+	step_2f
+	step_1b
+	step_2d
+	step_1b
+	step_13
+	step_13
+	step_2e
+	step_1b
+	step_2f
+	step_1b
+	step_2d
+	step_1b
+	step_30
+	step_1b
+	step_2e
+	step_1b
+	step_12
+	step_end
+
+Movement_1699C5:
+	step_11
+	step_10
+	step_10
+	step_25
+	step_11
+	step_1c
+	step_1c
+	step_1c
+	step_end
+
+EventScript_1699CE:: @ 81699CE
+	call EventScript_1A737B
+	closemessage
+	compare_var_to_value VAR_0x8009, 60
+	goto_if 0, EventScript_1699F9
+	checkflag FLAG_SYS_RIBBON_GET
+	goto_if 0, EventScript_1699F9
+	delay 30
+	msgbox gUnknown_818EDF5
+	goto EventScript_169035
+	end
+
+EventScript_1699F9:: @ 81699F9
+	release
+	end
+
+EventScript_1699FB:: @ 81699FB
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	checkflag FLAG_0x24F
+	goto_if_eq EventScript_169A6E
+	checkflag FLAG_0x247
+	goto_if_eq EventScript_169A78
+	checkitem ITEM_POKE_BALL, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_169A34
+	goto EventScript_169A6E
+	end
+
+EventScript_169A34:: @ 8169A34
+	compare_var_to_value VAR_0x4054, 2
+	goto_if 4, EventScript_169A45
+	goto EventScript_169A6E
+	end
+
+EventScript_169A45:: @ 8169A45
+	msgbox gUnknown_818E89C
+	additem ITEM_POKE_BALL, 5
+	giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5
+	setflag FLAG_0x247
+	release
+	end
+
+EventScript_169A6E:: @ 8169A6E
+	msgbox gUnknown_818E871
+	release
+	end
+
+EventScript_169A78:: @ 8169A78
+	msgbox gUnknown_818E98E
+	release
+	end
+
+EventScript_169A82:: @ 8169A82
+	setobjectxyperm 8, 5, 10
+	addobject 8
+	applymovement 255, Movement_169B94
+	applymovement 8, Movement_169B9D
+	waitmovement 0
+	return
+
+EventScript_169A9E:: @ 8169A9E
+	setobjectxyperm 8, 6, 10
+	addobject 8
+	applymovement 4, Movement_1A75ED
+	applymovement 255, Movement_169B91
+	applymovement 8, Movement_169B9D
+	waitmovement 0
+	return
+
+EventScript_169AC1:: @ 8169AC1
+	setobjectxyperm 8, 6, 10
+	addobject 8
+	applymovement 4, Movement_1A75ED
+	applymovement 8, Movement_169B9D
+	waitmovement 0
+	return
+
+EventScript_169ADD:: @ 8169ADD
+	applymovement 4, Movement_1A75E1
+	waitmovement 0
+	delay 15
+	applymovement 4, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_169AF5:: @ 8169AF5
+	applymovement 4, Movement_1A75E1
+	waitmovement 0
+	delay 15
+	applymovement 255, Movement_1A75E7
+	applymovement 4, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_169B14:: @ 8169B14
+	applymovement 4, Movement_1A75E1
+	waitmovement 0
+	delay 15
+	applymovement 255, Movement_1A75EB
+	applymovement 4, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_169B33:: @ 8169B33
+	applymovement 8, Movement_1A75E1
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_169B45:: @ 8169B45
+	applymovement 8, Movement_1A75E9
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_169B57:: @ 8169B57
+	applymovement 8, Movement_1A75E1
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_169B69:: @ 8169B69
+	applymovement 255, Movement_169B91
+	applymovement 8, Movement_169BA4
+	waitmovement 0
+	return
+
+EventScript_169B7B:: @ 8169B7B
+	applymovement 8, Movement_169BA4
+	waitmovement 0
+	return
+
+EventScript_169B86:: @ 8169B86
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+Movement_169B91:: @ 8169B91
+	step_1a
+	step_2d
+	step_end
+
+Movement_169B94:: @ 8169B94
+	step_2d
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1b
+	step_2f
+	step_end
+
+Movement_169B9D:: @ 8169B9D
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_169BA4:: @ 8169BA4
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB
+	lock
+	faceplayer
+	setvar VAR_0x4001, 0
+	setvar VAR_0x4002, 1
+	setvar VAR_0x4003, 4
+	setvar VAR_0x4004, 7
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if 4, EventScript_169DE4
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
+	goto_if_eq EventScript_169BE1
+	msgbox gUnknown_818EA19
+	release
+	end
+
+EventScript_169BE1:: @ 8169BE1
+	applymovement 4, Movement_1A75EF
+	waitmovement 0
+	drawmonpic VAR_0x4002, 10, 3
+	textcolor 0
+	compare_var_to_value VAR_0x4001, 0
+	goto_if_eq EventScript_169C14
+	compare_var_to_value VAR_0x4001, 1
+	goto_if_eq EventScript_169C33
+	compare_var_to_value VAR_0x4001, 2
+	goto_if_eq EventScript_169C52
+	end
+
+EventScript_169C14:: @ 8169C14
+	msgbox gUnknown_818E272, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_169C74
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_169C71
+	end
+
+EventScript_169C33:: @ 8169C33
+	msgbox gUnknown_818E207, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_169C74
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_169C71
+	end
+
+EventScript_169C52:: @ 8169C52
+	msgbox gUnknown_818E194, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_169C74
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_169C71
+	end
+
+EventScript_169C71:: @ 8169C71
+	erasemonpic
+	release
+	end
+
+EventScript_169C74:: @ 8169C74
+	erasemonpic
+	removeobject VAR_LAST_TALKED
+	msgbox gUnknown_818E2E5
+	call EventScript_1A6675
+	setflag FLAG_0x828
+	setflag FLAG_0x291
+	givemon VAR_0x4002, 5, ITEM_NONE, 0, 0, 0
+	copyvar VAR_STARTER_MON, VAR_0x4001
+	getspeciesname 0, VAR_0x4002
+	message Text_18E30D
+	waitmessage
+	playfanfare BGM_FRLG_ME_KEYITEM
+	waitfanfare
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_169CCC
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_169CDC
+	end
+
+EventScript_169CCC:: @ 8169CCC
+	setvar VAR_0x8004, 0
+	call EventScript_1A74EB
+	goto EventScript_169CDC
+	end
+
+EventScript_169CDC:: @ 8169CDC
+	closemessage
+	compare_var_to_value VAR_0x4001, 0
+	goto_if_eq EventScript_169CFF
+	compare_var_to_value VAR_0x4001, 1
+	goto_if_eq EventScript_169D1F
+	compare_var_to_value VAR_0x4001, 2
+	goto_if_eq EventScript_169D0F
+	end
+
+EventScript_169CFF:: @ 8169CFF
+	applymovement 8, Movement_169D62
+	waitmovement 0
+	goto EventScript_169D2F
+	end
+
+EventScript_169D0F:: @ 8169D0F
+	applymovement 8, Movement_169D6B
+	waitmovement 0
+	goto EventScript_169D2F
+	end
+
+EventScript_169D1F:: @ 8169D1F
+	applymovement 8, Movement_169D72
+	waitmovement 0
+	goto EventScript_169D2F
+	end
+
+EventScript_169D2F:: @ 8169D2F
+	textcolor 0
+	msgbox gUnknown_818DD34
+	removeobject VAR_0x4004
+	textcolor 3
+	getspeciesname 0, VAR_0x4003
+	message Text_18DD52
+	waitmessage
+	playfanfare BGM_FRLG_ME_KEYITEM
+	waitfanfare
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	checkflag FLAG_0x83E
+	call_if 1, EventScript_169D5C
+	release
+	end
+
+EventScript_169D5C:: @ 8169D5C
+	setvar VAR_0x4070, 1
+	return
+
+Movement_169D62:: @ 8169D62
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_11
+	step_end
+
+Movement_169D6B:: @ 8169D6B
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2e
+	step_end
+
+Movement_169D72:: @ 8169D72
+	step_10
+	step_13
+	step_13
+	step_13
+	step_2e
+	step_end
+
+PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78
+	lock
+	faceplayer
+	setvar VAR_0x4001, 1
+	setvar VAR_0x4002, 7
+	setvar VAR_0x4003, 1
+	setvar VAR_0x4004, 5
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if 4, EventScript_169DE4
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
+	goto_if_eq EventScript_169BE1
+	msgbox gUnknown_818EA19
+	release
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE
+	lock
+	faceplayer
+	setvar VAR_0x4001, 2
+	setvar VAR_0x4002, 4
+	setvar VAR_0x4003, 7
+	setvar VAR_0x4004, 6
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
+	goto_if 4, EventScript_169DE4
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
+	goto_if_eq EventScript_169BE1
+	msgbox gUnknown_818EA19
+	release
+	end
+
+EventScript_169DE4:: @ 8169DE4
+	msgbox gUnknown_818EA45
+	release
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE
+	lock
+	faceplayer
+	checkflag FLAG_0x82C
+	goto_if_eq EventScript_169E03
+	msgbox gUnknown_818EBE6
+	release
+	end
+
+EventScript_169E03:: @ 8169E03
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 5
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_818ED15
+	release
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A
+	lock
+	faceplayer
+	checkflag FLAG_0x82C
+	goto_if_eq EventScript_169E2F
+	msgbox gUnknown_818EBE6
+	release
+	end
+
+EventScript_169E2F:: @ 8169E2F
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_818EC0B
+	release
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46
+	lock
+	faceplayer
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_818ED81
+	release
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F
+	msgbox gUnknown_818E9E5, 2
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68
+	msgbox gUnknown_818EAF4, 3
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71
+	msgbox gUnknown_818EA66, 3
+	end
+
+PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A
+	lockall
+	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
+	goto_if 4, EventScript_169E90
+	msgbox gUnknown_818EA84
+	releaseall
+	end
+
+EventScript_169E90:: @ 8169E90
+	msgbox gUnknown_818EAB6
+	releaseall
+	end
diff --git a/data/maps/PalletTown_ProfessorOaksLab/text.inc b/data/maps/PalletTown_ProfessorOaksLab/text.inc
new file mode 100644
index 000000000..3d0c7ba57
--- /dev/null
+++ b/data/maps/PalletTown_ProfessorOaksLab/text.inc
@@ -0,0 +1,356 @@
+gUnknown_818DC67:: @ 818DC67
+    .string "{RIVAL}: What, it's only {PLAYER}?\n"
+    .string "Gramps isn't around.$"
+
+gUnknown_818DC94:: @ 818DC94
+    .string "{RIVAL}: Gramps!\n"
+    .string "I'm fed up with waiting!$"
+
+gUnknown_818DCB9:: @ 818DCB9
+    .string "{RIVAL}: Hey! Gramps! No fair!\n"
+    .string "What about me?$"
+
+gUnknown_818DCE2:: @ 818DCE2
+    .string "{RIVAL}: Heh, I don't need to be\n"
+    .string "greedy like you. I'm mature!\p"
+    .string "Go ahead and choose, {PLAYER}!$"
+
+gUnknown_818DD34:: @ 818DD34
+    .string "{RIVAL}: I'll take this one, then!$"
+
+Text_18DD52:: @ 818DD52
+    .string "{RIVAL} received the {STR_VAR_1}\n"
+    .string "from PROF. OAK!$"
+
+gUnknown_818DD75:: @ 818DD75
+    .string "{RIVAL}: My POKéMON looks a lot\n"
+    .string "tougher than yours.$"
+
+gUnknown_818DDA4:: @ 818DDA4
+    .string "{RIVAL}: Wait, {PLAYER}!\n"
+    .string "Let's check out our POKéMON!\p"
+    .string "Come on, I'll take you on!$"
+
+Text_18DDEA:: @ 818DDEA
+    .string "WHAT?\n"
+    .string "Unbelievable!\l"
+    .string "I picked the wrong POKéMON!$"
+
+Text_18DE1A:: @ 818DE1A
+    .string "{RIVAL}: Yeah!\n"
+    .string "Am I great or what?$"
+
+gUnknown_818DE38:: @ 818DE38
+    .string "{RIVAL}: Okay! I'll make my\n"
+    .string "POKéMON battle to toughen it up!\p"
+    .string "{PLAYER}! Gramps!\n"
+    .string "Smell you later!$"
+
+gUnknown_818DE8D:: @ 818DE8D
+    .string "{RIVAL}: Gramps!$"
+
+gUnknown_818DE99:: @ 818DE99
+    .string "{RIVAL}: I almost forgot!\n"
+    .string "What did you call me for?$"
+
+gUnknown_818DEC8:: @ 818DEC8
+    .string "{RIVAL}: All right, Gramps!\n"
+    .string "Leave it all to me!$"
+
+gUnknown_818DEF3:: @ 818DEF3
+    .string "{PLAYER}, I hate to say it, but you\n"
+    .string "won't be necessary for this.\p"
+    .string "I know! I'll borrow a TOWN MAP\n"
+    .string "from my sis!\p"
+    .string "I'll tell her not to lend you one,\n"
+    .string "{PLAYER}! Hahaha!\p"
+    .string "Don't bother coming around to\n"
+    .string "my place after this!$"
+
+gUnknown_818DFBC:: @ 818DFBC
+    .string "OAK: {RIVAL}?\n"
+    .string "Let me think…\p"
+    .string "Oh, that's right, I told you to\n"
+    .string "come! Just wait!\p"
+    .string "Here, {PLAYER}.\p"
+    .string "There are three POKéMON here.\p"
+    .string "Haha!\p"
+    .string "The POKéMON are held inside\n"
+    .string "these POKé BALLS.\p"
+    .string "When I was young, I was a serious\n"
+    .string "POKéMON TRAINER.\p"
+    .string "But now, in my old age, I have\n"
+    .string "only these three left.\p"
+    .string "You can have one.\n"
+    .string "Go on, choose!$"
+
+gUnknown_818E0EA:: @ 818E0EA
+    .string "OAK: Be patient, {RIVAL}.\n"
+    .string "You can have one, too!$"
+
+gUnknown_818E116:: @ 818E116
+    .string "OAK: Now, {PLAYER}.\p"
+    .string "Inside those three POKé BALLS are\n"
+    .string "POKéMON.\p"
+    .string "Which one will you choose for\n"
+    .string "yourself?$"
+
+gUnknown_818E177:: @ 818E177
+    .string "OAK: Hey!\n"
+    .string "Don't go away yet!$"
+
+gUnknown_818E194:: @ 818E194
+    .string "Ah! CHARMANDER is your choice.\n"
+    .string "You should raise it patiently.\p"
+    .string "So, {PLAYER}, you're claiming the\n"
+    .string "FIRE POKéMON CHARMANDER?$"
+
+gUnknown_818E207:: @ 818E207
+    .string "Hm! SQUIRTLE is your choice.\n"
+    .string "It's one worth raising.\p"
+    .string "So, {PLAYER}, you've decided on the\n"
+    .string "WATER POKéMON SQUIRTLE?$"
+
+gUnknown_818E272:: @ 818E272
+    .string "I see! BULBASAUR is your choice.\n"
+    .string "It's very easy to raise.\p"
+    .string "So, {PLAYER}, you want to go with\n"
+    .string "the GRASS POKéMON BULBASAUR?$"
+
+gUnknown_818E2E5:: @ 818E2E5
+    .string "This POKéMON is really quite\n"
+    .string "energetic!$"
+
+Text_18E30D:: @ 818E30D
+    .string "{PLAYER} received the {STR_VAR_1}\n"
+    .string "from PROF. OAK!$"
+
+gUnknown_818E330:: @ 818E330
+    .string "OAK: If a wild POKéMON appears,\n"
+    .string "your POKéMON can battle it.\p"
+    .string "With it at your side, you should be\n"
+    .string "able to reach the next town.$"
+
+gUnknown_818E3AD:: @ 818E3AD
+    .string "OAK: {PLAYER}, raise your young\n"
+    .string "POKéMON by making it battle.\p"
+    .string "It has to battle for it to grow.$"
+
+gUnknown_818E405:: @ 818E405
+    .string "OAK: Oh, {PLAYER}!\n"
+    .string "How is my old POKéMON?\p"
+    .string "Well, it seems to be growing more\n"
+    .string "attached to you.\p"
+    .string "You must be talented as a POKéMON\n"
+    .string "TRAINER.\p"
+    .string "What's that?\n"
+    .string "You have something for me?$"
+
+Text_18E4AF:: @ 818E4AF
+    .string "{PLAYER} delivered OAK'S PARCEL.$"
+
+gUnknown_818E4CA:: @ 818E4CA
+    .string "Ah! \n"
+    .string "It's the custom POKé BALL!\p"
+    .string "I had it on order.\n"
+    .string "Thank you!$"
+
+gUnknown_818E508:: @ 818E508
+    .string "OAK: Oh, right!\n"
+    .string "I have a request for you two.$"
+
+gUnknown_818E536:: @ 818E536
+    .string "On the desk there is my invention,\n"
+    .string "the POKéDEX!\p"
+    .string "It automatically records data on\n"
+    .string "POKéMON you've seen or caught.\p"
+    .string "It's a high-tech encyclopedia!$"
+
+gUnknown_818E5C5:: @ 818E5C5
+    .string "OAK: {PLAYER} and {RIVAL}.\n"
+    .string "Take these with you.$"
+
+Text_18E5EA:: @ 818E5EA
+    .string "{PLAYER} received the POKéDEX\n"
+    .string "from PROF. OAK.$"
+
+gUnknown_818E612:: @ 818E612
+    .string "OAK: You can't get detailed data\n"
+    .string "on POKéMON by just seeing them.\p"
+    .string "You must catch them to obtain\n"
+    .string "complete data.\p"
+    .string "So, here are some tools for\n"
+    .string "catching wild POKéMON.$"
+
+gUnknown_818E6B3:: @ 818E6B3
+    .string "{PLAYER} received five POKé BALLS.$"
+
+gUnknown_818E6D0:: @ 818E6D0
+    .string "When a wild POKéMON appears,\n"
+    .string "it's fair game.\p"
+    .string "Just throw a POKé BALL at it and\n"
+    .string "try to catch it!\p"
+    .string "This won't always work, however.\p"
+    .string "A healthy POKéMON can escape.\n"
+    .string "You have to be lucky!$"
+
+gUnknown_818E784:: @ 818E784
+    .string "To make a complete guide on all\n"
+    .string "the POKéMON in the world…\p"
+    .string "That was my dream!\p"
+    .string "But, I'm too old.\n"
+    .string "I can't get the job done.\p"
+    .string "So, I want you two to fulfill my\n"
+    .string "dream for me.\p"
+    .string "Get moving, you two.\p"
+    .string "This is a great undertaking in\n"
+    .string "POKéMON history!$"
+
+gUnknown_818E871:: @ 818E871
+    .string "POKéMON around the world wait for\n"
+    .string "you, {PLAYER}!$"
+
+gUnknown_818E89C:: @ 818E89C
+    .string "Ah, {PLAYER}!\n"
+    .string "How is your POKéDEX shaping up?\p"
+    .string "{RIVAL} has already caught some\n"
+    .string "POKéMON and added to the data.\p"
+    .string "So, {PLAYER}, let's have a look at\n"
+    .string "your POKéDEX.\p"
+    .string "…What's the matter?\n"
+    .string "You've added no new data at all.\p"
+    .string "I'll give you these, so do try a\n"
+    .string "little harder.$"
+
+gUnknown_818E98E:: @ 818E98E
+    .string "OAK: Come see me sometime.\p"
+    .string "After all, I want to know how your\n"
+    .string "POKéDEX is coming along.$"
+
+gUnknown_818E9E5:: @ 818E9E5
+    .string "It's like an encyclopedia, but the\n"
+    .string "pages are blank.$"
+
+gUnknown_818EA19:: @ 818EA19
+    .string "Those are POKé BALLS.\n"
+    .string "They contain POKéMON!$"
+
+gUnknown_818EA45:: @ 818EA45
+    .string "That's PROF. OAK's last POKéMON.$"
+
+gUnknown_818EA66:: @ 818EA66
+    .string "Press START to open the MENU!$"
+
+gUnknown_818EA84:: @ 818EA84
+    .string "The SAVE option is on the MENU.\n"
+    .string "Use it regularly.$"
+
+gUnknown_818EAB6:: @ 818EAB6
+    .string "All POKéMON types have strong and\n"
+    .string "weak points against others.$"
+
+gUnknown_818EAF4:: @ 818EAF4
+    .string "There's an e-mail message here.\p"
+    .string "…\p"
+    .string "Finally!\n"
+    .string "The ultimate TRAINERS of the\l"
+    .string "POKéMON LEAGUE are ready to\l"
+    .string "take on all comers!\p"
+    .string "Bring your best POKéMON and see\n"
+    .string "how you rate as a TRAINER!\p"
+    .string "POKéMON LEAGUE HQ\n"
+    .string "INDIGO PLATEAU\p"
+    .string "PROF. OAK, please visit us!\n"
+    .string "…$"
+
+gUnknown_818EBE6:: @ 818EBE6
+    .string "I study POKéMON as PROF. OAK's\n"
+    .string "AIDE.$"
+
+gUnknown_818EC0B:: @ 818EC0B
+    .string "Hi, {PLAYER}. I bet you've become\n"
+    .string "good friends with your POKéMON.\p"
+    .string "By the way, did you know about\n"
+    .string "DAISY?\p"
+    .string "If you show DAISY your POKéMON,\n"
+    .string "she can tell how much it likes you.\p"
+    .string "Occasionally, she will even groom\n"
+    .string "a POKéMON for you.\p"
+    .string "This is a secret, so please don't\n"
+    .string "tell anyone.$"
+
+gUnknown_818ED15:: @ 818ED15
+    .string "PROF. OAK is going to have his own\n"
+    .string "radio show soon.\p"
+    .string "The program will be called PROF.\n"
+    .string "OAK's POKéMON SEMINAR.$"
+
+gUnknown_818ED81:: @ 818ED81
+    .string "PROF. OAK may not look like much,\n"
+    .string "but he's the authority on POKéMON.\p"
+    .string "Many POKéMON TRAINERS hold him in\n"
+    .string "high regard.$"
+
+gUnknown_818EDF5:: @ 818EDF5
+    .string "Ah, now this is excellent!\p"
+    .string "{PLAYER}, I have another important\n"
+    .string "favor to ask of you.\p"
+    .string "I need you to listen closely.$"
+
+gUnknown_818EE60:: @ 818EE60
+    .string "Recently, there have been sightings\n"
+    .string "of many rare POKéMON species.\p"
+    .string "I'm talking about POKéMON that\n"
+    .string "have never been seen in KANTO.\p"
+    .string "I would love to go see things for\n"
+    .string "myself, but I'm much too old.\p"
+    .string "Since I can't do it, {PLAYER}, I'd\n"
+    .string "like you to go in my place.$"
+
+gUnknown_818EF59:: @ 818EF59
+    .string "{RIVAL}: Hey, I heard that!\p"
+    .string "Gramps, what's with favoring\n"
+    .string "{PLAYER} over me all the time?\p"
+    .string "I went and collected more POKéMON,\n"
+    .string "and faster, too.\p"
+    .string "You should just let me handle\n"
+    .string "everything.$"
+
+gUnknown_818F004:: @ 818F004
+    .string "OAK: I know, I know.\n"
+    .string "Of course I need your help, too.\p"
+    .string "Now, I need to see both your\n"
+    .string "POKéDEXES.$"
+
+gUnknown_818F062:: @ 818F062
+    .string "PROF. OAK took both POKéDEX\n"
+    .string "units.$"
+
+gUnknown_818F085:: @ 818F085
+    .string "… … …  … … …\p"
+    .string "… … …  … … …\p"
+    .string "…And that's done!\p"
+    .string "Now these units can record data on\n"
+    .string "a lot more POKéMON.$"
+
+Text_18F0E8:: @ 818F0E8
+    .string "{PLAYER}'s POKéDEX was upgraded!$"
+
+gUnknown_818F103:: @ 818F103
+    .string "Now, {PLAYER} and {RIVAL}!\p"
+    .string "This time, you really must work\n"
+    .string "towards filling your POKéDEXES.\p"
+    .string "I urge you to make them the best\n"
+    .string "and the most complete of all time!\p"
+    .string "Truly, this is a monumentally great\n"
+    .string "undertaking in POKéMON history!$"
+
+gUnknown_818F1DB:: @ 818F1DB
+    .string "{RIVAL}: Gramps, calm down.\n"
+    .string "Don't get so excited.\p"
+    .string "I'll get the POKéDEX completed,\n"
+    .string "don't you worry about a thing.\p"
+    .string "I think I'll try looking around\n"
+    .string "ONE ISLAND first…\p"
+    .string "Anyways, I'm outta here!$"
+
diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json
new file mode 100644
index 000000000..4db31c4ce
--- /dev/null
+++ b/data/maps/PewterCity/map.json
@@ -0,0 +1,281 @@
+{
+  "id": "MAP_PEWTER_CITY",
+  "name": "PewterCity",
+  "layout": "LAYOUT_PEWTER_CITY",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE2",
+      "offset": 12,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE3",
+      "offset": 10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 6,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_EventScript_166075",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 33,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_EventScript_16607E",
+      "flag": "80"
+    },
+    {
+      "graphics_id": "27",
+      "x": 21,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_EventScript_16622B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 33,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_EventScript_166244",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 42,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_EventScript_165B9D",
+      "flag": "46"
+    },
+    {
+      "graphics_id": "95",
+      "x": 30,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "55",
+      "x": 46,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_EventScript_1662A9",
+      "flag": "146"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 25,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 15,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY_GYM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 28,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY_MART",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 33,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY_HOUSE1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 17,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 30,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY_HOUSE2",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 42,
+      "y": 21,
+      "elevation": 3,
+      "var": "VAR_0x406C",
+      "var_value": 0,
+      "script": "PewterCity_EventScript_165D8E"
+    },
+    {
+      "type": "trigger",
+      "x": 42,
+      "y": 22,
+      "elevation": 3,
+      "var": "VAR_0x406C",
+      "var_value": 0,
+      "script": "PewterCity_EventScript_165D9A"
+    },
+    {
+      "type": "trigger",
+      "x": 42,
+      "y": 23,
+      "elevation": 3,
+      "var": "VAR_0x406C",
+      "var_value": 0,
+      "script": "PewterCity_EventScript_165DA6"
+    },
+    {
+      "type": "trigger",
+      "x": 43,
+      "y": 23,
+      "elevation": 3,
+      "var": "VAR_0x406C",
+      "var_value": 0,
+      "script": "PewterCity_EventScript_165DB2"
+    },
+    {
+      "type": "trigger",
+      "x": 46,
+      "y": 21,
+      "elevation": 3,
+      "var": "VAR_0x406C",
+      "var_value": 1,
+      "script": "PewterCity_EventScript_1662B7"
+    },
+    {
+      "type": "trigger",
+      "x": 46,
+      "y": 22,
+      "elevation": 3,
+      "var": "VAR_0x406C",
+      "var_value": 1,
+      "script": "PewterCity_EventScript_1662C4"
+    },
+    {
+      "type": "trigger",
+      "x": 46,
+      "y": 23,
+      "elevation": 3,
+      "var": "VAR_0x406C",
+      "var_value": 1,
+      "script": "PewterCity_EventScript_1662D1"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 19,
+      "y": 7,
+      "elevation": 0,
+      "script": "PewterCity_EventScript_16627F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 39,
+      "y": 19,
+      "elevation": 0,
+      "script": "PewterCity_EventScript_166276"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 16,
+      "elevation": 0,
+      "script": "PewterCity_EventScript_166288"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 20,
+      "y": 30,
+      "elevation": 0,
+      "script": "PewterCity_EventScript_16626D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 31,
+      "y": 25,
+      "elevation": 0,
+      "script": "PewterCity_EventScript_1662A0"
+    },
+    {
+      "type": "hidden_item",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "item": "POCKET_TM_CASE",
+      "flag": "112",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc
new file mode 100644
index 000000000..465f47f76
--- /dev/null
+++ b/data/maps/PewterCity/scripts.inc
@@ -0,0 +1,1590 @@
+PewterCity_MapScripts:: @ 8165B8E
+	map_script 3, PewterCity_MapScript1_165B94
+	.byte 0
+
+PewterCity_MapScript1_165B94:: @ 8165B94
+	setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY
+	setvar VAR_0x4061, 0
+	end
+
+PewterCity_EventScript_165B9D:: @ 8165B9D
+	lock
+	faceplayer
+	msgbox gUnknown_817E67E
+	closemessage
+	playbgm BGM_FRLG_FOLLOW_ME, 0
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_165BD3
+	msgbox gUnknown_817E6C7
+	closemessage
+	applymovement 5, Movement_165D83
+	waitmovement 0
+	fadedefaultbgm
+	removeobject 5
+	clearflag FLAG_0x02E
+	release
+	end
+
+EventScript_165BD3:: @ 8165BD3
+	applymovement 255, Movement_165C3C
+	applymovement 5, Movement_165CDE
+	waitmovement 0
+	applymovement 255, Movement_165C41
+	applymovement 5, Movement_165CE3
+	waitmovement 0
+	return
+
+EventScript_165BF6:: @ 8165BF6
+	applymovement 255, Movement_165C80
+	applymovement 5, Movement_165D23
+	waitmovement 0
+	applymovement 255, Movement_165C82
+	applymovement 5, Movement_165D25
+	waitmovement 0
+	return
+
+EventScript_165C19:: @ 8165C19
+	applymovement 255, Movement_165CAF
+	applymovement 5, Movement_165D53
+	waitmovement 0
+	applymovement 255, Movement_165CB1
+	applymovement 5, Movement_165D55
+	waitmovement 0
+	return
+
+Movement_165C3C:: @ 8165C3C
+	step_1c
+	step_1c
+	step_1a
+	step_2d
+	step_end
+
+Movement_165C41:: @ 8165C41
+	step_10
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_165C80:: @ 8165C80
+	step_1c
+	step_end
+
+Movement_165C82:: @ 8165C82
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_end
+
+Movement_165CAF:: @ 8165CAF
+	step_1c
+	step_end
+
+Movement_165CB1:: @ 8165CB1
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_end
+
+Movement_165CDE:: @ 8165CDE
+	step_10
+	step_12
+	step_2e
+	step_26
+	step_end
+
+Movement_165CE3:: @ 8165CE3
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2f
+	step_end
+
+Movement_165D23:: @ 8165D23
+	step_28
+	step_end
+
+Movement_165D25:: @ 8165D25
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_2f
+	step_end
+
+Movement_165D53:: @ 8165D53
+	step_25
+	step_end
+
+Movement_165D55:: @ 8165D55
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_2f
+	step_end
+
+Movement_165D83:: @ 8165D83
+	step_10
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_end
+
+PewterCity_EventScript_165D8E:: @ 8165D8E
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_165DBE
+	end
+
+PewterCity_EventScript_165D9A:: @ 8165D9A
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_165DBE
+	end
+
+PewterCity_EventScript_165DA6:: @ 8165DA6
+	lockall
+	setvar VAR_0x4001, 2
+	goto EventScript_165DBE
+	end
+
+PewterCity_EventScript_165DB2:: @ 8165DB2
+	lockall
+	setvar VAR_0x4001, 3
+	goto EventScript_165DBE
+	end
+
+EventScript_165DBE:: @ 8165DBE
+	textcolor 0
+	msgbox gUnknown_817E67E
+	closemessage
+	playbgm BGM_FRLG_FOLLOW_ME, 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_165E0A
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_165E26
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_165E42
+	msgbox gUnknown_817E6C7
+	closemessage
+	applymovement 5, Movement_165D83
+	waitmovement 0
+	fadedefaultbgm
+	removeobject 5
+	clearflag FLAG_0x02E
+	releaseall
+	end
+
+EventScript_165E0A:: @ 8165E0A
+	applymovement 5, Movement_165F6C
+	waitmovement 0
+	applymovement 255, Movement_165E7A
+	applymovement 5, Movement_165F7F
+	waitmovement 0
+	return
+
+EventScript_165E26:: @ 8165E26
+	applymovement 5, Movement_165F71
+	waitmovement 0
+	applymovement 255, Movement_165EB9
+	applymovement 5, Movement_165FBF
+	waitmovement 0
+	return
+
+EventScript_165E42:: @ 8165E42
+	applymovement 5, Movement_165F74
+	waitmovement 0
+	applymovement 255, Movement_165EF9
+	applymovement 5, Movement_166000
+	waitmovement 0
+	return
+
+EventScript_165E5E:: @ 8165E5E
+	applymovement 5, Movement_165F78
+	waitmovement 0
+	applymovement 255, Movement_165F3A
+	applymovement 5, Movement_166042
+	waitmovement 0
+	return
+
+Movement_165E7A:: @ 8165E7A
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_165EB9:: @ 8165EB9
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_165EF9:: @ 8165EF9
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_165F3A:: @ 8165F3A
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_end
+
+Movement_165F6C:: @ 8165F6C
+	step_12
+	step_10
+	step_30
+	step_28
+	step_end
+
+Movement_165F71:: @ 8165F71
+	step_10
+	step_25
+	step_end
+
+Movement_165F74:: @ 8165F74
+	step_10
+	step_10
+	step_25
+	step_end
+
+Movement_165F78:: @ 8165F78
+	step_10
+	step_10
+	step_13
+	step_10
+	step_13
+	step_28
+	step_end
+
+Movement_165F7F:: @ 8165F7F
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2f
+	step_end
+
+Movement_165FBF:: @ 8165FBF
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2f
+	step_end
+
+Movement_166000:: @ 8166000
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2f
+	step_end
+
+Movement_166042:: @ 8166042
+	step_12
+	step_12
+	step_12
+	step_11
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_2f
+	step_end
+
+PewterCity_EventScript_166075:: @ 8166075
+	msgbox gUnknown_817E436, 2
+	end
+
+PewterCity_EventScript_16607E:: @ 816607E
+	lock
+	faceplayer
+	msgbox gUnknown_817E53E, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_166136
+	msgbox gUnknown_817E589
+	closemessage
+	delay 10
+	playbgm BGM_FRLG_FOLLOW_ME, 0
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_1660EE
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_166100
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_166112
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_166124
+	msgbox gUnknown_817E5AC
+	closemessage
+	delay 10
+	applymovement 2, Movement_16621C
+	waitmovement 0
+	fadedefaultbgm
+	removeobject 2
+	clearflag FLAG_0x050
+	release
+	end
+
+EventScript_1660EE:: @ 81660EE
+	applymovement 2, Movement_16615C
+	applymovement 255, Movement_166140
+	waitmovement 0
+	return
+
+EventScript_166100:: @ 8166100
+	applymovement 2, Movement_166193
+	applymovement 255, Movement_166177
+	waitmovement 0
+	return
+
+EventScript_166112:: @ 8166112
+	applymovement 2, Movement_1661CA
+	applymovement 255, Movement_1661AE
+	waitmovement 0
+	return
+
+EventScript_166124:: @ 8166124
+	applymovement 2, Movement_166201
+	applymovement 255, Movement_1661E5
+	waitmovement 0
+	return
+
+EventScript_166136:: @ 8166136
+	msgbox gUnknown_817E55C
+	release
+	end
+
+Movement_166140:: @ 8166140
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_1b
+	step_2e
+	step_end
+
+Movement_16615C:: @ 816615C
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_2e
+	step_end
+
+Movement_166177:: @ 8166177
+	step_1c
+	step_1c
+	step_12
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_1b
+	step_2e
+	step_end
+
+Movement_166193:: @ 8166193
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_2e
+	step_end
+
+Movement_1661AE:: @ 81661AE
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_1b
+	step_2e
+	step_end
+
+Movement_1661CA:: @ 81661CA
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_2e
+	step_end
+
+Movement_1661E5:: @ 81661E5
+	step_13
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_1b
+	step_2e
+	step_end
+
+Movement_166201:: @ 8166201
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_2e
+	step_end
+
+Movement_16621C:: @ 816621C
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_13
+	step_end
+
+PewterCity_EventScript_16622B:: @ 816622B
+	lock
+	faceplayer
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817E49F
+	release
+	end
+
+PewterCity_EventScript_166244:: @ 8166244
+	lock
+	faceplayer
+	msgbox gUnknown_817E602, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_166263
+	msgbox gUnknown_817E644
+	release
+	end
+
+EventScript_166263:: @ 8166263
+	msgbox gUnknown_817E626
+	release
+	end
+
+PewterCity_EventScript_16626D:: @ 816626D
+	msgbox gUnknown_817E6F6, 3
+	end
+
+PewterCity_EventScript_166276:: @ 8166276
+	msgbox gUnknown_817E748, 3
+	end
+
+PewterCity_EventScript_16627F:: @ 816627F
+	msgbox gUnknown_817E7C5, 3
+	end
+
+PewterCity_EventScript_166288:: @ 8166288
+	lockall
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817E7DE
+	releaseall
+	end
+
+PewterCity_EventScript_1662A0:: @ 81662A0
+	msgbox gUnknown_817E824, 3
+	end
+
+PewterCity_EventScript_1662A9:: @ 81662A9
+	lock
+	faceplayer
+	setvar VAR_0x4001, 0
+	call EventScript_1662DE
+	release
+	end
+
+PewterCity_EventScript_1662B7:: @ 81662B7
+	lockall
+	setvar VAR_0x4001, 1
+	call EventScript_1662DE
+	releaseall
+	end
+
+PewterCity_EventScript_1662C4:: @ 81662C4
+	lockall
+	setvar VAR_0x4001, 2
+	call EventScript_1662DE
+	releaseall
+	end
+
+PewterCity_EventScript_1662D1:: @ 81662D1
+	lockall
+	setvar VAR_0x4001, 3
+	call EventScript_1662DE
+	releaseall
+	end
+
+EventScript_1662DE:: @ 81662DE
+	textcolor 0
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_1663CA
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1663CA
+	compare_var_to_value VAR_0x4001, 3
+	call_if 1, EventScript_1663CA
+	waitse
+	playse SE_PIN
+	applymovement 7, Movement_1A75DB
+	waitmovement 0
+	applymovement 7, Movement_1A75DD
+	waitmovement 0
+	msgbox gUnknown_817E902
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_1663D5
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_1663DA
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1663E6
+	compare_var_to_value VAR_0x4001, 3
+	call_if 1, EventScript_1663FC
+	msgbox gUnknown_817E90C
+	textcolor 3
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_17E970
+	waitmessage
+	waitfanfare
+	msgbox gUnknown_817E99D
+	special sub_80699BC
+	signmsg
+	msgbox gUnknown_817E9C7
+	normalmsg
+	call EventScript_1A6675
+	msgbox gUnknown_817EA06
+	closemessage
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_166412
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16641D
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_166428
+	compare_var_to_value VAR_0x4001, 3
+	call_if 1, EventScript_166433
+	delay 30
+	textcolor 3
+	msgbox gUnknown_817EA36
+	closemessage
+	removeobject 7
+	setflag FLAG_0x82F
+	setvar VAR_0x406C, 2
+	return
+
+EventScript_1663CA:: @ 81663CA
+	applymovement 7, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_1663D5:: @ 81663D5
+	closemessage
+	delay 20
+	return
+
+EventScript_1663DA:: @ 81663DA
+	closemessage
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_1663E6:: @ 81663E6
+	closemessage
+	applymovement 7, Movement_16643E
+	waitmovement 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_1663FC:: @ 81663FC
+	closemessage
+	applymovement 7, Movement_166441
+	waitmovement 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_166412:: @ 8166412
+	applymovement 7, Movement_166445
+	waitmovement 0
+	return
+
+EventScript_16641D:: @ 816641D
+	applymovement 7, Movement_166450
+	waitmovement 0
+	return
+
+EventScript_166428:: @ 8166428
+	applymovement 7, Movement_16645B
+	waitmovement 0
+	return
+
+EventScript_166433:: @ 8166433
+	applymovement 7, Movement_166465
+	waitmovement 0
+	return
+
+Movement_16643E:: @ 816643E
+	step_1a
+	step_10
+	step_end
+
+Movement_166441:: @ 8166441
+	step_1a
+	step_10
+	step_10
+	step_end
+
+Movement_166445:: @ 8166445
+	step_10
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_end
+
+Movement_166450:: @ 8166450
+	step_12
+	step_10
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_end
+
+Movement_16645B:: @ 816645B
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_end
+
+Movement_166465:: @ 8166465
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_end
+
+Movement_16646F:: @ 816646F
+	step_27
+	step_end
diff --git a/data/maps/PewterCity/text.inc b/data/maps/PewterCity/text.inc
new file mode 100644
index 000000000..de975f32d
--- /dev/null
+++ b/data/maps/PewterCity/text.inc
@@ -0,0 +1,153 @@
+Text_17E316:: @ 817E316
+    .string "Yawn!\n"
+    .string "I must have dozed off in the sun.\p"
+    .string "I had this weird dream about\n"
+    .string "a DROWZEE eating my dream.\p"
+    .string "And…\n"
+    .string "I learned how to eat dreams…\p"
+    .string "Oogh, this is too spooky!\p"
+    .string "Let me teach it to a POKéMON so\n"
+    .string "I can forget about it!$"
+
+Text_17E3E9:: @ 817E3E9
+    .string "…Snore…$"
+
+Text_17E3F1:: @ 817E3F1
+    .string "Which POKéMON wants to learn\n"
+    .string "DREAM EATER?$"
+
+Text_17E41B:: @ 817E41B
+    .string "…ZZZ…\n"
+    .string "I…can't eat…anymore…$"
+
+gUnknown_817E436:: @ 817E436
+    .string "CLEFAIRY came from the moon.\n"
+    .string "That's what the rumor is.\p"
+    .string "They appeared after MOON STONES\n"
+    .string "fell on MT. MOON.$"
+
+gUnknown_817E49F:: @ 817E49F
+    .string "There aren't many serious POKéMON\n"
+    .string "TRAINERS here.\p"
+    .string "They're all like BUG CATCHERS,\n"
+    .string "you know, just hobbyists.\p"
+    .string "But PEWTER GYM's BROCK isn't like\n"
+    .string "that, not one bit.$"
+
+gUnknown_817E53E:: @ 817E53E
+    .string "Did you check out the MUSEUM?$"
+
+gUnknown_817E55C:: @ 817E55C
+    .string "Weren't those fossils from MT. MOON\n"
+    .string "amazing?$"
+
+gUnknown_817E589:: @ 817E589
+    .string "Really?\n"
+    .string "You absolutely have to go!$"
+
+gUnknown_817E5AC:: @ 817E5AC
+    .string "This is it, the MUSEUM.\p"
+    .string "You have to pay to get in, but it's\n"
+    .string "worth it. See you around!$"
+
+gUnknown_817E602:: @ 817E602
+    .string "Psssst!\n"
+    .string "Do you know what I'm doing?$"
+
+gUnknown_817E626:: @ 817E626
+    .string "That's right!\n"
+    .string "It's hard work!$"
+
+gUnknown_817E644:: @ 817E644
+    .string "I'm spraying REPEL to keep wild\n"
+    .string "POKéMON out of my garden!$"
+
+gUnknown_817E67E:: @ 817E67E
+    .string "You're a TRAINER, right?\p"
+    .string "BROCK's looking for new\n"
+    .string "challengers. Follow me!$"
+
+gUnknown_817E6C7:: @ 817E6C7
+    .string "If you have the right stuff,\n"
+    .string "go take on BROCK!$"
+
+gUnknown_817E6F6:: @ 817E6F6
+    .string "TRAINER TIPS\p"
+    .string "All POKéMON that appear in battle,\n"
+    .string "however briefly, earn EXP Points.$"
+
+gUnknown_817E748:: @ 817E748
+    .string "NOTICE!\p"
+    .string "Thieves have been stealing POKéMON\n"
+    .string "fossils from MT. MOON.\p"
+    .string "Please call the PEWTER POLICE if\n"
+    .string "you have any information.$"
+
+gUnknown_817E7C5:: @ 817E7C5
+    .string "PEWTER MUSEUM OF SCIENCE$"
+
+gUnknown_817E7DE:: @ 817E7DE
+    .string "PEWTER CITY POKéMON GYM\n"
+    .string "LEADER: BROCK\l"
+    .string "The Rock-Solid POKéMON TRAINER!$"
+
+gUnknown_817E824:: @ 817E824
+    .string "PEWTER CITY\n"
+    .string "A Stone Gray City$"
+
+Text_17E842:: @ 817E842
+    .string "あッれー！\n"
+    .string "その　ジムバッジ‥‥\l"
+    .string "すげえな　タケシに　かったのかよ！\p"
+    .string "かんどう　したから\n"
+    .string "おれの　たからもの　やるよ！$"
+
+Text_17E87E:: @ 817E87E
+    .string "なかには　きのみが　はいってるぜ\p"
+    .string "やくに　たつ　きのみも\n"
+    .string "はいって　いるから\l"
+    .string "だいじに　つかって　くれよ！$"
+
+Text_17E8B4:: @ 817E8B4
+    .string "ポケモンに　きのみを\n"
+    .string "もたせて　おけば\l"
+    .string "たたかっている　ときに\l"
+    .string "かってに　つかって　くれるんだ\p"
+    .string "キズぐすり　とか　どくけし　より\n"
+    .string "てがるで　べんり　だろ？$"
+
+gUnknown_817E902:: @ 817E902
+    .string "Oh, {PLAYER}{KUN}!$"
+
+gUnknown_817E90C:: @ 817E90C
+    .string "I'm glad I caught up to you.\n"
+    .string "I'm PROF. OAK's AIDE.\p"
+    .string "I've been asked to deliver this,\n"
+    .string "so here you go.$"
+
+Text_17E970:: @ 817E970
+    .string "{PLAYER} received the\n"
+    .string "RUNNING SHOES from the AIDE.$"
+
+gUnknown_817E99D:: @ 817E99D
+    .string "{PLAYER} switched shoes with the\n"
+    .string "RUNNING SHOES.$"
+
+gUnknown_817E9C7:: @ 817E9C7
+    .string "Press the B Button to run.\n"
+    .string "But only where there's room to run!$"
+
+gUnknown_817EA06:: @ 817EA06
+    .string "Well, I must be going back to\n"
+    .string "the LAB.\p"
+    .string "Bye-bye!$"
+
+gUnknown_817EA36:: @ 817EA36
+    .string "There's a letter attached…\p"
+    .string "Dear {PLAYER},\p"
+    .string "Here is a pair of RUNNING SHOES\n"
+    .string "for my beloved challenger.\p"
+    .string "Remember, I'll always cheer for\n"
+    .string "you! Don't ever give up!\p"
+    .string "From Mom$"
+
diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json
new file mode 100644
index 000000000..bd7ae17c2
--- /dev/null
+++ b/data/maps/PewterCity_Gym/map.json
@@ -0,0 +1,96 @@
+{
+  "id": "MAP_PEWTER_CITY_GYM",
+  "name": "PewterCity_Gym",
+  "layout": "LAYOUT_PEWTER_CITY_GYM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "80",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Gym_EventScript_16A593",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "PewterCity_Gym_EventScript_16A63E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Gym_EventScript_16A655",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 12,
+      "elevation": 0,
+      "script": "PewterCity_Gym_EventScript_16A6AF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 12,
+      "elevation": 0,
+      "script": "PewterCity_Gym_EventScript_16A6AF"
+    }
+  ]
+}
diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc
new file mode 100644
index 000000000..5990bf1e3
--- /dev/null
+++ b/data/maps/PewterCity_Gym/scripts.inc
@@ -0,0 +1,94 @@
+PewterCity_Gym_MapScripts:: @ 816A592
+	.byte 0
+
+PewterCity_Gym_EventScript_16A593:: @ 816A593
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, 414, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5
+	checkflag FLAG_0x254
+	goto_if 0, EventScript_16A5F3
+	msgbox gUnknown_819110F
+	release
+	end
+
+EventScript_16A5C5:: @ 816A5C5
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	setflag FLAG_0x4B0
+	setflag FLAG_UNK820
+	setvar VAR_0x406C, 1
+	setflag FLAG_0x02E
+	clearflag FLAG_0x092
+	setvar VAR_0x8008, 1
+	call EventScript_1A6B18
+	goto EventScript_16A5F3
+	end
+
+EventScript_16A5F3:: @ 816A5F3
+	msgbox gUnknown_8190FC1
+	checkitemspace ITEM_TM39, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16A634
+	additem ITEM_TM39, 1
+	giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39
+	setflag FLAG_0x254
+	msgbox gUnknown_8190FF8
+	release
+	end
+
+EventScript_16A634:: @ 816A634
+	msgbox gUnknown_81911CE
+	release
+	end
+
+PewterCity_Gym_EventScript_16A63E:: @ 816A63E
+	trainerbattle 0, 142, 0, Text_1911EC, Text_191237
+	msgbox gUnknown_819126B, 6
+	end
+
+PewterCity_Gym_EventScript_16A655:: @ 816A655
+	lock
+	faceplayer
+	checkflag FLAG_0x4B0
+	goto_if_eq EventScript_16A67F
+	msgbox gUnknown_8191298, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16A689
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16A697
+	end
+
+EventScript_16A67F:: @ 816A67F
+	msgbox gUnknown_819143C
+	release
+	end
+
+EventScript_16A689:: @ 816A689
+	msgbox gUnknown_819133C
+	goto EventScript_16A6A5
+	end
+
+EventScript_16A697:: @ 816A697
+	msgbox gUnknown_8191412
+	goto EventScript_16A6A5
+	end
+
+EventScript_16A6A5:: @ 816A6A5
+	msgbox gUnknown_819135C
+	release
+	end
+
+PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF
+	lockall
+	checkflag FLAG_UNK820
+	goto_if_eq EventScript_16A6C3
+	msgbox gUnknown_819146E
+	releaseall
+	end
+
+EventScript_16A6C3:: @ 816A6C3
+	msgbox gUnknown_81914A4
+	releaseall
+	end
diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc
new file mode 100644
index 000000000..31e5c61f0
--- /dev/null
+++ b/data/maps/PewterCity_Gym/text.inc
@@ -0,0 +1,119 @@
+Text_190CD4:: @ 8190CD4
+    .string "So, you're here. I'm BROCK.\n"
+    .string "I'm PEWTER's GYM LEADER.\p"
+    .string "My rock-hard willpower is evident\n"
+    .string "even in my POKéMON.\p"
+    .string "My POKéMON are all rock hard, and\n"
+    .string "have true-grit determination.\p"
+    .string "That's right - my POKéMON are all\n"
+    .string "the ROCK type!\p"
+    .string "Fuhaha! You're going to challenge\n"
+    .string "me knowing that you'll lose?\p"
+    .string "That's the TRAINER's honor that\n"
+    .string "compels you to challenge me.\p"
+    .string "Fine, then!\n"
+    .string "Show me your best!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+Text_190E4F:: @ 8190E4F
+    .string "I took you for granted, and so\n"
+    .string "I lost.\p"
+    .string "As proof of your victory, I confer\n"
+    .string "on you this…the official POKéMON\l"
+    .string "LEAGUE BOULDERBADGE.\p"
+    .string "{SIZE}Á{PLAYER} received the BOULDERBADGE\n"
+    .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p"
+    .string "{SIZE}ÇJust having the BOULDERBADGE makes\n"
+    .string "your POKéMON more powerful.\p"
+    .string "It also enables the use of the\n"
+    .string "move FLASH outside of battle.\p"
+    .string "Of course, a POKéMON must know the\n"
+    .string "move FLASH to use it.$"
+
+gUnknown_8190FC1:: @ 8190FC1
+    .string "Wait!\n"
+    .string "Take this with you.$"
+
+gUnknown_8190FDB:: @ 8190FDB
+    .string "{PLAYER} received TM39\n"
+    .string "from BROCK.$"
+
+gUnknown_8190FF8:: @ 8190FF8
+    .string "A TM, Technical Machine, contains a\n"
+    .string "technique for POKéMON.\p"
+    .string "Using a TM teaches the move it\n"
+    .string "contains to a POKéMON.\p"
+    .string "A TM is good for only one use.\p"
+    .string "So, when you use one, pick the\n"
+    .string "POKéMON carefully.\p"
+    .string "Anyways…\n"
+    .string "TM39 contains ROCK TOMB.\p"
+    .string "It hurls boulders at the foe and\n"
+    .string "lowers its SPEED.$"
+
+gUnknown_819110F:: @ 819110F
+    .string "There are all kinds of TRAINERS in\n"
+    .string "this huge world of ours.\p"
+    .string "You appear to be very gifted as a\n"
+    .string "POKéMON TRAINER.\p"
+    .string "So let me make a suggestion.\p"
+    .string "Go to the GYM in CERULEAN and test\n"
+    .string "your abilities.$"
+
+gUnknown_81911CE:: @ 81911CE
+    .string "You don't have room for this.$"
+
+Text_1911EC:: @ 81911EC
+    .string "Stop right there, kid!\p"
+    .string "You're ten thousand light-years \n"
+    .string "from facing BROCK!$"
+
+Text_191237:: @ 8191237
+    .string "Darn!\p"
+    .string "Light-years isn't time…\n"
+    .string "It measures distance!$"
+
+gUnknown_819126B:: @ 819126B
+    .string "You're pretty hot.\n"
+    .string "…But not as hot as BROCK!$"
+
+gUnknown_8191298:: @ 8191298
+    .string "Hiya!\n"
+    .string "Do you want to dream big?\p"
+    .string "Do you dare to dream of becoming\n"
+    .string "the POKéMON champ?\p"
+    .string "I'm no TRAINER, but I can advise\n"
+    .string "you on how to win.\p"
+    .string "Let me take you to the top!$"
+
+gUnknown_819133C:: @ 819133C
+    .string "All right!\n"
+    .string "Let's get happening!$"
+
+gUnknown_819135C:: @ 819135C
+    .string "The first POKéMON out in a match is\n"
+    .string "at the left of the POKéMON LIST.\p"
+    .string "By changing the order of POKéMON,\n"
+    .string "you may gain an advantage.\p"
+    .string "Try different orders to suit your\n"
+    .string "opponent's party.$"
+
+gUnknown_8191412:: @ 8191412
+    .string "It's a free service!\n"
+    .string "Let's get happening!$"
+
+gUnknown_819143C:: @ 819143C
+    .string "Just as I thought!\n"
+    .string "You're POKéMON champ material!$"
+
+gUnknown_819146E:: @ 819146E
+    .string "PEWTER POKéMON GYM\n"
+    .string "LEADER: BROCK\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}$"
+
+gUnknown_81914A4:: @ 81914A4
+    .string "PEWTER POKéMON GYM\n"
+    .string "LEADER: BROCK\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}, {PLAYER}$"
+
diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json
new file mode 100644
index 000000000..cb05ba932
--- /dev/null
+++ b/data/maps/PewterCity_House1/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_PEWTER_CITY_HOUSE1",
+  "name": "PewterCity_House1",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_House1_EventScript_16A71D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_House1_EventScript_16A726",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "123",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_House1_EventScript_16A736",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc
new file mode 100644
index 000000000..3be582ab3
--- /dev/null
+++ b/data/maps/PewterCity_House1/scripts.inc
@@ -0,0 +1,31 @@
+PewterCity_House1_MapScripts:: @ 816A71C
+	.byte 0
+
+PewterCity_House1_EventScript_16A71D:: @ 816A71D
+	msgbox gUnknown_81915DB, 2
+	end
+
+PewterCity_House1_EventScript_16A726:: @ 816A726
+	lock
+	msgbox gUnknown_81915CD
+	call EventScript_16A749
+	release
+	end
+
+PewterCity_House1_EventScript_16A736:: @ 816A736
+	lock
+	faceplayer
+	call EventScript_16A749
+	applymovement 3, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_16A749:: @ 816A749
+	textcolor 3
+	waitse
+	playmoncry SPECIES_NIDORAN_M, 0
+	msgbox gUnknown_81915BB
+	waitmoncry
+	call EventScript_1A6675
+	return
diff --git a/data/maps/PewterCity_House1/text.inc b/data/maps/PewterCity_House1/text.inc
new file mode 100644
index 000000000..b0a691229
--- /dev/null
+++ b/data/maps/PewterCity_House1/text.inc
@@ -0,0 +1,15 @@
+gUnknown_81915BB:: @ 81915BB
+    .string "NIDORAN♂: Bowbow!$"
+
+gUnknown_81915CD:: @ 81915CD
+    .string "NIDORAN, sit!$"
+
+gUnknown_81915DB:: @ 81915DB
+    .string "Our POKéMON's an outsider, so it's\n"
+    .string "finicky and hard to handle.\p"
+    .string "An outsider is a POKéMON that you\n"
+    .string "get in a trade.\p"
+    .string "It grows fast, but it may ignore an\n"
+    .string "unskilled TRAINER in battle.\p"
+    .string "If only we had some BADGES…$"
+
diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json
new file mode 100644
index 000000000..368dc049c
--- /dev/null
+++ b/data/maps/PewterCity_House2/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_PEWTER_CITY_HOUSE2",
+  "name": "PewterCity_House2",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_House2_EventScript_16A7DD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_House2_EventScript_16A7E6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc
new file mode 100644
index 000000000..2db341b30
--- /dev/null
+++ b/data/maps/PewterCity_House2/scripts.inc
@@ -0,0 +1,10 @@
+PewterCity_House2_MapScripts:: @ 816A7DC
+	.byte 0
+
+PewterCity_House2_EventScript_16A7DD:: @ 816A7DD
+	msgbox gUnknown_81917E4, 2
+	end
+
+PewterCity_House2_EventScript_16A7E6:: @ 816A7E6
+	msgbox gUnknown_8191840, 2
+	end
diff --git a/data/maps/PewterCity_House2/text.inc b/data/maps/PewterCity_House2/text.inc
new file mode 100644
index 000000000..6dc70b2ba
--- /dev/null
+++ b/data/maps/PewterCity_House2/text.inc
@@ -0,0 +1,14 @@
+gUnknown_81917E4:: @ 81917E4
+    .string "POKéMON learn new techniques as\n"
+    .string "they grow.\p"
+    .string "But some moves must be taught to\n"
+    .string "them by people.$"
+
+gUnknown_8191840:: @ 8191840
+    .string "A POKéMON becomes easier to \n"
+    .string "catch if it has a status problem.\p"
+    .string "Sleep, poison, burn, or paralysis…\n"
+    .string "Those are all effective.\p"
+    .string "But catching POKéMON is never\n"
+    .string "a sure thing!$"
+
diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json
new file mode 100644
index 000000000..ba1e82180
--- /dev/null
+++ b/data/maps/PewterCity_Mart/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_PEWTER_CITY_MART",
+  "name": "PewterCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "18",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Mart_EventScript_16A6CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Mart_EventScript_16A6D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Mart_EventScript_16A6E0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc
new file mode 100644
index 000000000..9e6fc4375
--- /dev/null
+++ b/data/maps/PewterCity_Mart/scripts.inc
@@ -0,0 +1,37 @@
+PewterCity_Mart_MapScripts:: @ 816A6CD
+	.byte 0
+
+PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE
+	msgbox gUnknown_81914DE, 2
+	end
+
+PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7
+	msgbox gUnknown_8191541, 2
+	end
+
+PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16A708
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16A708:: @ 816A708
+	.2byte ITEM_POKE_BALL
+	.2byte ITEM_POTION
+	.2byte ITEM_ANTIDOTE
+	.2byte ITEM_PARALYZE_HEAL
+	.2byte ITEM_AWAKENING
+	.2byte ITEM_BURN_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_REPEL
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/PewterCity_Mart/text.inc b/data/maps/PewterCity_Mart/text.inc
new file mode 100644
index 000000000..24dcbdbb2
--- /dev/null
+++ b/data/maps/PewterCity_Mart/text.inc
@@ -0,0 +1,11 @@
+gUnknown_81914DE:: @ 81914DE
+    .string "A shady old guy sucked me into\n"
+    .string "buying this weird fish POKéMON!\p"
+    .string "It's totally weak and it cost ¥500!$"
+
+gUnknown_8191541:: @ 8191541
+    .string "Good things can happen if you raise\n"
+    .string "POKéMON diligently.\p"
+    .string "Even the weak ones can surprise\n"
+    .string "you if you don't give up on them.$"
+
diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json
new file mode 100644
index 000000000..583d0f0db
--- /dev/null
+++ b/data/maps/PewterCity_Museum_1F/map.json
@@ -0,0 +1,198 @@
+{
+  "id": "MAP_PEWTER_CITY_MUSEUM_1F",
+  "name": "PewterCity_Museum_1F",
+  "layout": "LAYOUT_PEWTER_CITY_MUSEUM_1F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "47",
+      "x": 16,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A31B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A4A5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 21,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A4AE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "101",
+      "x": 22,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A509",
+      "flag": "86"
+    },
+    {
+      "graphics_id": "55",
+      "x": 26,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A49C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 26,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_1F_EventScript_1C4BBE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 21,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 22,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY_MUSEUM_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4061",
+      "var_value": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A38F"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4061",
+      "var_value": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A3A5"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4061",
+      "var_value": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A3BB"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A512"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "script": "PewterCity_Museum_1F_EventScript_16A532"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 27,
+      "y": 1,
+      "elevation": 0,
+      "script": "PewterCity_Museum_1F_EventScript_1ACE1C"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 26,
+      "y": 1,
+      "elevation": 0,
+      "script": "PewterCity_Museum_1F_EventScript_1ACE1C"
+    }
+  ]
+}
diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc
new file mode 100644
index 000000000..7540e74d5
--- /dev/null
+++ b/data/maps/PewterCity_Museum_1F/scripts.inc
@@ -0,0 +1,208 @@
+PewterCity_Museum_1F_MapScripts:: @ 816A31A
+	.byte 0
+
+PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B
+	lock
+	faceplayer
+	compare_var_to_value VAR_FACING, 3
+	goto_if_eq EventScript_16A348
+	compare_var_to_value VAR_FACING, 1
+	goto_if_eq EventScript_16A348
+	compare_var_to_value VAR_FACING, 2
+	goto_if_eq EventScript_16A348
+	msgbox gUnknown_8190539
+	release
+	end
+
+EventScript_16A348:: @ 816A348
+	msgbox gUnknown_8190550, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16A367
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16A37B
+	end
+
+EventScript_16A367:: @ 816A367
+	msgbox gUnknown_81905B1
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_16A37B:: @ 816A37B
+	msgbox gUnknown_8190627
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F
+	lockall
+	setvar VAR_0x4001, 0
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	goto EventScript_16A3D1
+	end
+
+PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5
+	lockall
+	setvar VAR_0x4001, 1
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	goto EventScript_16A3D1
+	end
+
+PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB
+	lockall
+	setvar VAR_0x4001, 2
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	goto EventScript_16A3D1
+	end
+
+EventScript_16A3D1:: @ 816A3D1
+	textcolor 0
+	showmoneybox 0, 0, 0
+	msgbox gUnknown_81904B5, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16A402
+	msgbox gUnknown_81904F9
+	closemessage
+	hidemoneybox
+	.byte 0
+	.byte 0
+	applymovement 255, Movement_16A48E
+	waitmovement 0
+	releaseall
+	end
+
+EventScript_16A402:: @ 816A402
+	checkmoney 50, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16A476
+	closemessage
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16A455
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16A460
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16A46B
+	playse SE_CASHIER
+	takemoney 50, 0
+	updatemoneybox 0, 0, 0
+	waitse
+	msgbox gUnknown_8190505
+	setvar VAR_0x4061, 1
+	hidemoneybox
+	.byte 0
+	.byte 0
+	releaseall
+	end
+
+EventScript_16A455:: @ 816A455
+	applymovement 255, Movement_16A490
+	waitmovement 0
+	return
+
+EventScript_16A460:: @ 816A460
+	applymovement 255, Movement_16A495
+	waitmovement 0
+	return
+
+EventScript_16A46B:: @ 816A46B
+	applymovement 255, Movement_16A499
+	waitmovement 0
+	return
+
+EventScript_16A476:: @ 816A476
+	msgbox gUnknown_819051C
+	closemessage
+	hidemoneybox
+	.byte 0
+	.byte 0
+	applymovement 255, Movement_16A48E
+	waitmovement 0
+	releaseall
+	end
+
+Movement_16A48E:: @ 816A48E
+	step_10
+	step_end
+
+Movement_16A490:: @ 816A490
+	step_13
+	step_13
+	step_1b
+	step_28
+	step_end
+
+Movement_16A495:: @ 816A495
+	step_13
+	step_1b
+	step_28
+	step_end
+
+Movement_16A499:: @ 816A499
+	step_1b
+	step_28
+	step_end
+
+PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C
+	msgbox gUnknown_81908CD, 2
+	end
+
+PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5
+	msgbox gUnknown_81906B4, 2
+	end
+
+PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE
+	lock
+	faceplayer
+	checkflag FLAG_0x25E
+	goto_if_eq EventScript_16A4FF
+	msgbox gUnknown_8190717
+	checkitemspace ITEM_OLD_AMBER, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16A4F5
+	setflag FLAG_0x25E
+	removeobject 4
+	additem ITEM_OLD_AMBER, 1
+	giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, BGM_FRLG_ME_KEYITEM
+	release
+	end
+
+EventScript_16A4F5:: @ 816A4F5
+	msgbox gUnknown_81908AE
+	release
+	end
+
+EventScript_16A4FF:: @ 816A4FF
+	msgbox gUnknown_819088E
+	release
+	end
+
+PewterCity_Museum_1F_EventScript_16A509:: @ 816A509
+	msgbox gUnknown_819090A, 2
+	end
+
+PewterCity_Museum_1F_EventScript_16A512:: @ 816A512
+	lockall
+	setvar VAR_0x8004, SPECIES_AERODACTYL
+	setvar VAR_0x8005, 10
+	setvar VAR_0x8006, 3
+	special sub_809D504
+	msgbox gUnknown_8190945
+	special sub_809D620
+	releaseall
+	end
+
+PewterCity_Museum_1F_EventScript_16A532:: @ 816A532
+	lockall
+	setvar VAR_0x8004, SPECIES_KABUTOPS
+	setvar VAR_0x8005, 10
+	setvar VAR_0x8006, 3
+	special sub_809D504
+	msgbox gUnknown_8190975
+	special sub_809D620
+	releaseall
+	end
diff --git a/data/maps/PewterCity_Museum_1F/text.inc b/data/maps/PewterCity_Museum_1F/text.inc
new file mode 100644
index 000000000..0c784c4d2
--- /dev/null
+++ b/data/maps/PewterCity_Museum_1F/text.inc
@@ -0,0 +1,86 @@
+gUnknown_81904B5:: @ 81904B5
+    .string "Yes, yes.\n"
+    .string "It's ¥50 for a child's ticket.\p"
+    .string "Would you like to come in?$"
+
+gUnknown_81904F9:: @ 81904F9
+    .string "Come again!$"
+
+gUnknown_8190505:: @ 8190505
+    .string "Right, ¥50!\n"
+    .string "Thank you!$"
+
+gUnknown_819051C:: @ 819051C
+    .string "You don't have enough money.$"
+
+gUnknown_8190539:: @ 8190539
+    .string "Please enjoy yourself.$"
+
+gUnknown_8190550:: @ 8190550
+    .string "You can't sneak in the back way!\n"
+    .string "Nice try, kid, but no.\p"
+    .string "Oh, whatever!\n"
+    .string "Do you know what AMBER is?$"
+
+gUnknown_81905B1:: @ 81905B1
+    .string "AMBER contains the genetic matter\n"
+    .string "of ancient POKéMON.\p"
+    .string "There's a LAB somewhere trying to\n"
+    .string "resurrect POKéMON from AMBER.$"
+
+gUnknown_8190627:: @ 8190627
+    .string "AMBER is actually sap, that gooey\n"
+    .string "stuff that oozes from trees.\p"
+    .string "The ancient sap fossilized over\n"
+    .string "time to become rock-hard AMBER.$"
+
+Text_1906A6:: @ 81906A6
+    .string "あちらへ　おまわりください$"
+
+gUnknown_81906B4:: @ 81906B4
+    .string "I should be grateful for my long\n"
+    .string "life.\p"
+    .string "Never did I think I would get to\n"
+    .string "see the bones of a dragon!$"
+
+gUnknown_8190717:: @ 8190717
+    .string "Ssh! Listen, I need to share a\n"
+    .string "secret with someone.\p"
+    .string "I think that this chunk of AMBER\n"
+    .string "contains POKéMON DNA!\p"
+    .string "It would be a shattering scientific\n"
+    .string "breakthrough if POKéMON could be\l"
+    .string "resurrected from it.\p"
+    .string "But, my colleagues just ignore\n"
+    .string "what I have to say.\p"
+    .string "So, I have a favor to ask!\p"
+    .string "I want you to get this examined at\n"
+    .string "a POKéMON LAB somewhere.$"
+
+gUnknown_8190866:: @ 8190866
+    .string "{PLAYER} received the OLD AMBER\n"
+    .string "from the man.$"
+
+gUnknown_819088E:: @ 819088E
+    .string "Ssh!\n"
+    .string "Get the OLD AMBER checked!$"
+
+gUnknown_81908AE:: @ 81908AE
+    .string "You don't have space for this.$"
+
+gUnknown_81908CD:: @ 81908CD
+    .string "We have two fossils of rare,\n"
+    .string "prehistoric POKéMON on exhibit.$"
+
+gUnknown_819090A:: @ 819090A
+    .string "There is a beautiful piece of\n"
+    .string "AMBER in a clear gold color.$"
+
+gUnknown_8190945:: @ 8190945
+    .string "AERODACTYL Fossil\n"
+    .string "A primitive and rare POKéMON.$"
+
+gUnknown_8190975:: @ 8190975
+    .string "KABUTOPS Fossil\n"
+    .string "A primitive and rare POKéMON.$"
+
diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json
new file mode 100644
index 000000000..0fba1289f
--- /dev/null
+++ b/data/maps/PewterCity_Museum_2F/map.json
@@ -0,0 +1,150 @@
+{
+  "id": "MAP_PEWTER_CITY_MUSEUM_2F",
+  "name": "PewterCity_Museum_2F",
+  "layout": "LAYOUT_PEWTER_CITY_MUSEUM_2F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A565",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A553",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "33",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A55C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 15,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A56E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 16,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A577",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A589"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 5,
+      "elevation": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A580"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 5,
+      "elevation": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A580"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 16,
+      "y": 5,
+      "elevation": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A580"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 4,
+      "elevation": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A580"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 4,
+      "elevation": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A580"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 16,
+      "y": 4,
+      "elevation": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A580"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "script": "PewterCity_Museum_2F_EventScript_16A589"
+    }
+  ]
+}
diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc
new file mode 100644
index 000000000..0e57e2c70
--- /dev/null
+++ b/data/maps/PewterCity_Museum_2F/scripts.inc
@@ -0,0 +1,30 @@
+PewterCity_Museum_2F_MapScripts:: @ 816A552
+	.byte 0
+
+PewterCity_Museum_2F_EventScript_16A553:: @ 816A553
+	msgbox gUnknown_8190B30, 2
+	end
+
+PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C
+	msgbox gUnknown_8190B80, 2
+	end
+
+PewterCity_Museum_2F_EventScript_16A565:: @ 816A565
+	msgbox gUnknown_8190BF3, 2
+	end
+
+PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E
+	msgbox gUnknown_8190C1E, 2
+	end
+
+PewterCity_Museum_2F_EventScript_16A577:: @ 816A577
+	msgbox gUnknown_8190C60, 2
+	end
+
+PewterCity_Museum_2F_EventScript_16A580:: @ 816A580
+	msgbox gUnknown_8190C81, 3
+	end
+
+PewterCity_Museum_2F_EventScript_16A589:: @ 816A589
+	msgbox gUnknown_8190C8F, 3
+	end
diff --git a/data/maps/PewterCity_Museum_2F/text.inc b/data/maps/PewterCity_Museum_2F/text.inc
new file mode 100644
index 000000000..b1767c681
--- /dev/null
+++ b/data/maps/PewterCity_Museum_2F/text.inc
@@ -0,0 +1,54 @@
+Text_1909A3:: @ 81909A3
+    .string "The secrets of space…\n"
+    .string "The mysteries of earth…\p"
+    .string "There are so many things about\n"
+    .string "which we know so little.\p"
+    .string "But that should spur us to study\n"
+    .string "harder, not toss in the towel.\p"
+    .string "The only thing you should toss…\p"
+    .string "Well, how about SEISMIC TOSS?\n"
+    .string "Should I teach that to a POKéMON?$"
+
+Text_190AA9:: @ 8190AA9
+    .string "Is that so?\n"
+    .string "I'm sure you'll be back for it.$"
+
+Text_190AD5:: @ 8190AD5
+    .string "Which POKéMON wants to learn\n"
+    .string "SEISMIC TOSS?$"
+
+Text_190B00:: @ 8190B00
+    .string "I hope you won't toss in the towel.\n"
+    .string "Keep it up.$"
+
+gUnknown_8190B30:: @ 8190B30
+    .string "MOON STONE, huh?\p"
+    .string "What's so special about it?\n"
+    .string "Looks like an ordinary rock to me.$"
+
+gUnknown_8190B80:: @ 8190B80
+    .string "July 20, 1969!\p"
+    .string "Humankind first set foot on the\n"
+    .string "moon that day.\p"
+    .string "I bought a color TV just so I\n"
+    .string "could watch that news.$"
+
+gUnknown_8190BF3:: @ 8190BF3
+    .string "This month, we're running a space\n"
+    .string "exhibit.$"
+
+gUnknown_8190C1E:: @ 8190C1E
+    .string "I want a PIKACHU!\n"
+    .string "It's so cute!\p"
+    .string "I asked my daddy to catch me one!$"
+
+gUnknown_8190C60:: @ 8190C60
+    .string "Yeah, a PIKACHU soon, I promise!$"
+
+gUnknown_8190C81:: @ 8190C81
+    .string "Space Shuttle$"
+
+gUnknown_8190C8F:: @ 8190C8F
+    .string "A meteorite that fell on MT. MOON.\n"
+    .string "It is thought to be a MOON STONE.$"
+
diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..efff5db0c
--- /dev/null
+++ b/data/maps/PewterCity_PokemonCenter_1F/map.json
@@ -0,0 +1,140 @@
+{
+  "id": "MAP_PEWTER_CITY_POKEMON_CENTER_1F",
+  "name": "PewterCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "115",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_1F_EventScript_16A781",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_1F_EventScript_16A778",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_1F_EventScript_16A76F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_1F_EventScript_16A798",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 13,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_1F_EventScript_1BEE16",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "51",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_1F_EventScript_16A7A1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "51",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_1F_EventScript_16A7AC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PEWTER_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..525eef027
--- /dev/null
+++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,45 @@
+PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760
+	map_script 3, PewterCity_PokemonCenter_1F_MapScript1_16A76B
+	map_script 5, PewterCity_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B
+	setrespawn SPAWN_PEWTER_CITY
+	end
+
+PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778
+	msgbox gUnknown_81916A9, 2
+	end
+
+PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781
+	lock
+	faceplayer
+	fadeoutbgm 0
+	playbgm BGM_FRLG_JIGGLYPUFF, 0
+	message Text_1916EA
+	waitmessage
+	delay 455
+	playbgm BGM_FRLG_POKEMON_CENTER, 1
+	release
+	end
+
+PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798
+	msgbox gUnknown_8191701, 2
+	end
+
+PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1
+	lock
+	msgbox gUnknown_8191743
+	release
+	end
+
+PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC
+	msgbox gUnknown_8191780, 2
+	end
diff --git a/data/maps/PewterCity_PokemonCenter_1F/text.inc b/data/maps/PewterCity_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..f297bfa51
--- /dev/null
+++ b/data/maps/PewterCity_PokemonCenter_1F/text.inc
@@ -0,0 +1,27 @@
+gUnknown_81916A9:: @ 81916A9
+    .string "What!?\p"
+    .string "TEAM ROCKET is at MT. MOON?\n"
+    .string "Huh?\p"
+    .string "I'm on the phone!\n"
+    .string "Scram!$"
+
+Text_1916EA:: @ 81916EA
+    .string "JIGGLYPUFF: Puu pupuu!$"
+
+gUnknown_8191701:: @ 8191701
+    .string "Yawn!\p"
+    .string "When JIGGLYPUFF sings, POKéMON get\n"
+    .string "drowsy…\p"
+    .string "…Me, too…\n"
+    .string "Snore…$"
+
+gUnknown_8191743:: @ 8191743
+    .string "I really want a PIKACHU, so I'm\n"
+    .string "trading my CLEFAIRY for one.$"
+
+gUnknown_8191780:: @ 8191780
+    .string "I'm trading POKéMON with that kid\n"
+    .string "there.\p"
+    .string "I had two PIKACHU, so I figured\n"
+    .string "I might as well trade one.$"
+
diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..f50a1608c
--- /dev/null
+++ b/data/maps/PewterCity_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_PEWTER_CITY_POKEMON_CENTER_2F",
+  "name": "PewterCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_PEWTER_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..6fce8dda2
--- /dev/null
+++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5
+	map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, PewterCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA
+	call EventScript_1BB4A3
+	end
+
+EventScript_16A7D0:: @ 816A7D0
+	call EventScript_1BB6AB
+	end
+
+EventScript_16A7D6:: @ 816A7D6
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json
new file mode 100644
index 000000000..84f663e66
--- /dev/null
+++ b/data/maps/PokemonLeague_AgathasRoom/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM",
+  "name": "PokemonLeague_AgathasRoom",
+  "layout": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM",
+  "music": "BGM_FRLG_POKEMON_TOWER",
+  "region_map_section": "MAPSEC_POKEMON_LEAGUE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_6",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "75",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonLeague_AgathasRoom_EventScript_162877",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_LEAGUE_LANCES_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc
new file mode 100644
index 000000000..2a46b544d
--- /dev/null
+++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc
@@ -0,0 +1,106 @@
+PokemonLeague_AgathasRoom_MapScripts:: @ 8162810
+	map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825
+	map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830
+	map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851
+	map_script 2, PokemonLeague_AgathasRoom_MapScript4_162860
+	.byte 0
+
+PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825
+	setvar VAR_0x8004, 2
+	call EventScript_1A75D5
+	end
+
+PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830
+	checkflag FLAG_0x4BA
+	call_if 1, EventScript_16284B
+	compare_var_to_value VAR_0x4068, 3
+	call_if 1, EventScript_162845
+	end
+
+EventScript_162845:: @ 8162845
+	call EventScript_1A759C
+	return
+
+EventScript_16284B:: @ 816284B
+	call EventScript_1A7538
+	return
+
+PokemonLeague_AgathasRoom_MapScript3_162851:: @ 8162851
+	map_script_2 VAR_0x4001, 0, EventScript_16285B
+	.2byte 0
+
+EventScript_16285B:: @ 816285B
+	turnobject 255, 2
+	end
+
+PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860
+	map_script_2 VAR_0x4068, 2, EventScript_16286A
+	.2byte 0
+
+EventScript_16286A:: @ 816286A
+	lockall
+	call EventScript_1A751F
+	setvar VAR_0x4068, 3
+	releaseall
+	end
+
+PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
+	lock
+	faceplayer
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	checkflag FLAG_0x4BA
+	goto_if_eq EventScript_162911
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	checkflag FLAG_0x82C
+	call_if 0, EventScript_1628E9
+	checkflag FLAG_0x82C
+	call_if 1, EventScript_1628F2
+	setflag FLAG_0x003
+	setflag FLAG_0x005
+	checkflag FLAG_0x844
+	call_if 0, EventScript_1628FB
+	checkflag FLAG_0x844
+	call_if 1, EventScript_162906
+	clearflag FLAG_0x005
+	goto EventScript_16291B
+
+EventScript_1628E8:: @ 81628E8
+	end
+
+EventScript_1628E9:: @ 81628E9
+	msgbox gUnknown_817844D
+	return
+
+EventScript_1628F2:: @ 81628F2
+	msgbox gUnknown_817858D
+	return
+
+EventScript_1628FB:: @ 81628FB
+	trainerbattle 3, 412, 0, Text_1786D7
+	return
+
+EventScript_162906:: @ 8162906
+	trainerbattle 3, 737, 0, Text_1786D7
+	return
+
+EventScript_162911:: @ 8162911
+	msgbox gUnknown_8178700
+	release
+	end
+
+EventScript_16291B:: @ 816291B
+	setflag FLAG_0x4BA
+	call EventScript_1A7506
+	msgbox gUnknown_8178700
+	release
+	end
diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc
new file mode 100644
index 000000000..24c44d812
--- /dev/null
+++ b/data/maps/PokemonLeague_AgathasRoom/text.inc
@@ -0,0 +1,41 @@
+gUnknown_817844D:: @ 817844D
+    .string "I am AGATHA of the ELITE FOUR.\p"
+    .string "I hear OAK's taken a lot of\n"
+    .string "interest in you, child.\p"
+    .string "That old duff was once tough and\n"
+    .string "handsome.\p"
+    .string "But that was decades ago.\n"
+    .string "He's a shadow of his former self.\p"
+    .string "Now he just wants to fiddle with\n"
+    .string "his POKéDEX.\p"
+    .string "He's wrong.\n"
+    .string "POKéMON are for battling!\p"
+    .string "{PLAYER}! I'll show you how a real\n"
+    .string "TRAINER battles!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+gUnknown_817858D:: @ 817858D
+    .string "I am AGATHA of the ELITE FOUR.\p"
+    .string "You're the child that OAK's taken\n"
+    .string "under his wing, aren't you?\p"
+    .string "That old duff was once tough and\n"
+    .string "handsome.\p"
+    .string "But that was decades ago.\n"
+    .string "He's a shadow of his former self.\p"
+    .string "Now he just wants to fiddle with\n"
+    .string "his POKéDEX.\p"
+    .string "He's wrong.\n"
+    .string "POKéMON are for battling!\p"
+    .string "{PLAYER}! I'll show you how a real\n"
+    .string "TRAINER battles!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+Text_1786D7:: @ 81786D7
+    .string "Oh, my!\n"
+    .string "You're something special, child!$"
+
+gUnknown_8178700:: @ 8178700
+    .string "You win!\p"
+    .string "I see what the old duff sees in\n"
+    .string "you now.\p"
+    .string "I have nothing else to say.\n"
+    .string "Run along now, child!$"
+
diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json
new file mode 100644
index 000000000..bb94a0bbe
--- /dev/null
+++ b/data/maps/PokemonLeague_BrunosRoom/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM",
+  "name": "PokemonLeague_BrunosRoom",
+  "layout": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_POKEMON_LEAGUE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_5",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "79",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonLeague_BrunosRoom_EventScript_1626EC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc
new file mode 100644
index 000000000..6cc4a23a4
--- /dev/null
+++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc
@@ -0,0 +1,136 @@
+PokemonLeague_BrunosRoom_MapScripts:: @ 8162685
+	map_script 5, PokemonLeague_BrunosRoom_MapScript1_16269A
+	map_script 1, PokemonLeague_BrunosRoom_MapScript2_1626A5
+	map_script 4, PokemonLeague_BrunosRoom_MapScript3_1626C6
+	map_script 2, PokemonLeague_BrunosRoom_MapScript4_1626D5
+	.byte 0
+
+PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A
+	setvar VAR_0x8004, 1
+	call EventScript_1A75D5
+	end
+
+PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5
+	checkflag FLAG_0x4B9
+	call_if 1, EventScript_1626C0
+	compare_var_to_value VAR_0x4068, 2
+	call_if 1, EventScript_1626BA
+	end
+
+EventScript_1626BA:: @ 81626BA
+	call EventScript_1A759C
+	return
+
+EventScript_1626C0:: @ 81626C0
+	call EventScript_1A7538
+	return
+
+PokemonLeague_BrunosRoom_MapScript3_1626C6:: @ 81626C6
+	map_script_2 VAR_0x4001, 0, EventScript_1626D0
+	.2byte 0
+
+EventScript_1626D0:: @ 81626D0
+	turnobject 255, 2
+	end
+
+PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5
+	map_script_2 VAR_0x4068, 1, EventScript_1626DF
+	.2byte 0
+
+EventScript_1626DF:: @ 81626DF
+	lockall
+	call EventScript_1A751F
+	setvar VAR_0x4068, 2
+	releaseall
+	end
+
+PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
+	lock
+	faceplayer
+	setvar VAR_0x8004, 10
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	checkflag FLAG_0x4B9
+	goto_if_eq EventScript_162779
+	setvar VAR_0x8004, 10
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	setvar VAR_0x8004, 10
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	checkflag FLAG_0x82C
+	call_if 0, EventScript_162751
+	checkflag FLAG_0x82C
+	call_if 1, EventScript_16275A
+	setflag FLAG_0x003
+	setflag FLAG_0x005
+	checkflag FLAG_0x844
+	call_if 0, EventScript_162763
+	checkflag FLAG_0x844
+	call_if 1, EventScript_16276E
+	clearflag FLAG_0x005
+	goto EventScript_1627B0
+
+EventScript_162750:: @ 8162750
+	end
+
+EventScript_162751:: @ 8162751
+	msgbox gUnknown_817820F
+	return
+
+EventScript_16275A:: @ 816275A
+	msgbox gUnknown_817830C
+	return
+
+EventScript_162763:: @ 8162763
+	trainerbattle 3, 411, 0, Text_178409
+	return
+
+EventScript_16276E:: @ 816276E
+	trainerbattle 3, 736, 0, Text_178409
+	return
+
+EventScript_162779:: @ 8162779
+	msgbox gUnknown_8178420
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_1627FA
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_1627EF
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_162805
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_162805
+	release
+	end
+
+EventScript_1627B0:: @ 81627B0
+	setflag FLAG_0x4B9
+	call EventScript_1A7506
+	msgbox gUnknown_8178420
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_1627FA
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_1627EF
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_162805
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_162805
+	release
+	end
+
+EventScript_1627EF:: @ 81627EF
+	applymovement 1, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_1627FA:: @ 81627FA
+	applymovement 1, Movement_1A75EB
+	waitmovement 0
+	return
+
+EventScript_162805:: @ 8162805
+	applymovement 1, Movement_1A75ED
+	waitmovement 0
+	return
diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc
new file mode 100644
index 000000000..516da0437
--- /dev/null
+++ b/data/maps/PokemonLeague_BrunosRoom/text.inc
@@ -0,0 +1,34 @@
+gUnknown_817820F:: @ 817820F
+    .string "I am BRUNO of the ELITE FOUR!\p"
+    .string "Through rigorous training, people\n"
+    .string "and POKéMON can become stronger\l"
+    .string "without limit.\p"
+    .string "I've lived and trained with my\n"
+    .string "fighting POKéMON!\l"
+    .string "And that will never change!\p"
+    .string "{PLAYER}!\p"
+    .string "We will grind you down with our\n"
+    .string "superior power!\p"
+    .string "Hoo hah!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+gUnknown_817830C:: @ 817830C
+    .string "I am BRUNO of the ELITE FOUR!\p"
+    .string "Through rigorous training, people\n"
+    .string "and POKéMON can become stronger\l"
+    .string "without limit.\p"
+    .string "I've lived and trained with my\n"
+    .string "fighting POKéMON!\l"
+    .string "And that will never change!\p"
+    .string "{PLAYER}!\p"
+    .string "We will grind you down with our\n"
+    .string "superior power!\p"
+    .string "Hoo hah!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+Text_178409:: @ 8178409
+    .string "Why?\n"
+    .string "How could I lose?$"
+
+gUnknown_8178420:: @ 8178420
+    .string "My job is done.\n"
+    .string "Go face your next challenge.$"
+
diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json
new file mode 100644
index 000000000..cf1c5bfa2
--- /dev/null
+++ b/data/maps/PokemonLeague_ChampionsRoom/map.json
@@ -0,0 +1,61 @@
+{
+  "id": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM",
+  "name": "PokemonLeague_ChampionsRoom",
+  "layout": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM",
+  "music": "BGM_FRLG_INDIGO_PLATEAU",
+  "region_map_section": "MAPSEC_POKEMON_LEAGUE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "72",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "71",
+      "x": 6,
+      "y": 15,
+      "elevation": 0,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "90"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_LEAGUE_LANCES_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_LEAGUE_HALL_OF_FAME",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
new file mode 100644
index 000000000..b2b8bc46c
--- /dev/null
+++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
@@ -0,0 +1,247 @@
+PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2
+	map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D
+	map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2
+	map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C
+	.byte 0
+
+PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2
+	setvar VAR_0x8004, 4
+	call EventScript_1A75D5
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_162B1E
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_162B31
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_162B44
+	end
+
+EventScript_162B1E:: @ 8162B1E
+	checktrainerflag FLAG_0x1B6
+	goto_if_eq EventScript_162B57
+	checktrainerflag FLAG_0x2E3
+	goto_if_eq EventScript_162B57
+	return
+
+EventScript_162B31:: @ 8162B31
+	checktrainerflag FLAG_0x1B7
+	goto_if_eq EventScript_162B57
+	checktrainerflag FLAG_0x2E4
+	goto_if_eq EventScript_162B57
+	return
+
+EventScript_162B44:: @ 8162B44
+	checktrainerflag FLAG_0x1B8
+	goto_if_eq EventScript_162B57
+	checktrainerflag FLAG_0x2E5
+	goto_if_eq EventScript_162B57
+	return
+
+EventScript_162B57:: @ 8162B57
+	setvar VAR_0x4001, 1
+	return
+
+PokemonLeague_ChampionsRoom_MapScript1_162B5D:: @ 8162B5D
+	map_script_2 VAR_0x4001, 0, EventScript_162B67
+	.2byte 0
+
+EventScript_162B67:: @ 8162B67
+	turnobject 255, 2
+	end
+
+PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C
+	map_script_2 VAR_0x4001, 0, EventScript_162B76
+	.2byte 0
+
+EventScript_162B76:: @ 8162B76
+	lockall
+	textcolor 0
+	setflag FLAG_0x002
+	applymovement 255, Movement_162D07
+	waitmovement 0
+	delay 20
+	checkflag FLAG_0x82C
+	call_if 0, EventScript_162CB3
+	checkflag FLAG_0x82C
+	call_if 1, EventScript_162CBC
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_162C68
+	setflag FLAG_0x003
+	setflag FLAG_0x005
+	savebgm BGM_FRLG_KACHI_LEADER
+	checkflag FLAG_0x844
+	call_if 0, EventScript_162C6F
+	checkflag FLAG_0x844
+	call_if 1, EventScript_162C91
+	setflag FLAG_0x004
+	clearflag FLAG_0x005
+	setflag FLAG_0x4BC
+	setflag FLAG_0x004
+	msgbox gUnknown_8178F2F
+	playbgm BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 0
+	addobject 2
+	msgbox gUnknown_8178FC6
+	closemessage
+	applymovement 255, Movement_162D1F
+	applymovement 1, Movement_162D41
+	applymovement 2, Movement_162D2A
+	waitmovement 0
+	delay 25
+	specialvar VAR_RESULT, ScrSpecial_GetStarter
+	getspeciesname 0, VAR_RESULT
+	msgbox gUnknown_8178FCF
+	applymovement 2, Movement_1A75EB
+	applymovement 1, Movement_1A75E7
+	waitmovement 0
+	msgbox gUnknown_817908F
+	closemessage
+	applymovement 2, Movement_1A75ED
+	waitmovement 0
+	delay 20
+	msgbox gUnknown_81791A3
+	closemessage
+	delay 13
+	applymovement 2, Movement_162D37
+	applymovement 255, Movement_162D12
+	waitmovement 0
+	setvar VAR_0x4001, 1
+	warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12
+	waitstate
+	releaseall
+	end
+
+EventScript_162C68:: @ 8162C68
+	call EventScript_162B57
+	releaseall
+	end
+
+EventScript_162C6F:: @ 8162C6F
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_162CC5
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_162CD0
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_162CDB
+	return
+
+EventScript_162C91:: @ 8162C91
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_162CE6
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_162CF1
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_162CFC
+	return
+
+EventScript_162CB3:: @ 8162CB3
+	msgbox gUnknown_8178B6C
+	return
+
+EventScript_162CBC:: @ 8162CBC
+	msgbox gUnknown_8178CD4
+	return
+
+EventScript_162CC5:: @ 8162CC5
+	trainerbattle 3, 438, 0, Text_178E3F
+	return
+
+EventScript_162CD0:: @ 8162CD0
+	trainerbattle 3, 439, 0, Text_178E3F
+	return
+
+EventScript_162CDB:: @ 8162CDB
+	trainerbattle 3, 440, 0, Text_178E3F
+	return
+
+EventScript_162CE6:: @ 8162CE6
+	trainerbattle 3, 739, 0, Text_178E3F
+	return
+
+EventScript_162CF1:: @ 8162CF1
+	trainerbattle 3, 740, 0, Text_178E3F
+	return
+
+EventScript_162CFC:: @ 8162CFC
+	trainerbattle 3, 741, 0, Text_178E3F
+	return
+
+Movement_162D07:: @ 8162D07
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_162D12:: @ 8162D12
+	step_1c
+	step_12
+	step_11
+	step_11
+	step_11
+	step_13
+	step_11
+	step_11
+	step_11
+	step_11
+	step_1b
+	step_60
+	step_end
+
+Movement_162D1F:: @ 8162D1F
+	step_1b
+	step_2d
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_2f
+	step_end
+
+Movement_162D2A:: @ 8162D2A
+	step_1c
+	step_1c
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_12
+	step_11
+	step_11
+	step_2d
+	step_1c
+	step_end
+
+Movement_162D37:: @ 8162D37
+	step_11
+	step_11
+	step_13
+	step_11
+	step_11
+	step_11
+	step_11
+	step_1b
+	step_60
+	step_end
+
+Movement_162D41:: @ 8162D41
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_2f
+	step_end
diff --git a/data/maps/PokemonLeague_ChampionsRoom/text.inc b/data/maps/PokemonLeague_ChampionsRoom/text.inc
new file mode 100644
index 000000000..a99db09db
--- /dev/null
+++ b/data/maps/PokemonLeague_ChampionsRoom/text.inc
@@ -0,0 +1,101 @@
+gUnknown_8178B6C:: @ 8178B6C
+    .string "{RIVAL}: Hey, {PLAYER}!\p"
+    .string "I was looking forward to seeing\n"
+    .string "you, {PLAYER}.\p"
+    .string "My rival should be strong to keep\n"
+    .string "me sharp.\p"
+    .string "While working on my POKéDEX, I\n"
+    .string "looked all over for POKéMON.\p"
+    .string "Not only that, I assembled teams\n"
+    .string "that would beat any POKéMON type.\p"
+    .string "And now…\p"
+    .string "I'm the POKéMON LEAGUE CHAMPION!\p"
+    .string "{PLAYER}!\n"
+    .string "Do you know what that means?\p"
+    .string "I'll tell you.\p"
+    .string "I am the most powerful TRAINER in\n"
+    .string "the world!$"
+
+gUnknown_8178CD4:: @ 8178CD4
+    .string "{RIVAL}: Hey, {PLAYER}!\p"
+    .string "You came back, {PLAYER}!\n"
+    .string "Hahah, that is so great!\p"
+    .string "My rival should be strong to keep\n"
+    .string "me sharp.\p"
+    .string "While working on my POKéDEX, I\n"
+    .string "looked all over for POKéMON.\p"
+    .string "Not only that, I assembled teams\n"
+    .string "that would beat any POKéMON type.\p"
+    .string "And now…\p"
+    .string "I'm the POKéMON LEAGUE CHAMPION!\p"
+    .string "{PLAYER}!\n"
+    .string "Do you know what that means?\p"
+    .string "I'll tell you.\p"
+    .string "I am the most powerful TRAINER in\n"
+    .string "the world!$"
+
+Text_178E3F:: @ 8178E3F
+    .string "NO!\n"
+    .string "That can't be!\l"
+    .string "You beat me at my best!\p"
+    .string "After all that work to become\n"
+    .string "the LEAGUE CHAMP?\p"
+    .string "My reign is over already?\n"
+    .string "It's not fair!$"
+
+Text_178EC3:: @ 8178EC3
+    .string "はーはッ！\n"
+    .string "かった！　かった！　かった！\p"
+    .string "{PLAYER}に　まける　ような\n"
+    .string "おれさま　では　なーい！\p"
+    .string "ま！　ポケモンの\n"
+    .string "てんさい　{RIVAL}さま　あいてに\l"
+    .string "ここまで　よく　がんばった！\p"
+    .string "ほめて　つかわす！\n"
+    .string "はーッ！　はーはッはッ！$"
+
+gUnknown_8178F2F:: @ 8178F2F
+    .string "Why?\n"
+    .string "Why did I lose?\p"
+    .string "I never made any mistakes raising\n"
+    .string "my POKéMON…\p"
+    .string "Darn it! You're the new POKéMON\n"
+    .string "LEAGUE CHAMPION!\p"
+    .string "Although I don't like to admit it…$"
+
+gUnknown_8178FC6:: @ 8178FC6
+    .string "OAK: {PLAYER}!$"
+
+gUnknown_8178FCF:: @ 8178FCF
+    .string "OAK: So, you've won!\n"
+    .string "Sincerely, congratulations!\p"
+    .string "You're the new POKéMON LEAGUE\n"
+    .string "CHAMPION!\p"
+    .string "You've grown up so much since you\n"
+    .string "first left with {STR_VAR_1} to work\l"
+    .string "on the POKéDEX.\p"
+    .string "{PLAYER}, you have come of age!$"
+
+gUnknown_817908F:: @ 817908F
+    .string "OAK: {RIVAL}…\n"
+    .string "I'm disappointed in you.\p"
+    .string "I came when I heard you'd beaten\n"
+    .string "the ELITE FOUR.\p"
+    .string "But, when I got here, you had\n"
+    .string "already lost!\p"
+    .string "{RIVAL}, do you understand why\n"
+    .string "you lost?\p"
+    .string "You have forgotten to treat your\n"
+    .string "POKéMON with love and trust.\p"
+    .string "Without them, you will never\n"
+    .string "become a CHAMP again!$"
+
+gUnknown_81791A3:: @ 81791A3
+    .string "OAK: {PLAYER}.\p"
+    .string "You understand that your victory\n"
+    .string "was not just your own doing.\p"
+    .string "The bond you share with your\n"
+    .string "POKéMON is marvelous.\p"
+    .string "{PLAYER}!\n"
+    .string "Come with me!$"
+
diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json
new file mode 100644
index 000000000..c2b3725fa
--- /dev/null
+++ b/data/maps/PokemonLeague_HallOfFame/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_POKEMON_LEAGUE_HALL_OF_FAME",
+  "name": "PokemonLeague_HallOfFame",
+  "layout": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME",
+  "music": "BGM_FRLG_HALL_OF_FAME_PALLET_TOWN",
+  "region_map_section": "MAPSEC_POKEMON_LEAGUE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "71",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc
new file mode 100644
index 000000000..faadadcda
--- /dev/null
+++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc
@@ -0,0 +1,54 @@
+PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C
+	map_script 2, PokemonLeague_HallOfFame_MapScript1_162D66
+	map_script 4, PokemonLeague_HallOfFame_MapScript2_162D57
+	.byte 0
+
+PokemonLeague_HallOfFame_MapScript2_162D57:: @ 8162D57
+	map_script_2 VAR_0x4001, 0, EventScript_162D61
+	.2byte 0
+
+EventScript_162D61:: @ 8162D61
+	turnobject 255, 2
+	end
+
+PokemonLeague_HallOfFame_MapScript1_162D66:: @ 8162D66
+	map_script_2 VAR_0x4001, 0, EventScript_162D70
+	.2byte 0
+
+EventScript_162D70:: @ 8162D70
+	lockall
+	textcolor 0
+	applymovement 255, Movement_162DCD
+	waitmovement 0
+	applymovement 1, Movement_1A75E7
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	delay 18
+	msgbox gUnknown_817922F
+	closemessage
+	applymovement 1, Movement_1A75E9
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	delay 20
+	dofieldeffect 62
+	waitfieldeffect 62
+	delay 40
+	setvar VAR_0x4001, 1
+	call EventScript_1A651A
+	setrespawn SPAWN_PALLET_TOWN
+	fadescreenspeed 1, 24
+	special sub_80CA2E4
+	waitstate
+	releaseall
+	end
+
+Movement_162DCD:: @ 8162DCD
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
diff --git a/data/maps/PokemonLeague_HallOfFame/text.inc b/data/maps/PokemonLeague_HallOfFame/text.inc
new file mode 100644
index 000000000..111f655cc
--- /dev/null
+++ b/data/maps/PokemonLeague_HallOfFame/text.inc
@@ -0,0 +1,15 @@
+gUnknown_817922F:: @ 817922F
+    .string "OAK: Er-hem!\n"
+    .string "Congratulations, {PLAYER}!\p"
+    .string "This floor is the POKéMON HALL OF\n"
+    .string "FAME.\p"
+    .string "POKéMON LEAGUE CHAMPIONS are\n"
+    .string "honored for their exploits here.\p"
+    .string "Their POKéMON are also recorded in\n"
+    .string "the HALL OF FAME.\p"
+    .string "{PLAYER}!\p"
+    .string "You have worked hard to become\n"
+    .string "the new LEAGUE CHAMPION.\p"
+    .string "Congratulations, {PLAYER}, you and\n"
+    .string "your POKéMON are HALL OF FAMERS!$"
+
diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json
new file mode 100644
index 000000000..c844c29d9
--- /dev/null
+++ b/data/maps/PokemonLeague_LancesRoom/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_POKEMON_LEAGUE_LANCES_ROOM",
+  "name": "PokemonLeague_LancesRoom",
+  "layout": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM",
+  "music": "BGM_FRLG_INDIGO_PLATEAU",
+  "region_map_section": "MAPSEC_POKEMON_LEAGUE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_7",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "74",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonLeague_LancesRoom_EventScript_162A14",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 23,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc
new file mode 100644
index 000000000..2eaebe6f7
--- /dev/null
+++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc
@@ -0,0 +1,180 @@
+PokemonLeague_LancesRoom_MapScripts:: @ 816292D
+	map_script 5, PokemonLeague_LancesRoom_MapScript1_162942
+	map_script 1, PokemonLeague_LancesRoom_MapScript2_16294D
+	map_script 4, PokemonLeague_LancesRoom_MapScript3_16296E
+	map_script 2, PokemonLeague_LancesRoom_MapScript4_16297D
+	.byte 0
+
+PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942
+	setvar VAR_0x8004, 3
+	call EventScript_1A75D5
+	end
+
+PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D
+	compare_var_to_value VAR_0x4068, 4
+	call_if 1, EventScript_162962
+	checkflag FLAG_0x4BB
+	call_if 1, EventScript_162968
+	end
+
+EventScript_162962:: @ 8162962
+	call EventScript_1629A8
+	return
+
+EventScript_162968:: @ 8162968
+	call EventScript_1A7589
+	return
+
+PokemonLeague_LancesRoom_MapScript3_16296E:: @ 816296E
+	map_script_2 VAR_0x4001, 0, EventScript_162978
+	.2byte 0
+
+EventScript_162978:: @ 8162978
+	turnobject 255, 2
+	end
+
+PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D
+	map_script_2 VAR_0x4068, 3, EventScript_162987
+	.2byte 0
+
+EventScript_162987:: @ 8162987
+	lockall
+	applymovement 255, Movement_1629F1
+	waitmovement 0
+	setflag FLAG_0x002
+	call EventScript_1629A8
+	playse SE_FU_ZAKU2
+	special DrawWholeMapView
+	waitse
+	setvar VAR_0x4068, 4
+	releaseall
+	end
+
+EventScript_1629A8:: @ 81629A8
+	setmetatile 5, 14, 669, 1
+	setmetatile 6, 14, 670, 1
+	setmetatile 7, 14, 671, 1
+	setmetatile 5, 15, 677, 1
+	setmetatile 6, 15, 678, 1
+	setmetatile 7, 15, 679, 1
+	setmetatile 6, 16, 785, 0
+	setmetatile 7, 16, 785, 0
+	return
+
+Movement_1629F1:: @ 81629F1
+	step_11
+	step_11
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
+	lock
+	faceplayer
+	setvar VAR_0x8004, 12
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	checkflag FLAG_0x4BB
+	goto_if_eq EventScript_162AA1
+	setvar VAR_0x8004, 12
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	setvar VAR_0x8004, 12
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	checkflag FLAG_0x82C
+	call_if 0, EventScript_162A79
+	checkflag FLAG_0x82C
+	call_if 1, EventScript_162A82
+	setflag FLAG_0x003
+	setflag FLAG_0x005
+	checkflag FLAG_0x844
+	call_if 0, EventScript_162A8B
+	checkflag FLAG_0x844
+	call_if 1, EventScript_162A96
+	clearflag FLAG_0x005
+	goto EventScript_162AAB
+
+EventScript_162A78:: @ 8162A78
+	end
+
+EventScript_162A79:: @ 8162A79
+	msgbox gUnknown_8178764
+	return
+
+EventScript_162A82:: @ 8162A82
+	msgbox gUnknown_81788BD
+	return
+
+EventScript_162A8B:: @ 8162A8B
+	trainerbattle 3, 413, 0, Text_178A15
+	return
+
+EventScript_162A96:: @ 8162A96
+	trainerbattle 3, 738, 0, Text_178A15
+	return
+
+EventScript_162AA1:: @ 8162AA1
+	msgbox gUnknown_8178A52
+	release
+	end
+
+EventScript_162AAB:: @ 8162AAB
+	setvar VAR_0x8004, 0
+	special sub_8113530
+	setflag FLAG_0x4BB
+	call EventScript_1A7563
+	msgbox gUnknown_8178A52
+	closemessage
+	release
+	end
+
+EventScript_162AC6:: @ 8162AC6
+	applymovement 1, Movement_162ADC
+	waitmovement 0
+	return
+
+EventScript_162AD1:: @ 8162AD1
+	applymovement 1, Movement_162ADF
+	waitmovement 0
+	return
+
+Movement_162ADC:: @ 8162ADC
+	step_12
+	step_30
+	step_end
+
+Movement_162ADF:: @ 8162ADF
+	step_13
+	step_2f
+	step_end
diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc
new file mode 100644
index 000000000..ea0b7df7e
--- /dev/null
+++ b/data/maps/PokemonLeague_LancesRoom/text.inc
@@ -0,0 +1,52 @@
+gUnknown_8178764:: @ 8178764
+    .string "Ah! I've heard about you,\n"
+    .string "{PLAYER}!\p"
+    .string "I lead the ELITE FOUR.\p"
+    .string "You can call me LANCE the dragon\n"
+    .string "TRAINER.\p"
+    .string "You know that dragons are\n"
+    .string "mythical POKéMON.\p"
+    .string "They're hard to catch and raise,\n"
+    .string "but their powers are superior.\p"
+    .string "They're virtually indestructible.\n"
+    .string "There's no being clever with them.\p"
+    .string "Well, are you ready to lose?\p"
+    .string "Your LEAGUE challenge ends with\n"
+    .string "me, {PLAYER}!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+gUnknown_81788BD:: @ 81788BD
+    .string "Ah!\n"
+    .string "So, you've returned, {PLAYER}!\p"
+    .string "I lead the ELITE FOUR.\p"
+    .string "You can call me LANCE the dragon\n"
+    .string "TRAINER.\p"
+    .string "You know that dragons are\n"
+    .string "mythical POKéMON.\p"
+    .string "They're hard to catch and raise,\n"
+    .string "but their powers are superior.\p"
+    .string "They're virtually indestructible.\n"
+    .string "There's no being clever with them.\p"
+    .string "Well, are you ready to lose?\p"
+    .string "Your LEAGUE challenge ends with\n"
+    .string "me, {PLAYER}!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+Text_178A15:: @ 8178A15
+    .string "That's it!\p"
+    .string "I hate to admit it, but you are a\n"
+    .string "POKéMON master!$"
+
+gUnknown_8178A52:: @ 8178A52
+    .string "I still can't believe my dragons\n"
+    .string "lost to you, {PLAYER}.\p"
+    .string "You are now the POKéMON LEAGUE\n"
+    .string "CHAMPION!\p"
+    .string "…Or, you would have been, but\n"
+    .string "you have one more challenge left.\p"
+    .string "There is one more TRAINER to face!\n"
+    .string "His name is…\p"
+    .string "{RIVAL}!\p"
+    .string "He beat the ELITE FOUR before\n"
+    .string "you.\p"
+    .string "He is the real POKéMON LEAGUE\n"
+    .string "CHAMPION.$"
+
diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json
new file mode 100644
index 000000000..33b250e35
--- /dev/null
+++ b/data/maps/PokemonLeague_LoreleisRoom/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM",
+  "name": "PokemonLeague_LoreleisRoom",
+  "layout": "LAYOUT_POKEMON_LEAGUE_LORELEIS_ROOM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_POKEMON_LEAGUE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_4",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "77",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonLeague_LoreleisRoom_EventScript_1625DC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
new file mode 100644
index 000000000..60e2b5086
--- /dev/null
+++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
@@ -0,0 +1,108 @@
+PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C
+	map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586
+	map_script 1, PokemonLeague_LoreleisRoom_MapScript2_162591
+	map_script 3, PokemonLeague_LoreleisRoom_MapScript3_1625B2
+	map_script 4, PokemonLeague_LoreleisRoom_MapScript4_1625B6
+	map_script 2, PokemonLeague_LoreleisRoom_MapScript5_1625C5
+	.byte 0
+
+PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586
+	setvar VAR_0x8004, 0
+	call EventScript_1A75D5
+	end
+
+PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591
+	checkflag FLAG_0x4B8
+	call_if 1, EventScript_1625AC
+	compare_var_to_value VAR_0x4068, 1
+	call_if 1, EventScript_1625A6
+	end
+
+EventScript_1625A6:: @ 81625A6
+	call EventScript_1A759C
+	return
+
+EventScript_1625AC:: @ 81625AC
+	call EventScript_1A7538
+	return
+
+PokemonLeague_LoreleisRoom_MapScript3_1625B2:: @ 81625B2
+	setworldmapflag FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM
+	end
+
+PokemonLeague_LoreleisRoom_MapScript4_1625B6:: @ 81625B6
+	map_script_2 VAR_0x4001, 0, EventScript_1625C0
+	.2byte 0
+
+EventScript_1625C0:: @ 81625C0
+	turnobject 255, 2
+	end
+
+PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5
+	map_script_2 VAR_0x4068, 0, EventScript_1625CF
+	.2byte 0
+
+EventScript_1625CF:: @ 81625CF
+	lockall
+	call EventScript_1A751F
+	setvar VAR_0x4068, 1
+	releaseall
+	end
+
+PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC
+	lock
+	faceplayer
+	setvar VAR_0x8004, 9
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	checkflag FLAG_0x4B8
+	goto_if_eq EventScript_162669
+	setvar VAR_0x8004, 9
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	setvar VAR_0x8004, 9
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	checkflag FLAG_0x844
+	call_if 0, EventScript_162641
+	checkflag FLAG_0x844
+	call_if 1, EventScript_16264A
+	setflag FLAG_0x003
+	setflag FLAG_0x005
+	checkflag FLAG_0x844
+	call_if 0, EventScript_162653
+	checkflag FLAG_0x844
+	call_if 1, EventScript_16265E
+	clearflag FLAG_0x005
+	goto EventScript_162673
+
+EventScript_162640:: @ 8162640
+	end
+
+EventScript_162641:: @ 8162641
+	msgbox gUnknown_8177FA4
+	return
+
+EventScript_16264A:: @ 816264A
+	msgbox gUnknown_8178089
+	return
+
+EventScript_162653:: @ 8162653
+	trainerbattle 3, 410, 0, Text_178191
+	return
+
+EventScript_16265E:: @ 816265E
+	trainerbattle 3, 735, 0, Text_178191
+	return
+
+EventScript_162669:: @ 8162669
+	msgbox gUnknown_81781B0
+	release
+	end
+
+EventScript_162673:: @ 8162673
+	setflag FLAG_0x4B8
+	call EventScript_1A7506
+	msgbox gUnknown_81781B0
+	release
+	end
diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc
new file mode 100644
index 000000000..56beafa3d
--- /dev/null
+++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc
@@ -0,0 +1,33 @@
+gUnknown_8177FA4:: @ 8177FA4
+    .string "Welcome to the POKéMON LEAGUE.\p"
+    .string "I am LORELEI of the ELITE FOUR.\p"
+    .string "No one can best me when it comes\n"
+    .string "to icy POKéMON.\p"
+    .string "Freezing moves are powerful.\p"
+    .string "Your POKéMON will be at my mercy\n"
+    .string "when they are frozen solid.\p"
+    .string "Hahaha!\n"
+    .string "Are you ready?{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+gUnknown_8178089:: @ 8178089
+    .string "Welcome to the POKéMON LEAGUE.\p"
+    .string "I, LORELEI of the ELITE FOUR,\n"
+    .string "have returned!\p"
+    .string "You know how it goes.\n"
+    .string "No one can best me when it comes\l"
+    .string "to icy POKéMON.\p"
+    .string "Freezing moves are powerful.\p"
+    .string "Your POKéMON will be at my mercy\n"
+    .string "when they are frozen solid.\p"
+    .string "Hahaha!\n"
+    .string "Are you ready?{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+Text_178191:: @ 8178191
+    .string "…Things shouldn't be this way!$"
+
+gUnknown_81781B0:: @ 81781B0
+    .string "You're better than I thought.\n"
+    .string "Go on ahead.\p"
+    .string "You only got a taste of the\n"
+    .string "POKéMON LEAGUE's power.$"
+
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
new file mode 100644
index 000000000..fb42651aa
--- /dev/null
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -0,0 +1,173 @@
+{
+  "id": "MAP_POKEMON_MANSION_1F",
+  "name": "PokemonMansion_1F",
+  "layout": "LAYOUT_POKEMON_MANSION_1F",
+  "music": "BGM_FRLG_POKEMON_MANSION",
+  "region_map_section": "MAPSEC_POKEMON_MANSION",
+  "requires_flash": false,
+  "weather": "WEATHER_CLOUDY",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 22,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "PokemonMansion_1F_EventScript_162226",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 29,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_1F_EventScript_1BE95D",
+      "flag": "415"
+    },
+    {
+      "graphics_id": "92",
+      "x": 22,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_1F_EventScript_1BE96A",
+      "flag": "416"
+    },
+    {
+      "graphics_id": "92",
+      "x": 27,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_1F_EventScript_1BEB65",
+      "flag": "458"
+    },
+    {
+      "graphics_id": "18",
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "PokemonMansion_1F_EventScript_16223D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 25,
+      "y": 27,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 34,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 35,
+      "y": 34,
+      "elevation": 0,
+      "dest_map": "MAP_CINNABAR_ISLAND",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_3F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 20,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_3F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 11,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_POKEMON_MANSION_2F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 5,
+      "y": 5,
+      "elevation": 0,
+      "script": "PokemonMansion_1F_EventScript_162212"
+    },
+    {
+      "type": "hidden_item",
+      "x": 2,
+      "y": 21,
+      "elevation": 0,
+      "item": "ITEM_MOON_STONE",
+      "flag": "31",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc
new file mode 100644
index 000000000..3055cc30c
--- /dev/null
+++ b/data/maps/PokemonMansion_1F/scripts.inc
@@ -0,0 +1,33 @@
+PokemonMansion_1F_MapScripts:: @ 81621F9
+	map_script 1, PokemonMansion_1F_MapScript1_162204
+	map_script 3, PokemonMansion_1F_MapScript2_16220E
+	.byte 0
+
+PokemonMansion_1F_MapScript1_162204:: @ 8162204
+	checkflag FLAG_0x26C
+	call_if 1, EventScript_1A7B7A
+	end
+
+PokemonMansion_1F_MapScript2_16220E:: @ 816220E
+	setworldmapflag FLAG_WORLD_MAP_POKEMON_MANSION_1F
+	end
+
+PokemonMansion_1F_EventScript_162212:: @ 8162212
+	lockall
+	setvar VAR_0x8004, 0
+	call EventScript_1A7AE2
+	playse SE_FU_ZAKU2
+	special DrawWholeMapView
+	waitse
+	releaseall
+	end
+
+PokemonMansion_1F_EventScript_162226:: @ 8162226
+	trainerbattle 0, 335, 0, Text_177364, Text_177391
+	msgbox gUnknown_8177397, 6
+	end
+
+PokemonMansion_1F_EventScript_16223D:: @ 816223D
+	trainerbattle 0, 534, 0, Text_1773C6, Text_1773FD
+	msgbox gUnknown_8177418, 6
+	end
diff --git a/data/maps/PokemonMansion_1F/text.inc b/data/maps/PokemonMansion_1F/text.inc
new file mode 100644
index 000000000..52eece07b
--- /dev/null
+++ b/data/maps/PokemonMansion_1F/text.inc
@@ -0,0 +1,24 @@
+Text_177364:: @ 8177364
+    .string "Who are you?\n"
+    .string "There shouldn't be anyone here.$"
+
+Text_177391:: @ 8177391
+    .string "Ouch!$"
+
+gUnknown_8177397:: @ 8177397
+    .string "A key? I don't know what you're\n"
+    .string "talking about.$"
+
+Text_1773C6:: @ 81773C6
+    .string "W-w-waah! You startled me!\n"
+    .string "I thought you were a ghost.$"
+
+Text_1773FD:: @ 81773FD
+    .string "Tch!\n"
+    .string "I can't get any wins.$"
+
+gUnknown_8177418:: @ 8177418
+    .string "I was exploring here by myself,\n"
+    .string "but I feel spooked.\p"
+    .string "I ought to go soon.$"
+
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
new file mode 100644
index 000000000..685e1dada
--- /dev/null
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -0,0 +1,130 @@
+{
+  "id": "MAP_POKEMON_MANSION_2F",
+  "name": "PokemonMansion_2F",
+  "layout": "LAYOUT_POKEMON_MANSION_2F",
+  "music": "BGM_FRLG_POKEMON_MANSION",
+  "region_map_section": "MAPSEC_POKEMON_MANSION",
+  "requires_flash": false,
+  "weather": "WEATHER_CLOUDY",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "52",
+      "x": 5,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "PokemonMansion_2F_EventScript_16228A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 36,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_2F_EventScript_1BE977",
+      "flag": "417"
+    },
+    {
+      "graphics_id": "92",
+      "x": 18,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_2F_EventScript_1BEB72",
+      "flag": "459"
+    },
+    {
+      "graphics_id": "92",
+      "x": 35,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_2F_EventScript_1BEB7F",
+      "flag": "460"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 34,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 9,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 27,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_3F",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 2,
+      "y": 16,
+      "elevation": 0,
+      "script": "PokemonMansion_2F_EventScript_162264"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 31,
+      "elevation": 0,
+      "script": "PokemonMansion_2F_EventScript_162281"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 25,
+      "y": 4,
+      "elevation": 0,
+      "script": "PokemonMansion_2F_EventScript_162278"
+    }
+  ]
+}
diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc
new file mode 100644
index 000000000..275b7ac28
--- /dev/null
+++ b/data/maps/PokemonMansion_2F/scripts.inc
@@ -0,0 +1,31 @@
+PokemonMansion_2F_MapScripts:: @ 8162254
+	map_script 1, PokemonMansion_2F_MapScript1_16225A
+	.byte 0
+
+PokemonMansion_2F_MapScript1_16225A:: @ 816225A
+	checkflag FLAG_0x26C
+	call_if 1, EventScript_1A7D3E
+	end
+
+PokemonMansion_2F_EventScript_162264:: @ 8162264
+	lockall
+	setvar VAR_0x8004, 1
+	call EventScript_1A7AE2
+	playse SE_FU_ZAKU2
+	special DrawWholeMapView
+	waitse
+	releaseall
+	end
+
+PokemonMansion_2F_EventScript_162278:: @ 8162278
+	msgbox gUnknown_817751F, 3
+	end
+
+PokemonMansion_2F_EventScript_162281:: @ 8162281
+	msgbox gUnknown_8177574, 3
+	end
+
+PokemonMansion_2F_EventScript_16228A:: @ 816228A
+	trainerbattle 0, 216, 0, Text_177498, Text_1774CB
+	msgbox gUnknown_81774E3, 6
+	end
diff --git a/data/maps/PokemonMansion_2F/text.inc b/data/maps/PokemonMansion_2F/text.inc
new file mode 100644
index 000000000..4428137de
--- /dev/null
+++ b/data/maps/PokemonMansion_2F/text.inc
@@ -0,0 +1,33 @@
+Text_177460:: @ 8177460
+    .string "A secret switch!\p"
+    .string "Press it?$"
+
+Text_17747B:: @ 817747B
+    .string "Who wouldn't?$"
+
+Text_177489:: @ 8177489
+    .string "Not quite yet!$"
+
+Text_177498:: @ 8177498
+    .string "I can't get out!\n"
+    .string "This old place is one big puzzle.$"
+
+Text_1774CB:: @ 81774CB
+    .string "Oh, no!\n"
+    .string "My bag of loot!$"
+
+gUnknown_81774E3:: @ 81774E3
+    .string "The switches here open and close\n"
+    .string "alternating sets of doors.$"
+
+gUnknown_817751F:: @ 817751F
+    .string "Diary: July 5\n"
+    .string "Guyana, South America\p"
+    .string "A new POKéMON was discovered deep\n"
+    .string "in the jungle.$"
+
+gUnknown_8177574:: @ 8177574
+    .string "Diary: July 10\n"
+    .string "We christened the newly discovered\l"
+    .string "POKéMON, MEW.$"
+
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
new file mode 100644
index 000000000..9372efde9
--- /dev/null
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -0,0 +1,153 @@
+{
+  "id": "MAP_POKEMON_MANSION_3F",
+  "name": "PokemonMansion_3F",
+  "layout": "LAYOUT_POKEMON_MANSION_3F",
+  "music": "BGM_FRLG_POKEMON_MANSION",
+  "region_map_section": "MAPSEC_POKEMON_MANSION",
+  "requires_flash": false,
+  "weather": "WEATHER_CLOUDY",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "52",
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "PokemonMansion_3F_EventScript_1622CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 22,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "PokemonMansion_3F_EventScript_1622E5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 9,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_3F_EventScript_1BE984",
+      "flag": "418"
+    },
+    {
+      "graphics_id": "92",
+      "x": 32,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_3F_EventScript_1BE991",
+      "flag": "419"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 34,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 18,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 19,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_1F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 23,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_2F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 20,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_1F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 24,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_2F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 16,
+      "elevation": 0,
+      "script": "PokemonMansion_3F_EventScript_1622C5"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "script": "PokemonMansion_3F_EventScript_1622B1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 36,
+      "y": 13,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "32",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc
new file mode 100644
index 000000000..5495e5964
--- /dev/null
+++ b/data/maps/PokemonMansion_3F/scripts.inc
@@ -0,0 +1,32 @@
+PokemonMansion_3F_MapScripts:: @ 81622A1
+	map_script 1, PokemonMansion_3F_MapScript1_1622A7
+	.byte 0
+
+PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7
+	checkflag FLAG_0x26C
+	call_if 1, EventScript_1A7E72
+	end
+
+PokemonMansion_3F_EventScript_1622B1:: @ 81622B1
+	lockall
+	setvar VAR_0x8004, 2
+	call EventScript_1A7AE2
+	playse SE_FU_ZAKU2
+	special DrawWholeMapView
+	waitse
+	releaseall
+	end
+
+PokemonMansion_3F_EventScript_1622C5:: @ 81622C5
+	msgbox gUnknown_8177685, 3
+	end
+
+PokemonMansion_3F_EventScript_1622CE:: @ 81622CE
+	trainerbattle 0, 218, 0, Text_1775E7, Text_177602
+	msgbox gUnknown_8177608, 6
+	end
+
+PokemonMansion_3F_EventScript_1622E5:: @ 81622E5
+	trainerbattle 0, 346, 0, Text_177628, Text_177643
+	msgbox gUnknown_8177657, 6
+	end
diff --git a/data/maps/PokemonMansion_3F/text.inc b/data/maps/PokemonMansion_3F/text.inc
new file mode 100644
index 000000000..1c027784c
--- /dev/null
+++ b/data/maps/PokemonMansion_3F/text.inc
@@ -0,0 +1,35 @@
+Text_1775B4:: @ 81775B4
+    .string "ひみつの　スイッチが　ある！\p"
+    .string "おして　みますか？$"
+
+Text_1775CD:: @ 81775CD
+    .string "おしてみよう！　‥ポチッとな$"
+
+Text_1775DC:: @ 81775DC
+    .string "ÈÒçè ÀÊúòŒ$"
+
+Text_1775E7:: @ 81775E7
+    .string "This place is, like, huge!$"
+
+Text_177602:: @ 8177602
+    .string "Ayah!$"
+
+gUnknown_8177608:: @ 8177608
+    .string "I wonder where my partner went.$"
+
+Text_177628:: @ 8177628
+    .string "My mentor once lived here.$"
+
+Text_177643:: @ 8177643
+    .string "Whew!\n"
+    .string "Overwhelming!$"
+
+gUnknown_8177657:: @ 8177657
+    .string "So, you're stuck?\n"
+    .string "Try jumping off over there!$"
+
+gUnknown_8177685:: @ 8177685
+    .string "Diary: Feb. 6\n"
+    .string "MEW gave birth.\p"
+    .string "We named the newborn MEWTWO.$"
+
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
new file mode 100644
index 000000000..0eac3643d
--- /dev/null
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -0,0 +1,137 @@
+{
+  "id": "MAP_POKEMON_MANSION_B1F",
+  "name": "PokemonMansion_B1F",
+  "layout": "LAYOUT_POKEMON_MANSION_B1F",
+  "music": "BGM_FRLG_POKEMON_MANSION",
+  "region_map_section": "MAPSEC_POKEMON_MANSION",
+  "requires_flash": false,
+  "weather": "WEATHER_CLOUDY",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 6,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_B1F_EventScript_1BE9B8",
+      "flag": "423"
+    },
+    {
+      "graphics_id": "52",
+      "x": 20,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "PokemonMansion_B1F_EventScript_162329",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 34,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 6,
+      "script": "PokemonMansion_B1F_EventScript_162340",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 23,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_B1F_EventScript_1BE99E",
+      "flag": "420"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_B1F_EventScript_1BE9AB",
+      "flag": "421"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonMansion_B1F_EventScript_1BE9C5",
+      "flag": "424"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 34,
+      "y": 29,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_MANSION_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 27,
+      "elevation": 0,
+      "script": "PokemonMansion_B1F_EventScript_162320"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 24,
+      "y": 29,
+      "elevation": 0,
+      "script": "PokemonMansion_B1F_EventScript_16230C"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 27,
+      "y": 5,
+      "elevation": 0,
+      "script": "PokemonMansion_B1F_EventScript_16230C"
+    },
+    {
+      "type": "hidden_item",
+      "x": 35,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_ELIXIR",
+      "flag": "33",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc
new file mode 100644
index 000000000..a09b2fa53
--- /dev/null
+++ b/data/maps/PokemonMansion_B1F/scripts.inc
@@ -0,0 +1,32 @@
+PokemonMansion_B1F_MapScripts:: @ 81622FC
+	map_script 1, PokemonMansion_B1F_MapScript1_162302
+	.byte 0
+
+PokemonMansion_B1F_MapScript1_162302:: @ 8162302
+	checkflag FLAG_0x26C
+	call_if 1, EventScript_1A7F4C
+	end
+
+PokemonMansion_B1F_EventScript_16230C:: @ 816230C
+	lockall
+	setvar VAR_0x8004, 3
+	call EventScript_1A7AE2
+	playse SE_FU_ZAKU2
+	special DrawWholeMapView
+	waitse
+	releaseall
+	end
+
+PokemonMansion_B1F_EventScript_162320:: @ 8162320
+	msgbox gUnknown_8177798, 3
+	end
+
+PokemonMansion_B1F_EventScript_162329:: @ 8162329
+	trainerbattle 0, 219, 0, Text_1776C0, Text_1776D7
+	msgbox gUnknown_81776DE, 6
+	end
+
+PokemonMansion_B1F_EventScript_162340:: @ 8162340
+	trainerbattle 0, 347, 0, Text_177720, Text_177757
+	msgbox gUnknown_817776A, 6
+	end
diff --git a/data/maps/PokemonMansion_B1F/text.inc b/data/maps/PokemonMansion_B1F/text.inc
new file mode 100644
index 000000000..b04ee2397
--- /dev/null
+++ b/data/maps/PokemonMansion_B1F/text.inc
@@ -0,0 +1,28 @@
+Text_1776C0:: @ 81776C0
+    .string "Uh-oh…\n"
+    .string "Where am I now?$"
+
+Text_1776D7:: @ 81776D7
+    .string "Awooh!$"
+
+gUnknown_81776DE:: @ 81776DE
+    .string "You can find stuff lying around.\n"
+    .string "The residents must've left them.$"
+
+Text_177720:: @ 8177720
+    .string "This place is ideal for a lab.\n"
+    .string "Look at all this space.$"
+
+Text_177757:: @ 8177757
+    .string "What was that for?$"
+
+gUnknown_817776A:: @ 817776A
+    .string "I like it here.\n"
+    .string "It's conducive to my studies.$"
+
+gUnknown_8177798:: @ 8177798
+    .string "Diary: Sept. 1\n"
+    .string "MEWTWO is far too powerful.\p"
+    .string "We have failed to curb its vicious\n"
+    .string "tendencies…$"
+
diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json
new file mode 100644
index 000000000..ec5026d87
--- /dev/null
+++ b/data/maps/PokemonTower_1F/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_POKEMON_TOWER_1F",
+  "name": "PokemonTower_1F",
+  "layout": "LAYOUT_POKEMON_TOWER_1F",
+  "music": "BGM_FRLG_POKEMON_TOWER",
+  "region_map_section": "MAPSEC_POKEMON_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 5,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "48",
+      "x": 18,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_1F_EventScript_16327C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 18,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_1F_EventScript_16323F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_1F_EventScript_163248",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "31",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_1F_EventScript_16325A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_1F_EventScript_163251",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_LAVENDER_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_2F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc
new file mode 100644
index 000000000..c86280b74
--- /dev/null
+++ b/data/maps/PokemonTower_1F/scripts.inc
@@ -0,0 +1,38 @@
+PokemonTower_1F_MapScripts:: @ 8163235
+	map_script 3, PokemonTower_1F_MapScript1_16323B
+	.byte 0
+
+PokemonTower_1F_MapScript1_16323B:: @ 816323B
+	setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F
+	end
+
+PokemonTower_1F_EventScript_16323F:: @ 816323F
+	msgbox gUnknown_8179CAB, 2
+	end
+
+PokemonTower_1F_EventScript_163248:: @ 8163248
+	msgbox gUnknown_8179C8C, 2
+	end
+
+PokemonTower_1F_EventScript_163251:: @ 8163251
+	msgbox gUnknown_8179C41, 2
+	end
+
+PokemonTower_1F_EventScript_16325A:: @ 816325A
+	lock
+	faceplayer
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_163272
+	msgbox gUnknown_8179BFC
+	release
+	end
+
+EventScript_163272:: @ 8163272
+	msgbox gUnknown_8179BB8
+	release
+	end
+
+PokemonTower_1F_EventScript_16327C:: @ 816327C
+	msgbox gUnknown_8179B7A, 2
+	end
diff --git a/data/maps/PokemonTower_1F/text.inc b/data/maps/PokemonTower_1F/text.inc
new file mode 100644
index 000000000..33aca9fb7
--- /dev/null
+++ b/data/maps/PokemonTower_1F/text.inc
@@ -0,0 +1,29 @@
+gUnknown_8179B7A:: @ 8179B7A
+    .string "POKéMON TOWER was erected in the\n"
+    .string "memory of POKéMON that died.$"
+
+gUnknown_8179BB8:: @ 8179BB8
+    .string "Did you come to pay respects?\p"
+    .string "Bless your POKéMON-loving heart,\n"
+    .string "son.$"
+
+gUnknown_8179BFC:: @ 8179BFC
+    .string "Did you come to pay respects?\p"
+    .string "Bless your POKéMON-loving heart,\n"
+    .string "girl.$"
+
+gUnknown_8179C41:: @ 8179C41
+    .string "I came to pray for my dearly\n"
+    .string "departed CLEFAIRY.\p"
+    .string "Sniff!\n"
+    .string "I'm awash in tears…$"
+
+gUnknown_8179C8C:: @ 8179C8C
+    .string "My GROWLITHE…\n"
+    .string "Why did you die?$"
+
+gUnknown_8179CAB:: @ 8179CAB
+    .string "I am a CHANNELER.\p"
+    .string "There are spirits up to mischief.\n"
+    .string "I sense them high in the TOWER.$"
+
diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json
new file mode 100644
index 000000000..bcffe3fee
--- /dev/null
+++ b/data/maps/PokemonTower_2F/map.json
@@ -0,0 +1,80 @@
+{
+  "id": "MAP_POKEMON_TOWER_2F",
+  "name": "PokemonTower_2F",
+  "layout": "LAYOUT_POKEMON_TOWER_2F",
+  "music": "BGM_FRLG_POKEMON_TOWER",
+  "region_map_section": "MAPSEC_POKEMON_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 5,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "72",
+      "x": 16,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "81"
+    },
+    {
+      "graphics_id": "58",
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_2F_EventScript_163286",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x405D",
+      "var_value": 0,
+      "script": "PokemonTower_2F_EventScript_16328F"
+    },
+    {
+      "type": "trigger",
+      "x": 16,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x405D",
+      "var_value": 0,
+      "script": "PokemonTower_2F_EventScript_16329B"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc
new file mode 100644
index 000000000..f4657bbfc
--- /dev/null
+++ b/data/maps/PokemonTower_2F/scripts.inc
@@ -0,0 +1,108 @@
+PokemonTower_2F_MapScripts:: @ 8163285
+	.byte 0
+
+PokemonTower_2F_EventScript_163286:: @ 8163286
+	msgbox gUnknown_8179EAE, 2
+	end
+
+PokemonTower_2F_EventScript_16328F:: @ 816328F
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_1632A7
+	end
+
+PokemonTower_2F_EventScript_16329B:: @ 816329B
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_1632A7
+	end
+
+EventScript_1632A7:: @ 81632A7
+	textcolor 0
+	playbgm BGM_FRLG_RIVAL, 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_163339
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16334B
+	applymovement 1, Movement_1A75DB
+	waitmovement 0
+	applymovement 1, Movement_1A75DD
+	waitmovement 0
+	msgbox gUnknown_8179CFF
+	setvar VAR_LAST_TALKED, 1
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_16335D
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_163368
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_163373
+	msgbox gUnknown_8179DD4
+	closemessage
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16337E
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_163389
+	playse SE_KAIDAN
+	delay 25
+	fadedefaultbgm
+	removeobject 1
+	setvar VAR_0x405D, 1
+	releaseall
+	end
+
+EventScript_163339:: @ 8163339
+	applymovement 1, Movement_1A75EB
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_16334B:: @ 816334B
+	applymovement 1, Movement_1A75ED
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_16335D:: @ 816335D
+	trainerbattle 3, 429, 0, Text_179D73
+	return
+
+EventScript_163368:: @ 8163368
+	trainerbattle 3, 430, 0, Text_179D73
+	return
+
+EventScript_163373:: @ 8163373
+	trainerbattle 3, 431, 0, Text_179D73
+	return
+
+EventScript_16337E:: @ 816337E
+	applymovement 1, Movement_163394
+	waitmovement 0
+	return
+
+EventScript_163389:: @ 8163389
+	applymovement 1, Movement_16339D
+	waitmovement 0
+	return
+
+Movement_163394:: @ 8163394
+	step_10
+	step_13
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_30
+	step_end
+
+Movement_16339D:: @ 816339D
+	step_13
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_30
+	step_end
diff --git a/data/maps/PokemonTower_2F/text.inc b/data/maps/PokemonTower_2F/text.inc
new file mode 100644
index 000000000..b45235d7d
--- /dev/null
+++ b/data/maps/PokemonTower_2F/text.inc
@@ -0,0 +1,36 @@
+gUnknown_8179CFF:: @ 8179CFF
+    .string "{RIVAL}: Hey, {PLAYER}!\n"
+    .string "What brings you here?\l"
+    .string "Is your POKéMON dead?\p"
+    .string "Hey! It's alive!\p"
+    .string "I can at least make them faint!\n"
+    .string "Let's go!$"
+
+Text_179D73:: @ 8179D73
+    .string "What?\n"
+    .string "You stinker!\p"
+    .string "I took it easy on you, too!$"
+
+Text_179DA2:: @ 8179DA2
+    .string "{RIVAL}“あーあ‥！\n"
+    .string "ほんとに　くたばっちまったぞ！\l"
+    .string "よわいなー！\l"
+    .string "もっと　ちゃんと　そだてて　やれよ$"
+
+gUnknown_8179DD4:: @ 8179DD4
+    .string "How's your POKéDEX coming?\n"
+    .string "I just caught a CUBONE!\p"
+    .string "I can't find the bigger MAROWAK.\n"
+    .string "Where could they be?\p"
+    .string "I bet there aren't any left!\p"
+    .string "Well, I better get going.\n"
+    .string "I've got a lot to accomplish,\l"
+    .string "unlike you.\p"
+    .string "Smell ya later!$"
+
+gUnknown_8179EAE:: @ 8179EAE
+    .string "Even we could not identify the\n"
+    .string "wayward ghosts.\p"
+    .string "A SILPH SCOPE might be able to\n"
+    .string "unmask them.$"
+
diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json
new file mode 100644
index 000000000..853179061
--- /dev/null
+++ b/data/maps/PokemonTower_3F/map.json
@@ -0,0 +1,87 @@
+{
+  "id": "MAP_POKEMON_TOWER_3F",
+  "name": "PokemonTower_3F",
+  "layout": "LAYOUT_POKEMON_TOWER_3F",
+  "music": "BGM_FRLG_POKEMON_TOWER",
+  "region_map_section": "MAPSEC_POKEMON_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 5,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "58",
+      "x": 10,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "PokemonTower_3F_EventScript_1633A7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "PokemonTower_3F_EventScript_1633BE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 12,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "PokemonTower_3F_EventScript_1633D5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 13,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_3F_EventScript_1BE755",
+      "flag": "375"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_4F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc
new file mode 100644
index 000000000..30591aba5
--- /dev/null
+++ b/data/maps/PokemonTower_3F/scripts.inc
@@ -0,0 +1,17 @@
+PokemonTower_3F_MapScripts:: @ 81633A6
+	.byte 0
+
+PokemonTower_3F_EventScript_1633A7:: @ 81633A7
+	trainerbattle 0, 441, 0, Text_179FA0, Text_179FBC
+	msgbox gUnknown_8179FD3, 6
+	end
+
+PokemonTower_3F_EventScript_1633BE:: @ 81633BE
+	trainerbattle 0, 442, 0, Text_179F62, Text_179F72
+	msgbox gUnknown_8179F88, 6
+	end
+
+PokemonTower_3F_EventScript_1633D5:: @ 81633D5
+	trainerbattle 0, 443, 0, Text_179F09, Text_179F21
+	msgbox gUnknown_8179F31, 6
+	end
diff --git a/data/maps/PokemonTower_3F/text.inc b/data/maps/PokemonTower_3F/text.inc
new file mode 100644
index 000000000..49388655d
--- /dev/null
+++ b/data/maps/PokemonTower_3F/text.inc
@@ -0,0 +1,36 @@
+Text_179F09:: @ 8179F09
+    .string "Urrg… Awaa…\n"
+    .string "Huhu… Graa…$"
+
+Text_179F21:: @ 8179F21
+    .string "Hwa!\n"
+    .string "I'm saved!$"
+
+gUnknown_8179F31:: @ 8179F31
+    .string "The ghosts can be identified by\n"
+    .string "the SILPH SCOPE.$"
+
+Text_179F62:: @ 8179F62
+    .string "Kekeke…\n"
+    .string "Kwaaah!$"
+
+Text_179F72:: @ 8179F72
+    .string "Hmm?\n"
+    .string "What am I doing?$"
+
+gUnknown_8179F88:: @ 8179F88
+    .string "Sorry!\n"
+    .string "I was possessed!$"
+
+Text_179FA0:: @ 8179FA0
+    .string "Be gone!\n"
+    .string "Malevolent spirit!$"
+
+Text_179FBC:: @ 8179FBC
+    .string "Whew!\n"
+    .string "The spirit left!$"
+
+gUnknown_8179FD3:: @ 8179FD3
+    .string "The others above…\n"
+    .string "They must have been possessed.$"
+
diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json
new file mode 100644
index 000000000..a1641b4e0
--- /dev/null
+++ b/data/maps/PokemonTower_4F/map.json
@@ -0,0 +1,113 @@
+{
+  "id": "MAP_POKEMON_TOWER_4F",
+  "name": "PokemonTower_4F",
+  "layout": "LAYOUT_POKEMON_TOWER_4F",
+  "music": "BGM_FRLG_POKEMON_TOWER",
+  "region_map_section": "MAPSEC_POKEMON_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 5,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "58",
+      "x": 17,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "PokemonTower_4F_EventScript_163404",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "PokemonTower_4F_EventScript_16341B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "PokemonTower_4F_EventScript_1633ED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_4F_EventScript_1BE762",
+      "flag": "376"
+    },
+    {
+      "graphics_id": "92",
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_4F_EventScript_1BE76F",
+      "flag": "377"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_4F_EventScript_1BE77C",
+      "flag": "378"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_3F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc
new file mode 100644
index 000000000..0837c5b9b
--- /dev/null
+++ b/data/maps/PokemonTower_4F/scripts.inc
@@ -0,0 +1,17 @@
+PokemonTower_4F_MapScripts:: @ 81633EC
+	.byte 0
+
+PokemonTower_4F_EventScript_1633ED:: @ 81633ED
+	trainerbattle 0, 444, 0, Text_17A004, Text_17A017
+	msgbox gUnknown_817A02B, 6
+	end
+
+PokemonTower_4F_EventScript_163404:: @ 8163404
+	trainerbattle 0, 445, 0, Text_17A046, Text_17A061
+	msgbox gUnknown_817A067, 6
+	end
+
+PokemonTower_4F_EventScript_16341B:: @ 816341B
+	trainerbattle 0, 446, 0, Text_17A096, Text_17A0AB
+	msgbox gUnknown_817A0BB, 6
+	end
diff --git a/data/maps/PokemonTower_4F/text.inc b/data/maps/PokemonTower_4F/text.inc
new file mode 100644
index 000000000..69a18a2f6
--- /dev/null
+++ b/data/maps/PokemonTower_4F/text.inc
@@ -0,0 +1,33 @@
+Text_17A004:: @ 817A004
+    .string "Ghost! No!\n"
+    .string "Kwaaah!$"
+
+Text_17A017:: @ 817A017
+    .string "Where is the ghost?$"
+
+gUnknown_817A02B:: @ 817A02B
+    .string "I must have been dreaming…$"
+
+Text_17A046:: @ 817A046
+    .string "Be cursed with me!\n"
+    .string "Kwaaah!$"
+
+Text_17A061:: @ 817A061
+    .string "What!$"
+
+gUnknown_817A067:: @ 817A067
+    .string "We can't determine the identity of\n"
+    .string "the ghosts…$"
+
+Text_17A096:: @ 817A096
+    .string "Huhuhu…\n"
+    .string "Beat me not!$"
+
+Text_17A0AB:: @ 817A0AB
+    .string "Huh?\n"
+    .string "Who? What?$"
+
+gUnknown_817A0BB:: @ 817A0BB
+    .string "May the departed POKéMON rest in\n"
+    .string "peace…$"
+
diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json
new file mode 100644
index 000000000..2609e8dfe
--- /dev/null
+++ b/data/maps/PokemonTower_5F/map.json
@@ -0,0 +1,290 @@
+{
+  "id": "MAP_POKEMON_TOWER_5F",
+  "name": "PokemonTower_5F",
+  "layout": "LAYOUT_POKEMON_TOWER_5F",
+  "music": "BGM_FRLG_POKEMON_TOWER",
+  "region_map_section": "MAPSEC_POKEMON_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 5,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "58",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "PokemonTower_5F_EventScript_163472",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 19,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "PokemonTower_5F_EventScript_16345B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "PokemonTower_5F_EventScript_163489",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "PokemonTower_5F_EventScript_1634A0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 12,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_5F_EventScript_163433",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 6,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_5F_EventScript_1BE789",
+      "flag": "379"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_5F_EventScript_1BEBB3",
+      "flag": "464"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_6F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "PokemonTower_5F_EventScript_16343C"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "PokemonTower_5F_EventScript_16343C"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "PokemonTower_5F_EventScript_16343C"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "PokemonTower_5F_EventScript_16343C"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "PokemonTower_5F_EventScript_16343C"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "PokemonTower_5F_EventScript_16343C"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "PokemonTower_5F_EventScript_16343C"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 10,
+      "elevation": 0,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "PokemonTower_5F_EventScript_16343C"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 11,
+      "elevation": 0,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 8,
+      "elevation": 0,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 9,
+      "elevation": 0,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 10,
+      "elevation": 0,
+      "var": "VAR_0x4001",
+      "var_value": 1,
+      "script": "PokemonTower_5F_EventScript_163453"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_BIG_MUSHROOM",
+      "flag": "14",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc
new file mode 100644
index 000000000..67c6b27f4
--- /dev/null
+++ b/data/maps/PokemonTower_5F/scripts.inc
@@ -0,0 +1,42 @@
+PokemonTower_5F_MapScripts:: @ 8163432
+	.byte 0
+
+PokemonTower_5F_EventScript_163433:: @ 8163433
+	msgbox gUnknown_817A0E3, 2
+	end
+
+PokemonTower_5F_EventScript_16343C:: @ 816343C
+	lockall
+	fadescreen 3
+	special sp000_heal_pokemon
+	fadescreen 2
+	msgbox gUnknown_817A1FA
+	setvar VAR_0x4001, 1
+	releaseall
+	end
+
+PokemonTower_5F_EventScript_163453:: @ 8163453
+	lockall
+	setvar VAR_0x4001, 0
+	releaseall
+	end
+
+PokemonTower_5F_EventScript_16345B:: @ 816345B
+	trainerbattle 0, 447, 0, Text_17A11F, Text_17A132
+	msgbox gUnknown_817A138, 6
+	end
+
+PokemonTower_5F_EventScript_163472:: @ 8163472
+	trainerbattle 0, 448, 0, Text_17A150, Text_17A164
+	msgbox gUnknown_817A176, 6
+	end
+
+PokemonTower_5F_EventScript_163489:: @ 8163489
+	trainerbattle 0, 449, 0, Text_17A187, Text_17A190
+	msgbox gUnknown_817A194, 6
+	end
+
+PokemonTower_5F_EventScript_1634A0:: @ 81634A0
+	trainerbattle 0, 450, 0, Text_17A1AA, Text_17A1B7
+	msgbox gUnknown_817A1BD, 6
+	end
diff --git a/data/maps/PokemonTower_5F/text.inc b/data/maps/PokemonTower_5F/text.inc
new file mode 100644
index 000000000..5fef4219e
--- /dev/null
+++ b/data/maps/PokemonTower_5F/text.inc
@@ -0,0 +1,51 @@
+gUnknown_817A0E3:: @ 817A0E3
+    .string "Come, child!\n"
+    .string "I have purified this space.\l"
+    .string "You can rest here.$"
+
+Text_17A11F:: @ 817A11F
+    .string "Give…me…\n"
+    .string "your…all…$"
+
+Text_17A132:: @ 817A132
+    .string "Gasp!$"
+
+gUnknown_817A138:: @ 817A138
+    .string "I was under possession.$"
+
+Text_17A150:: @ 817A150
+    .string "You…shall…\n"
+    .string "join…us…$"
+
+Text_17A164:: @ 817A164
+    .string "What a nightmare!$"
+
+gUnknown_817A176:: @ 817A176
+    .string "I was possessed.$"
+
+Text_17A187:: @ 817A187
+    .string "Zombies!$"
+
+Text_17A190:: @ 817A190
+    .string "Ha?$"
+
+gUnknown_817A194:: @ 817A194
+    .string "I regained my senses.$"
+
+Text_17A1AA:: @ 817A1AA
+    .string "Urgah…\n"
+    .string "Urff…$"
+
+Text_17A1B7:: @ 817A1B7
+    .string "Whoo!$"
+
+gUnknown_817A1BD:: @ 817A1BD
+    .string "I fell to evil spirits despite my\n"
+    .string "training in the mountains…$"
+
+gUnknown_817A1FA:: @ 817A1FA
+    .string "Entered the purified and protected\n"
+    .string "zone.\p"
+    .string "{PLAYER}'s POKéMON were fully\n"
+    .string "healed.$"
+
diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json
new file mode 100644
index 000000000..ef96f5aa8
--- /dev/null
+++ b/data/maps/PokemonTower_6F/map.json
@@ -0,0 +1,119 @@
+{
+  "id": "MAP_POKEMON_TOWER_6F",
+  "name": "PokemonTower_6F",
+  "layout": "LAYOUT_POKEMON_TOWER_6F",
+  "music": "BGM_FRLG_POKEMON_TOWER",
+  "region_map_section": "MAPSEC_POKEMON_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 5,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "58",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "PokemonTower_6F_EventScript_163514",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 18,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "PokemonTower_6F_EventScript_163542",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "PokemonTower_6F_EventScript_16352B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_6F_EventScript_1BE796",
+      "flag": "380"
+    },
+    {
+      "graphics_id": "92",
+      "x": 15,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_6F_EventScript_1BE7A3",
+      "flag": "381"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_7F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_5F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x4059",
+      "var_value": 0,
+      "script": "PokemonTower_6F_EventScript_1634B8"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "var": "VAR_0x4059",
+      "var_value": 0,
+      "script": "PokemonTower_6F_EventScript_1634B8"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc
new file mode 100644
index 000000000..dd2bdff80
--- /dev/null
+++ b/data/maps/PokemonTower_6F/scripts.inc
@@ -0,0 +1,51 @@
+PokemonTower_6F_MapScripts:: @ 81634B7
+	.byte 0
+
+PokemonTower_6F_EventScript_1634B8:: @ 81634B8
+	lockall
+	textcolor 2
+	msgbox gUnknown_817A2F8
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
+	special sub_807F904
+	waitstate
+	special sub_8112364
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1634F5
+	applymovement 255, Movement_163512
+	waitmovement 0
+	releaseall
+	end
+
+EventScript_1634F5:: @ 81634F5
+	message Text_17A30C
+	waitmessage
+	waitse
+	playmoncry SPECIES_MAROWAK, 0
+	waitbuttonpress
+	waitmoncry
+	msgbox gUnknown_817A342
+	setvar VAR_0x4059, 1
+	releaseall
+	end
+
+Movement_163512:: @ 8163512
+	step_11
+	step_end
+
+PokemonTower_6F_EventScript_163514:: @ 8163514
+	trainerbattle 0, 451, 0, Text_17A243, Text_17A253
+	msgbox gUnknown_817A25A, 6
+	end
+
+PokemonTower_6F_EventScript_16352B:: @ 816352B
+	trainerbattle 0, 452, 0, Text_17A272, Text_17A27F
+	msgbox gUnknown_817A293, 6
+	end
+
+PokemonTower_6F_EventScript_163542:: @ 8163542
+	trainerbattle 0, 453, 0, Text_17A2C8, Text_17A2DC
+	msgbox gUnknown_817A2E2, 6
+	end
diff --git a/data/maps/PokemonTower_6F/text.inc b/data/maps/PokemonTower_6F/text.inc
new file mode 100644
index 000000000..5f6747816
--- /dev/null
+++ b/data/maps/PokemonTower_6F/text.inc
@@ -0,0 +1,43 @@
+Text_17A243:: @ 817A243
+    .string "Give…me…\n"
+    .string "blood…$"
+
+Text_17A253:: @ 817A253
+    .string "Groan!$"
+
+gUnknown_817A25A:: @ 817A25A
+    .string "I feel anemic and weak…$"
+
+Text_17A272:: @ 817A272
+    .string "Urff…\n"
+    .string "Kwaah!$"
+
+Text_17A27F:: @ 817A27F
+    .string "Something fell out!$"
+
+gUnknown_817A293:: @ 817A293
+    .string "My hair didn't fall out!\n"
+    .string "It was a malevolent spirit!$"
+
+Text_17A2C8:: @ 817A2C8
+    .string "Ke…ke…ke…\n"
+    .string "ke…ke…ke!$"
+
+Text_17A2DC:: @ 817A2DC
+    .string "Keee!$"
+
+gUnknown_817A2E2:: @ 817A2E2
+    .string "What's going on here?$"
+
+gUnknown_817A2F8:: @ 817A2F8
+    .string "Be gone…\n"
+    .string "Intruders…$"
+
+Text_17A30C:: @ 817A30C
+    .string "The ghost was the restless spirit\n"
+    .string "of CUBONE's mother!$"
+
+gUnknown_817A342:: @ 817A342
+    .string "The mother's spirit was calmed.\p"
+    .string "It departed to the afterlife…$"
+
diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json
new file mode 100644
index 000000000..880589588
--- /dev/null
+++ b/data/maps/PokemonTower_7F/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_POKEMON_TOWER_7F",
+  "name": "PokemonTower_7F",
+  "layout": "LAYOUT_POKEMON_TOWER_7F",
+  "music": "BGM_FRLG_POKEMON_TOWER",
+  "region_map_section": "MAPSEC_POKEMON_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_HORIZONTAL",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 5,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "78",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PokemonTower_7F_EventScript_16355A",
+      "flag": "52"
+    },
+    {
+      "graphics_id": "49",
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "PokemonTower_7F_EventScript_163586",
+      "flag": "94"
+    },
+    {
+      "graphics_id": "49",
+      "x": 13,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "PokemonTower_7F_EventScript_16363D",
+      "flag": "131"
+    },
+    {
+      "graphics_id": "49",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "PokemonTower_7F_EventScript_1636D6",
+      "flag": "132"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_POKEMON_TOWER_6F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "item": "ITEM_SOOTHE_BELL",
+      "flag": "159",
+      "unknown": 129
+    }
+  ]
+}
diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc
new file mode 100644
index 000000000..7f319287e
--- /dev/null
+++ b/data/maps/PokemonTower_7F/scripts.inc
@@ -0,0 +1,242 @@
+PokemonTower_7F_MapScripts:: @ 8163559
+	.byte 0
+
+PokemonTower_7F_EventScript_16355A:: @ 816355A
+	lock
+	faceplayer
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	setflag FLAG_0x034
+	clearflag FLAG_0x035
+	setflag FLAG_0x23C
+	msgbox gUnknown_817A529
+	closemessage
+	warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7
+	waitstate
+	release
+	end
+
+PokemonTower_7F_EventScript_163586:: @ 8163586
+	trainerbattle 2, 369, 0, Text_17A380, Text_17A3A4, EventScript_1635A1
+	msgbox gUnknown_817A3AF, 6
+	end
+
+EventScript_1635A1:: @ 81635A1
+	msgbox gUnknown_817A3AF
+	closemessage
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare_var_to_value VAR_0x8004, 10
+	goto_if_eq EventScript_1635E0
+	compare_var_to_value VAR_0x8004, 11
+	goto_if_eq EventScript_1635F0
+	compare_var_to_value VAR_0x8004, 9
+	goto_if_eq EventScript_163600
+	applymovement 2, Movement_16362C
+	waitmovement 0
+	goto EventScript_163616
+	end
+
+EventScript_1635E0:: @ 81635E0
+	applymovement 2, Movement_16361B
+	waitmovement 0
+	goto EventScript_163616
+	end
+
+EventScript_1635F0:: @ 81635F0
+	applymovement 2, Movement_163624
+	waitmovement 0
+	goto EventScript_163616
+	end
+
+EventScript_163600:: @ 8163600
+	applymovement 2, Movement_163633
+	waitmovement 0
+	playse SE_KAIDAN
+	delay 25
+	goto EventScript_163616
+	end
+
+EventScript_163616:: @ 8163616
+	removeobject 2
+	release
+	end
+
+Movement_16361B:: @ 816361B
+	step_10
+	step_13
+	step_10
+	step_10
+	step_10
+	step_13
+	step_10
+	step_10
+	step_end
+
+Movement_163624:: @ 8163624
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_10
+	step_10
+	step_end
+
+Movement_16362C:: @ 816362C
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_163633:: @ 8163633
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_10
+	step_10
+	step_2f
+	step_end
+
+PokemonTower_7F_EventScript_16363D:: @ 816363D
+	trainerbattle 2, 370, 0, Text_17A3CD, Text_17A466, EventScript_163658
+	msgbox gUnknown_817A477, 6
+	end
+
+EventScript_163658:: @ 8163658
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817A477
+	closemessage
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare_var_to_value VAR_0x8004, 12
+	goto_if_eq EventScript_163699
+	compare_var_to_value VAR_0x8004, 13
+	goto_if_eq EventScript_1636A9
+	applymovement 3, Movement_1636C6
+	waitmovement 0
+	goto EventScript_1636B9
+	end
+
+EventScript_163699:: @ 8163699
+	applymovement 3, Movement_1636BE
+	waitmovement 0
+	goto EventScript_1636B9
+	end
+
+EventScript_1636A9:: @ 81636A9
+	applymovement 3, Movement_1636CD
+	waitmovement 0
+	goto EventScript_1636B9
+	end
+
+EventScript_1636B9:: @ 81636B9
+	removeobject 3
+	release
+	end
+
+Movement_1636BE:: @ 81636BE
+	step_10
+	step_10
+	step_10
+	step_12
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_1636C6:: @ 81636C6
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_1636CD:: @ 81636CD
+	step_12
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+PokemonTower_7F_EventScript_1636D6:: @ 81636D6
+	trainerbattle 2, 371, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1
+	msgbox gUnknown_817A506, 6
+	end
+
+EventScript_1636F1:: @ 81636F1
+	msgbox gUnknown_817A506
+	closemessage
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare_var_to_value VAR_0x8004, 10
+	goto_if_eq EventScript_163725
+	compare_var_to_value VAR_0x8004, 9
+	goto_if_eq EventScript_163735
+	applymovement 4, Movement_163754
+	waitmovement 0
+	goto EventScript_163745
+	end
+
+EventScript_163725:: @ 8163725
+	applymovement 4, Movement_16374C
+	waitmovement 0
+	goto EventScript_163745
+	end
+
+EventScript_163735:: @ 8163735
+	applymovement 4, Movement_16375B
+	waitmovement 0
+	goto EventScript_163745
+	end
+
+EventScript_163745:: @ 8163745
+	removeobject 4
+	release
+	end
+
+EventScript_16374A:: @ 816374A
+	release
+	end
+
+Movement_16374C:: @ 816374C
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_10
+	step_end
+
+Movement_163754:: @ 8163754
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_16375B:: @ 816375B
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
diff --git a/data/maps/PokemonTower_7F/text.inc b/data/maps/PokemonTower_7F/text.inc
new file mode 100644
index 000000000..d55f9c2e2
--- /dev/null
+++ b/data/maps/PokemonTower_7F/text.inc
@@ -0,0 +1,50 @@
+Text_17A380:: @ 817A380
+    .string "What do you want?\n"
+    .string "Why are you here?$"
+
+Text_17A3A4:: @ 817A3A4
+    .string "I give up!$"
+
+gUnknown_817A3AF:: @ 817A3AF
+    .string "I'm not going to forget this!$"
+
+Text_17A3CD:: @ 817A3CD
+    .string "This old guy marched right up to\n"
+    .string "our HIDEOUT.\p"
+    .string "Then, he starts ranting about how\n"
+    .string "TEAM ROCKET's abusing POKéMON.\p"
+    .string "So, we're just talking it over as\n"
+    .string "adults.$"
+
+Text_17A466:: @ 817A466
+    .string "Please!\n"
+    .string "No more!$"
+
+gUnknown_817A477:: @ 817A477
+    .string "POKéMON are only good for making\n"
+    .string "money. Why not use them?\p"
+    .string "You stay out of our business!$"
+
+Text_17A4CF:: @ 817A4CF
+    .string "You're not saving anyone, kid!$"
+
+Text_17A4EE:: @ 817A4EE
+    .string "Don't fight us ROCKETS!$"
+
+gUnknown_817A506:: @ 817A506
+    .string "You're not getting away with this!$"
+
+gUnknown_817A529:: @ 817A529
+    .string "MR. FUJI: Heh?\n"
+    .string "You came to save me?\p"
+    .string "Thank you. But, I came here of my\n"
+    .string "own free will.\p"
+    .string "I came to calm the spirit of\n"
+    .string "CUBONE's mother.\p"
+    .string "I think MAROWAK's spirit has\n"
+    .string "finally left us.\p"
+    .string "I must thank you for your kind\n"
+    .string "concern.\p"
+    .string "Follow me to my home, POKéMON\n"
+    .string "HOUSE, at the foot of this tower.$"
+
diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json
new file mode 100644
index 000000000..21ffe2703
--- /dev/null
+++ b/data/maps/PowerPlant/map.json
@@ -0,0 +1,179 @@
+{
+  "id": "MAP_POWER_PLANT",
+  "name": "PowerPlant",
+  "layout": "LAYOUT_POWER_PLANT",
+  "music": "BGM_FRLG_POKEMON_MANSION",
+  "region_map_section": "MAPSEC_POWER_PLANT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 7,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PowerPlant_EventScript_1BE91C",
+      "flag": "410"
+    },
+    {
+      "graphics_id": "92",
+      "x": 40,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PowerPlant_EventScript_1BE929",
+      "flag": "411"
+    },
+    {
+      "graphics_id": "92",
+      "x": 46,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PowerPlant_EventScript_1BE936",
+      "flag": "412"
+    },
+    {
+      "graphics_id": "92",
+      "x": 45,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PowerPlant_EventScript_1BE943",
+      "flag": "413"
+    },
+    {
+      "graphics_id": "92",
+      "x": 26,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PowerPlant_EventScript_1BE950",
+      "flag": "414"
+    },
+    {
+      "graphics_id": "136",
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PowerPlant_EventScript_1637B8",
+      "flag": "93"
+    },
+    {
+      "graphics_id": "92",
+      "x": 36,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PowerPlant_EventScript_16388D",
+      "flag": "134"
+    },
+    {
+      "graphics_id": "92",
+      "x": 30,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "PowerPlant_EventScript_16382F",
+      "flag": "133"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 39,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 38,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 39,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 0,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 29,
+      "y": 16,
+      "elevation": 3,
+      "item": "ITEM_MAX_ELIXIR",
+      "flag": "27",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "item": "ITEM_THUNDER_STONE",
+      "flag": "28",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc
new file mode 100644
index 000000000..cb9b3acdc
--- /dev/null
+++ b/data/maps/PowerPlant/scripts.inc
@@ -0,0 +1,141 @@
+PowerPlant_MapScripts:: @ 8163764
+	map_script 5, PowerPlant_MapScript1_16376F
+	map_script 3, PowerPlant_MapScript2_16378D
+	.byte 0
+
+PowerPlant_MapScript1_16376F:: @ 816376F
+	checkflag FLAG_0x807
+	call_if 1, EventScript_163779
+	end
+
+EventScript_163779:: @ 8163779
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 7
+	goto_if 5, EventScript_1A77A9
+	removeobject VAR_LAST_TALKED
+	return
+
+PowerPlant_MapScript2_16378D:: @ 816378D
+	setworldmapflag FLAG_WORLD_MAP_POWER_PLANT
+	checkflag FLAG_0x2BF
+	call_if 0, EventScript_1637AC
+	checkflag FLAG_0x2D0
+	call_if 0, EventScript_1637B0
+	checkflag FLAG_0x2D1
+	call_if 0, EventScript_1637B4
+	end
+
+EventScript_1637AC:: @ 81637AC
+	clearflag FLAG_0x05D
+	return
+
+EventScript_1637B0:: @ 81637B0
+	clearflag FLAG_0x085
+	return
+
+EventScript_1637B4:: @ 81637B4
+	clearflag FLAG_0x086
+	return
+
+PowerPlant_EventScript_1637B8:: @ 81637B8
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
+	waitse
+	playmoncry SPECIES_ZAPDOS, 2
+	message Text_1A6448
+	waitmessage
+	waitmoncry
+	delay 10
+	playbgm BGM_FRLG_LEADER_EYE, 0
+	waitbuttonpress
+	setflag FLAG_0x807
+	special sub_807F9D8
+	waitstate
+	clearflag FLAG_0x807
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16381B
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_163824
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_163824
+	setflag FLAG_0x2BF
+	release
+	end
+
+EventScript_16381B:: @ 816381B
+	setflag FLAG_0x2BF
+	goto EventScript_1A922D
+	end
+
+EventScript_163824:: @ 8163824
+	setvar VAR_0x8004, SPECIES_ZAPDOS
+	goto EventScript_1A9236
+	end
+
+PowerPlant_EventScript_16382F:: @ 816382F
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
+	waitse
+	playmoncry SPECIES_ELECTRODE, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_0x807
+	dowildbattle
+	clearflag FLAG_0x807
+	special sub_8112364
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_163884
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_163884
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_163884
+	setflag FLAG_0x2D0
+	release
+	end
+
+EventScript_163884:: @ 8163884
+	setflag FLAG_0x2D0
+	goto EventScript_1A922D
+	end
+
+PowerPlant_EventScript_16388D:: @ 816388D
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
+	waitse
+	playmoncry SPECIES_ELECTRODE, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_0x807
+	dowildbattle
+	clearflag FLAG_0x807
+	special sub_8112364
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1638E2
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_1638E2
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_1638E2
+	setflag FLAG_0x2D1
+	release
+	end
+
+EventScript_1638E2:: @ 81638E2
+	setflag FLAG_0x2D1
+	goto EventScript_1A922D
+	end
diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json
new file mode 100644
index 000000000..94d643a8c
--- /dev/null
+++ b/data/maps/RockTunnel_1F/map.json
@@ -0,0 +1,201 @@
+{
+  "id": "MAP_ROCK_TUNNEL_1F",
+  "name": "RockTunnel_1F",
+  "layout": "LAYOUT_ROCK_TUNNEL_1F",
+  "music": "BGM_FRLG_MT_MOON",
+  "region_map_section": "MAPSEC_ROCK_TUNNEL",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "40",
+      "x": 26,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "RockTunnel_1F_EventScript_162E73",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 39,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RockTunnel_1F_EventScript_162E5C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 45,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "RockTunnel_1F_EventScript_162E45",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 20,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RockTunnel_1F_EventScript_162E17",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 5,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RockTunnel_1F_EventScript_162E00",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RockTunnel_1F_EventScript_162DE9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 27,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "RockTunnel_1F_EventScript_162E2E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 37,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_1F_EventScript_1BEB0A",
+      "flag": "451"
+    },
+    {
+      "graphics_id": "92",
+      "x": 33,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_1F_EventScript_1BEB17",
+      "flag": "452"
+    },
+    {
+      "graphics_id": "92",
+      "x": 22,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_1F_EventScript_1BEB24",
+      "flag": "453"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 45,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 45,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_B1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 18,
+      "y": 37,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 33,
+      "elevation": 3,
+      "script": "RockTunnel_1F_EventScript_162DE0"
+    }
+  ]
+}
diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc
new file mode 100644
index 000000000..846154c97
--- /dev/null
+++ b/data/maps/RockTunnel_1F/scripts.inc
@@ -0,0 +1,46 @@
+RockTunnel_1F_MapScripts:: @ 8162DD6
+	map_script 3, RockTunnel_1F_MapScript1_162DDC
+	.byte 0
+
+RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC
+	setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F
+	end
+
+RockTunnel_1F_EventScript_162DE0:: @ 8162DE0
+	msgbox gUnknown_817962D, 3
+	end
+
+RockTunnel_1F_EventScript_162DE9:: @ 8162DE9
+	trainerbattle 0, 192, 0, Text_179366, Text_179388
+	msgbox gUnknown_8179396, 6
+	end
+
+RockTunnel_1F_EventScript_162E00:: @ 8162E00
+	trainerbattle 0, 193, 0, Text_1793F1, Text_17940E
+	msgbox gUnknown_817943A, 6
+	end
+
+RockTunnel_1F_EventScript_162E17:: @ 8162E17
+	trainerbattle 0, 194, 0, Text_17947B, Text_1794AC
+	msgbox gUnknown_81794B4, 6
+	end
+
+RockTunnel_1F_EventScript_162E2E:: @ 8162E2E
+	trainerbattle 0, 168, 0, Text_1794D4, Text_1794EE
+	msgbox gUnknown_81794F9, 6
+	end
+
+RockTunnel_1F_EventScript_162E45:: @ 8162E45
+	trainerbattle 0, 476, 0, Text_17951C, Text_179547
+	msgbox gUnknown_8179558, 6
+	end
+
+RockTunnel_1F_EventScript_162E5C:: @ 8162E5C
+	trainerbattle 0, 475, 0, Text_1795E5, Text_179604
+	msgbox gUnknown_8179613, 6
+	end
+
+RockTunnel_1F_EventScript_162E73:: @ 8162E73
+	trainerbattle 0, 474, 0, Text_179577, Text_1795A1
+	msgbox gUnknown_81795B5, 6
+	end
diff --git a/data/maps/RockTunnel_1F/text.inc b/data/maps/RockTunnel_1F/text.inc
new file mode 100644
index 000000000..56bc4ecbe
--- /dev/null
+++ b/data/maps/RockTunnel_1F/text.inc
@@ -0,0 +1,83 @@
+Text_179366:: @ 8179366
+    .string "This tunnel goes a long way, kid!$"
+
+Text_179388:: @ 8179388
+    .string "Doh!\n"
+    .string "You win!$"
+
+gUnknown_8179396:: @ 8179396
+    .string "Watch for ONIX.\n"
+    .string "They appear only occasionally.\p"
+    .string "High-level ones can put the\n"
+    .string "squeeze on you!$"
+
+Text_1793F1:: @ 81793F1
+    .string "Hmm.\n"
+    .string "Maybe I'm lost in here…$"
+
+Text_17940E:: @ 817940E
+    .string "Ease up!\n"
+    .string "What am I doing?\l"
+    .string "Which way is out?$"
+
+gUnknown_817943A:: @ 817943A
+    .string "That sleeping POKéMON on ROUTE 12\n"
+    .string "forced me to take this detour.$"
+
+Text_17947B:: @ 817947B
+    .string "Outsiders like you need to show me\n"
+    .string "some respect!$"
+
+Text_1794AC:: @ 81794AC
+    .string "I give!$"
+
+gUnknown_81794B4:: @ 81794B4
+    .string "You're talented enough to hike!$"
+
+Text_1794D4:: @ 81794D4
+    .string "POKéMON fight!\n"
+    .string "Ready, go!$"
+
+Text_1794EE:: @ 81794EE
+    .string "Game over!$"
+
+gUnknown_81794F9:: @ 81794F9
+    .string "Oh well, I'll get a ZUBAT as I go!$"
+
+Text_17951C:: @ 817951C
+    .string "Eek!\p"
+    .string "Don't try anything funny in the\n"
+    .string "dark!$"
+
+Text_179547:: @ 8179547
+    .string "It was too dark…$"
+
+gUnknown_8179558:: @ 8179558
+    .string "I saw a MACHOP in this tunnel.$"
+
+Text_179577:: @ 8179577
+    .string "I came this far looking for wild\n"
+    .string "POKéMON.$"
+
+Text_1795A1:: @ 81795A1
+    .string "I'm out of POKéMON!$"
+
+gUnknown_81795B5:: @ 81795B5
+    .string "You looked cute and harmless.\n"
+    .string "Was I ever wrong!$"
+
+Text_1795E5:: @ 81795E5
+    .string "You have POKéMON!\n"
+    .string "Let's start!$"
+
+Text_179604:: @ 8179604
+    .string "You play hard!$"
+
+gUnknown_8179613:: @ 8179613
+    .string "Whew!\n"
+    .string "I'm all sweaty now.$"
+
+gUnknown_817962D:: @ 817962D
+    .string "ROCK TUNNEL\n"
+    .string "CERULEAN CITY - LAVENDER TOWN$"
+
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
new file mode 100644
index 000000000..3df881ece
--- /dev/null
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -0,0 +1,387 @@
+{
+  "id": "MAP_ROCK_TUNNEL_B1F",
+  "name": "RockTunnel_B1F",
+  "layout": "LAYOUT_ROCK_TUNNEL_B1F",
+  "music": "BGM_FRLG_MT_MOON",
+  "region_map_section": "MAPSEC_ROCK_TUNNEL",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "52",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "RockTunnel_B1F_EventScript_162EFE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RockTunnel_B1F_EventScript_162EB9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RockTunnel_B1F_EventScript_162E8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 36,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "RockTunnel_B1F_EventScript_162ED0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 41,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "RockTunnel_B1F_EventScript_162EE7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 23,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RockTunnel_B1F_EventScript_162F15",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 15,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "RockTunnel_B1F_EventScript_162EA2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 29,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "RockTunnel_B1F_EventScript_162F2C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 2,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1C487E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BEB31",
+      "flag": "454"
+    },
+    {
+      "graphics_id": "92",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BEB3E",
+      "flag": "455"
+    },
+    {
+      "graphics_id": "96",
+      "x": 1,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "96",
+      "x": 1,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 4,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "96",
+      "x": 2,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 39,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 42,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "96",
+      "x": 43,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "24"
+    },
+    {
+      "graphics_id": "96",
+      "x": 45,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "25"
+    },
+    {
+      "graphics_id": "96",
+      "x": 45,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "26"
+    },
+    {
+      "graphics_id": "96",
+      "x": 25,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "27"
+    },
+    {
+      "graphics_id": "96",
+      "x": 27,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "28"
+    },
+    {
+      "graphics_id": "96",
+      "x": 23,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "29"
+    },
+    {
+      "graphics_id": "96",
+      "x": 26,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "30"
+    },
+    {
+      "graphics_id": "96",
+      "x": 24,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "31"
+    },
+    {
+      "graphics_id": "96",
+      "x": 27,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RockTunnel_B1F_EventScript_1BE00C",
+      "flag": "17"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 38,
+      "y": 28,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 33,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 27,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc
new file mode 100644
index 000000000..12611a767
--- /dev/null
+++ b/data/maps/RockTunnel_B1F/scripts.inc
@@ -0,0 +1,42 @@
+RockTunnel_B1F_MapScripts:: @ 8162E8A
+	.byte 0
+
+RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B
+	trainerbattle 0, 158, 0, Text_179657, Text_1796B9
+	msgbox gUnknown_81796CE, 6
+	end
+
+RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2
+	trainerbattle 0, 159, 0, Text_1798AD, Text_1798DD
+	msgbox gUnknown_81798E9, 6
+	end
+
+RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9
+	trainerbattle 0, 189, 0, Text_1796E1, Text_179700
+	msgbox gUnknown_8179712, 6
+	end
+
+RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0
+	trainerbattle 0, 190, 0, Text_179829, Text_179856
+	msgbox gUnknown_817987A, 6
+	end
+
+RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7
+	trainerbattle 0, 191, 0, Text_179916, Text_179932
+	msgbox gUnknown_817993E, 6
+	end
+
+RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE
+	trainerbattle 0, 164, 0, Text_17973A, Text_17975F
+	msgbox gUnknown_8179777, 6
+	end
+
+RockTunnel_B1F_EventScript_162F15:: @ 8162F15
+	trainerbattle 0, 165, 0, Text_1797A4, Text_1797CB
+	msgbox gUnknown_81797DE, 6
+	end
+
+RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C
+	trainerbattle 0, 166, 0, Text_179968, Text_179997
+	msgbox gUnknown_81799AC, 6
+	end
diff --git a/data/maps/RockTunnel_B1F/text.inc b/data/maps/RockTunnel_B1F/text.inc
new file mode 100644
index 000000000..b82f09657
--- /dev/null
+++ b/data/maps/RockTunnel_B1F/text.inc
@@ -0,0 +1,95 @@
+Text_179657:: @ 8179657
+    .string "Do you know how you can avoid\n"
+    .string "getting lost in the mountains?\p"
+    .string "You can bend twigs as trail\n"
+    .string "markers.$"
+
+Text_1796B9:: @ 81796B9
+    .string "Ohhh!\n"
+    .string "I did my best!$"
+
+gUnknown_81796CE:: @ 81796CE
+    .string "I want to go home!$"
+
+Text_1796E1:: @ 81796E1
+    .string "Hahaha!\n"
+    .string "Can you beat my power?$"
+
+Text_179700:: @ 8179700
+    .string "Oops!\n"
+    .string "Outmuscled!$"
+
+gUnknown_8179712:: @ 8179712
+    .string "I go for power because I hate\n"
+    .string "thinking.$"
+
+Text_17973A:: @ 817973A
+    .string "You have a POKéDEX?\n"
+    .string "I want one, too.$"
+
+Text_17975F:: @ 817975F
+    .string "Shoot!\n"
+    .string "I am so jealous!$"
+
+gUnknown_8179777:: @ 8179777
+    .string "When you finish your POKéDEX,\n"
+    .string "can I have it?$"
+
+Text_1797A4:: @ 81797A4
+    .string "Um… Do you know about POKéMON\n"
+    .string "cosplay?$"
+
+Text_1797CB:: @ 81797CB
+    .string "Well, that's that.$"
+
+gUnknown_81797DE:: @ 81797DE
+    .string "POKéMON cosplay is dressing up as\n"
+    .string "POKéMON for fun.\p"
+    .string "CLEFAIRY is a favorite.$"
+
+Text_179829:: @ 8179829
+    .string "My POKéMON techniques will leave\n"
+    .string "you crying!$"
+
+Text_179856:: @ 8179856
+    .string "I give!\n"
+    .string "You're a better technician!$"
+
+gUnknown_817987A:: @ 817987A
+    .string "In mountains, you'll often find\n"
+    .string "ROCK-type POKéMON.$"
+
+Text_1798AD:: @ 81798AD
+    .string "I don't often come here, but I will\n"
+    .string "battle you.$"
+
+Text_1798DD:: @ 81798DD
+    .string "Oh!\n"
+    .string "I lost!$"
+
+gUnknown_81798E9:: @ 81798E9
+    .string "I like tiny POKéMON.\n"
+    .string "Big ones are too scary!$"
+
+Text_179916:: @ 8179916
+    .string "Hit me with your best shot!$"
+
+Text_179932:: @ 8179932
+    .string "Fired away!$"
+
+gUnknown_817993E:: @ 817993E
+    .string "I'll raise my POKéMON to beat\n"
+    .string "yours, kid.$"
+
+Text_179968:: @ 8179968
+    .string "I draw illustrations of POKéMON\n"
+    .string "when I'm home.$"
+
+Text_179997:: @ 8179997
+    .string "Whew…\n"
+    .string "I'm exhausted…$"
+
+gUnknown_81799AC:: @ 81799AC
+    .string "I'm an artist, not a fighter.\n"
+    .string "I'll go home to draw.$"
+
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
new file mode 100644
index 000000000..0513b11d4
--- /dev/null
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -0,0 +1,164 @@
+{
+  "id": "MAP_ROCKET_HIDEOUT_B1F",
+  "name": "RocketHideout_B1F",
+  "layout": "LAYOUT_ROCKET_HIDEOUT_B1F",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": -1,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "RocketHideout_B1F_EventScript_1611C5",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 24,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "RocketHideout_B1F_EventScript_1611AE",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 6,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RocketHideout_B1F_EventScript_1611F3",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 10,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "RocketHideout_B1F_EventScript_1611DC",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 21,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "16",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "RocketHideout_B1F_EventScript_16120A",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 16,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B1F_EventScript_1BE6C6",
+      "flag": "364"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B1F_EventScript_1BE6D3",
+      "flag": "365"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_CELADON_CITY_GAME_CORNER",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 17,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 30,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 23,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 24,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 25,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 17,
+      "elevation": 0,
+      "item": "ITEM_PP_UP",
+      "flag": "11",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc
new file mode 100644
index 000000000..f127389ef
--- /dev/null
+++ b/data/maps/RocketHideout_B1F/scripts.inc
@@ -0,0 +1,64 @@
+RocketHideout_B1F_MapScripts:: @ 8161195
+	map_script 1, RocketHideout_B1F_MapScript1_1611A0
+	map_script 3, RocketHideout_B1F_MapScript2_1611AA
+	.byte 0
+
+RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0
+	checktrainerflag FLAG_0x16A
+	call_if 0, EventScript_161233
+	end
+
+RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA
+	setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F
+	end
+
+RocketHideout_B1F_EventScript_1611AE:: @ 81611AE
+	trainerbattle 0, 358, 0, Text_174ECA, Text_174EED
+	msgbox gUnknown_8174EFA, 6
+	end
+
+RocketHideout_B1F_EventScript_1611C5:: @ 81611C5
+	trainerbattle 0, 359, 0, Text_174F2C, Text_174F60
+	msgbox gUnknown_8174F66, 6
+	end
+
+RocketHideout_B1F_EventScript_1611DC:: @ 81611DC
+	trainerbattle 0, 360, 0, Text_174F94, Text_174FA4
+	msgbox gUnknown_8174FB3, 6
+	end
+
+RocketHideout_B1F_EventScript_1611F3:: @ 81611F3
+	trainerbattle 0, 361, 0, Text_174FE1, Text_174FF8
+	msgbox gUnknown_8175007, 6
+	end
+
+RocketHideout_B1F_EventScript_16120A:: @ 816120A
+	trainerbattle 2, 362, 0, Text_17503A, Text_17505A, EventScript_161225
+	msgbox gUnknown_8175060, 6
+	end
+
+EventScript_161225:: @ 8161225
+	call EventScript_16126A
+	playse SE_FU_ZAKU2
+	special DrawWholeMapView
+	waitse
+	release
+	end
+
+EventScript_161233:: @ 8161233
+	setmetatile 20, 19, 718, 1
+	setmetatile 21, 19, 719, 1
+	setmetatile 20, 20, 726, 1
+	setmetatile 21, 20, 727, 1
+	setmetatile 20, 21, 642, 0
+	setmetatile 21, 21, 642, 0
+	return
+
+EventScript_16126A:: @ 816126A
+	setmetatile 20, 19, 642, 0
+	setmetatile 21, 19, 641, 0
+	setmetatile 20, 20, 642, 0
+	setmetatile 21, 20, 641, 0
+	setmetatile 20, 21, 642, 0
+	setmetatile 21, 21, 641, 0
+	return
diff --git a/data/maps/RocketHideout_B1F/text.inc b/data/maps/RocketHideout_B1F/text.inc
new file mode 100644
index 000000000..fd7647e2b
--- /dev/null
+++ b/data/maps/RocketHideout_B1F/text.inc
@@ -0,0 +1,53 @@
+Text_174ECA:: @ 8174ECA
+    .string "Who are you?\n"
+    .string "How did you get here?$"
+
+Text_174EED:: @ 8174EED
+    .string "Oww!\n"
+    .string "Beaten!$"
+
+gUnknown_8174EFA:: @ 8174EFA
+    .string "Blast it… You're dissing TEAM\n"
+    .string "ROCKET, aren't you?$"
+
+Text_174F2C:: @ 8174F2C
+    .string "You broke into TEAM ROCKET's\n"
+    .string "operation? What nerve!$"
+
+Text_174F60:: @ 8174F60
+    .string "Boom!$"
+
+gUnknown_8174F66:: @ 8174F66
+    .string "You're not going to get away with\n"
+    .string "this, brat!$"
+
+Text_174F94:: @ 8174F94
+    .string "Intruder alert!$"
+
+Text_174FA4:: @ 8174FA4
+    .string "I can't do it!$"
+
+gUnknown_8174FB3:: @ 8174FB3
+    .string "SILPH SCOPE? Humph!\n"
+    .string "I don't know where it is.$"
+
+Text_174FE1:: @ 8174FE1
+    .string "Why did you come here?$"
+
+Text_174FF8:: @ 8174FF8
+    .string "This won't do!$"
+
+gUnknown_8175007:: @ 8175007
+    .string "Okay, I'll talk…\n"
+    .string "Take the elevator to see my BOSS.$"
+
+Text_17503A:: @ 817503A
+    .string "Are you lost, you little mouse?$"
+
+Text_17505A:: @ 817505A
+    .string "Why…?$"
+
+gUnknown_8175060:: @ 8175060
+    .string "Uh-oh, that ruckus somehow opened\n"
+    .string "the door!$"
+
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
new file mode 100644
index 000000000..55cb6f583
--- /dev/null
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -0,0 +1,121 @@
+{
+  "id": "MAP_ROCKET_HIDEOUT_B2F",
+  "name": "RocketHideout_B2F",
+  "layout": "LAYOUT_ROCKET_HIDEOUT_B2F",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": -2,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 20,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "RocketHideout_B2F_EventScript_1612A2",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "92",
+      "x": 15,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B2F_EventScript_1BE6E0",
+      "flag": "366"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B2F_EventScript_1BE6ED",
+      "flag": "367"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B2F_EventScript_1BE6FA",
+      "flag": "368"
+    },
+    {
+      "graphics_id": "92",
+      "x": 0,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B2F_EventScript_1BE707",
+      "flag": "369"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 21,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 28,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 23,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 28,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 29,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc
new file mode 100644
index 000000000..80c102179
--- /dev/null
+++ b/data/maps/RocketHideout_B2F/scripts.inc
@@ -0,0 +1,7 @@
+RocketHideout_B2F_MapScripts:: @ 81612A1
+	.byte 0
+
+RocketHideout_B2F_EventScript_1612A2:: @ 81612A2
+	trainerbattle 0, 363, 0, Text_17508C, Text_1750BF
+	msgbox gUnknown_81750CC, 6
+	end
diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc
new file mode 100644
index 000000000..d21c21555
--- /dev/null
+++ b/data/maps/RocketHideout_B2F/text.inc
@@ -0,0 +1,12 @@
+Text_17508C:: @ 817508C
+    .string "BOSS said you can see ghosts with\n"
+    .string "the SILPH SCOPE.$"
+
+Text_1750BF:: @ 81750BF
+    .string "I surrender!$"
+
+gUnknown_81750CC:: @ 81750CC
+    .string "The TEAM ROCKET HQ has four\n"
+    .string "underground floors.\p"
+    .string "Think you can reach the BOSS?$"
+
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
new file mode 100644
index 000000000..5e44100bc
--- /dev/null
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -0,0 +1,110 @@
+{
+  "id": "MAP_ROCKET_HIDEOUT_B3F",
+  "name": "RocketHideout_B3F",
+  "layout": "LAYOUT_ROCKET_HIDEOUT_B3F",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": -3,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 19,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "RocketHideout_B3F_EventScript_1612D1",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 2,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "RocketHideout_B3F_EventScript_1612BA",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B3F_EventScript_1BE714",
+      "flag": "370"
+    },
+    {
+      "graphics_id": "92",
+      "x": 19,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B3F_EventScript_1BE721",
+      "flag": "371"
+    },
+    {
+      "graphics_id": "92",
+      "x": 14,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B3F_EventScript_1BEBCD",
+      "flag": "466"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B4F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_NUGGET",
+      "flag": "12",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc
new file mode 100644
index 000000000..82fc7aa26
--- /dev/null
+++ b/data/maps/RocketHideout_B3F/scripts.inc
@@ -0,0 +1,12 @@
+RocketHideout_B3F_MapScripts:: @ 81612B9
+	.byte 0
+
+RocketHideout_B3F_EventScript_1612BA:: @ 81612BA
+	trainerbattle 0, 364, 0, Text_17511A, Text_17514A
+	msgbox gUnknown_817515B, 6
+	end
+
+RocketHideout_B3F_EventScript_1612D1:: @ 81612D1
+	trainerbattle 0, 365, 0, Text_17519E, Text_1751CE
+	msgbox gUnknown_81751E0, 6
+	end
diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc
new file mode 100644
index 000000000..deedfce38
--- /dev/null
+++ b/data/maps/RocketHideout_B3F/text.inc
@@ -0,0 +1,26 @@
+Text_17511A:: @ 817511A
+    .string "Stop meddling in TEAM ROCKET's\n"
+    .string "affairs or else!$"
+
+Text_17514A:: @ 817514A
+    .string "Oof!\n"
+    .string "Taken down!$"
+
+gUnknown_817515B:: @ 817515B
+    .string "SILPH SCOPE?\n"
+    .string "Oh, that machine the BOSS stole.\p"
+    .string "It's here somewhere.$"
+
+Text_17519E:: @ 817519E
+    .string "We got word from upstairs that you\n"
+    .string "were coming!$"
+
+Text_1751CE:: @ 81751CE
+    .string "What?\n"
+    .string "I lost? No!$"
+
+gUnknown_81751E0:: @ 81751E0
+    .string "Go ahead and go!\p"
+    .string "But you can't run the elevator\n"
+    .string "without the LIFT KEY.$"
+
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
new file mode 100644
index 000000000..fe5dc1de4
--- /dev/null
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -0,0 +1,178 @@
+{
+  "id": "MAP_ROCKET_HIDEOUT_B4F",
+  "name": "RocketHideout_B4F",
+  "layout": "LAYOUT_ROCKET_HIDEOUT_B4F",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": -4,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "87",
+      "x": 19,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B4F_EventScript_161317",
+      "flag": "56"
+    },
+    {
+      "graphics_id": "92",
+      "x": 20,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B4F_EventScript_161363",
+      "flag": "55"
+    },
+    {
+      "graphics_id": "49",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "RocketHideout_B4F_EventScript_161381",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "92",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B4F_EventScript_1613AD",
+      "flag": "54"
+    },
+    {
+      "graphics_id": "49",
+      "x": 19,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B4F_EventScript_161418",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "49",
+      "x": 16,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B4F_EventScript_1613CE",
+      "flag": "173"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B4F_EventScript_1BE72E",
+      "flag": "372"
+    },
+    {
+      "graphics_id": "92",
+      "x": 4,
+      "y": 14,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B4F_EventScript_1BE73B",
+      "flag": "373"
+    },
+    {
+      "graphics_id": "92",
+      "x": 6,
+      "y": 23,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RocketHideout_B4F_EventScript_1BE748",
+      "flag": "374"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_ROCKET_HIDEOUT_B3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 23,
+      "elevation": 0,
+      "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 21,
+      "y": 23,
+      "elevation": 0,
+      "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 22,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_NEST_BALL",
+      "flag": "13",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_NET_BALL",
+      "flag": "134",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
new file mode 100644
index 000000000..949223e85
--- /dev/null
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -0,0 +1,136 @@
+RocketHideout_B4F_MapScripts:: @ 81612E8
+	map_script 1, RocketHideout_B4F_MapScript1_1612EE
+	.byte 0
+
+RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE
+	setvar VAR_0x4001, 0
+	checktrainerflag FLAG_0x16E
+	call_if 1, EventScript_161311
+	checktrainerflag FLAG_0x16F
+	call_if 1, EventScript_161311
+	compare_var_to_value VAR_0x4001, 2
+	call_if 5, EventScript_16146A
+	end
+
+EventScript_161311:: @ 8161311
+	addvar VAR_0x4001, 1
+	return
+
+RocketHideout_B4F_EventScript_161317:: @ 8161317
+	lock
+	faceplayer
+	setvar VAR_0x8004, 15
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	message Text_175226
+	waitmessage
+	playbgm BGM_FRLG_SUSPICIOUS_EYE, 0
+	waitbuttonpress
+	trainerbattle 3, 348, 0, Text_175318
+	msgbox gUnknown_817532D
+	fadescreen 1
+	closemessage
+	removeobject 1
+	addobject 2
+	clearflag FLAG_0x037
+	setflag FLAG_0x05F
+	setvar VAR_0x8004, 15
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	fadescreen 0
+	release
+	end
+
+RocketHideout_B4F_EventScript_161363:: @ 8161363
+	lock
+	faceplayer
+	removeobject 2
+	giveitem ITEM_SILPH_SCOPE
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A6BF9
+	release
+	end
+
+RocketHideout_B4F_EventScript_161381:: @ 8161381
+	trainerbattle 2, 368, 0, Text_175488, Text_1754B9, EventScript_16139D
+	msgbox gUnknown_81754BD
+	release
+	end
+
+EventScript_16139D:: @ 816139D
+	msgbox gUnknown_81754BD
+	addobject 4
+	clearflag FLAG_0x036
+	release
+	end
+
+RocketHideout_B4F_EventScript_1613AD:: @ 81613AD
+	lock
+	faceplayer
+	setflag FLAG_0x2A5
+	removeobject 4
+	giveitem ITEM_LIFT_KEY
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A6BF9
+	release
+	end
+
+RocketHideout_B4F_EventScript_1613CE:: @ 81613CE
+	trainerbattle 2, 366, 0, Text_1753D0, Text_1753FE, EventScript_1613E9
+	msgbox gUnknown_817540C, 6
+	end
+
+EventScript_1613E9:: @ 81613E9
+	setvar VAR_0x4001, 0
+	checktrainerflag FLAG_0x16E
+	call_if 1, EventScript_161311
+	checktrainerflag FLAG_0x16F
+	call_if 1, EventScript_161311
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1614A1
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_161462
+	release
+	end
+
+RocketHideout_B4F_EventScript_161418:: @ 8161418
+	trainerbattle 2, 367, 0, Text_175437, Text_175463, EventScript_161433
+	msgbox gUnknown_817546A, 6
+	end
+
+EventScript_161433:: @ 8161433
+	setvar VAR_0x4001, 0
+	checktrainerflag FLAG_0x16E
+	call_if 1, EventScript_161311
+	checktrainerflag FLAG_0x16F
+	call_if 1, EventScript_161311
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1614A1
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_161462
+	release
+	end
+
+EventScript_161462:: @ 8161462
+	playse SE_FU_ZAKU2
+	special DrawWholeMapView
+	waitse
+	return
+
+EventScript_16146A:: @ 816146A
+	setmetatile 17, 12, 718, 1
+	setmetatile 18, 12, 719, 1
+	setmetatile 17, 13, 726, 1
+	setmetatile 18, 13, 727, 1
+	setmetatile 17, 14, 642, 0
+	setmetatile 18, 14, 642, 0
+	return
+
+EventScript_1614A1:: @ 81614A1
+	setmetatile 17, 12, 642, 0
+	setmetatile 18, 12, 641, 0
+	setmetatile 17, 13, 642, 0
+	setmetatile 18, 13, 641, 0
+	setmetatile 17, 14, 642, 0
+	setmetatile 18, 14, 641, 0
+	return
diff --git a/data/maps/RocketHideout_B4F/text.inc b/data/maps/RocketHideout_B4F/text.inc
new file mode 100644
index 000000000..4ceba8968
--- /dev/null
+++ b/data/maps/RocketHideout_B4F/text.inc
@@ -0,0 +1,56 @@
+Text_175226:: @ 8175226
+    .string "So! I must say, I am impressed you\n"
+    .string "got here.\p"
+    .string "TEAM ROCKET captures POKéMON from\n"
+    .string "around the world.\p"
+    .string "They're important tools for keeping\n"
+    .string "our criminal enterprise going.\p"
+    .string "I am the leader, GIOVANNI!\p"
+    .string "For your insolence, you will feel a\n"
+    .string "world of pain!$"
+
+Text_175318:: @ 8175318
+    .string "WHAT!\n"
+    .string "This can't be!$"
+
+gUnknown_817532D:: @ 817532D
+    .string "I see that you raise POKéMON with\n"
+    .string "utmost care.\p"
+    .string "A child like you would never\n"
+    .string "understand what I hope to achieve.\p"
+    .string "I shall step aside this time!\p"
+    .string "I hope we meet again…$"
+
+Text_1753D0:: @ 81753D0
+    .string "I know you!\n"
+    .string "You ruined our plans at MT. MOON!$"
+
+Text_1753FE:: @ 81753FE
+    .string "Burned again!$"
+
+gUnknown_817540C:: @ 817540C
+    .string "Do you have something against TEAM\n"
+    .string "ROCKET?$"
+
+Text_175437:: @ 8175437
+    .string "How can you not see the beauty of\n"
+    .string "our evil?$"
+
+Text_175463:: @ 8175463
+    .string "Ayaya!$"
+
+gUnknown_817546A:: @ 817546A
+    .string "BOSS!\n"
+    .string "I'm sorry I failed you!$"
+
+Text_175488:: @ 8175488
+    .string "The elevator doesn't work?\n"
+    .string "Who has the LIFT KEY?$"
+
+Text_1754B9:: @ 81754B9
+    .string "No!$"
+
+gUnknown_81754BD:: @ 81754BD
+    .string "Oh, no!\n"
+    .string "I dropped the LIFT KEY!$"
+
diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json
new file mode 100644
index 000000000..806a91cda
--- /dev/null
+++ b/data/maps/RocketHideout_Elevator/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_ROCKET_HIDEOUT_ELEVATOR",
+  "name": "RocketHideout_Elevator",
+  "layout": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR",
+  "music": "BGM_FRLG_ROCKET_HIDEOUT",
+  "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_3",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 0,
+      "y": 2,
+      "elevation": 0,
+      "script": "RocketHideout_Elevator_EventScript_1614D9"
+    }
+  ]
+}
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
new file mode 100644
index 000000000..884335234
--- /dev/null
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -0,0 +1,106 @@
+RocketHideout_Elevator_MapScripts:: @ 81614D8
+	.byte 0
+
+RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
+	lockall
+	checkflag FLAG_0x2A5
+	goto_if 0, EventScript_16161B
+	setvar VAR_0x8004, 2
+	checkflag FLAG_0x002
+	call_if 0, EventScript_1A7AB9
+	copyvar VAR_0x8005, VAR_0x403A
+	special sub_80CB580
+	message Text_1A535C
+	waitmessage
+	setvar VAR_0x8004, 2
+	specialvar VAR_RESULT, sub_80CB328
+	switch VAR_RESULT
+	case 0, EventScript_161530
+	case 1, EventScript_16153C
+	case 2, EventScript_161548
+	end
+
+EventScript_161530:: @ 8161530
+	multichoicedefault 0, 0, 42, 0, 0
+	goto EventScript_161554
+
+EventScript_16153B:: @ 816153B
+	end
+
+EventScript_16153C:: @ 816153C
+	multichoicedefault 0, 0, 42, 1, 0
+	goto EventScript_161554
+
+EventScript_161547:: @ 8161547
+	end
+
+EventScript_161548:: @ 8161548
+	multichoicedefault 0, 0, 42, 2, 0
+	goto EventScript_161554
+
+EventScript_161553:: @ 8161553
+	end
+
+EventScript_161554:: @ 8161554
+	switch VAR_RESULT
+	case 0, EventScript_161591
+	case 1, EventScript_1615B9
+	case 2, EventScript_1615E1
+	case 3, EventScript_161609
+	case 127, EventScript_161609
+	end
+
+EventScript_161591:: @ 8161591
+	setvar VAR_0x8006, 3
+	setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25
+	compare_var_to_value VAR_0x403A, 3
+	goto_if_eq EventScript_161609
+	call EventScript_16160E
+	setvar VAR_0x403A, 3
+	goto EventScript_161609
+
+EventScript_1615B8:: @ 81615B8
+	end
+
+EventScript_1615B9:: @ 81615B9
+	setvar VAR_0x8006, 2
+	setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16
+	compare_var_to_value VAR_0x403A, 2
+	goto_if_eq EventScript_161609
+	call EventScript_16160E
+	setvar VAR_0x403A, 2
+	goto EventScript_161609
+
+EventScript_1615E0:: @ 81615E0
+	end
+
+EventScript_1615E1:: @ 81615E1
+	setvar VAR_0x8006, 0
+	setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23
+	compare_var_to_value VAR_0x403A, 0
+	goto_if_eq EventScript_161609
+	call EventScript_16160E
+	setvar VAR_0x403A, 0
+	goto EventScript_161609
+
+EventScript_161608:: @ 8161608
+	end
+
+EventScript_161609:: @ 8161609
+	special sub_80CB63C
+	releaseall
+	end
+
+EventScript_16160E:: @ 816160E
+	special sub_80CB63C
+	closemessage
+	waitse
+	special sub_80CB498
+	waitstate
+	setflag FLAG_0x002
+	return
+
+EventScript_16161B:: @ 816161B
+	msgbox gUnknown_81754DD
+	releaseall
+	end
diff --git a/data/maps/RocketHideout_Elevator/text.inc b/data/maps/RocketHideout_Elevator/text.inc
new file mode 100644
index 000000000..89de8f918
--- /dev/null
+++ b/data/maps/RocketHideout_Elevator/text.inc
@@ -0,0 +1,3 @@
+gUnknown_81754DD:: @ 81754DD
+    .string "It appears to need a key.$"
+
diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json
new file mode 100644
index 000000000..eae0e3eb5
--- /dev/null
+++ b/data/maps/Route1/map.json
@@ -0,0 +1,65 @@
+{
+  "id": "MAP_ROUTE1",
+  "name": "Route1",
+  "layout": "LAYOUT_ROUTE1",
+  "music": "BGM_FRLG_ROUTE_1",
+  "region_map_section": "MAPSEC_ROUTE_1",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_VIRIDIAN_CITY",
+      "offset": -12,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_PALLET_TOWN",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 6,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route1_EventScript_167EFE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 19,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route1_EventScript_167F52",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 31,
+      "elevation": 0,
+      "script": "Route1_EventScript_167F5B"
+    }
+  ]
+}
diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc
new file mode 100644
index 000000000..16bd02597
--- /dev/null
+++ b/data/maps/Route1/scripts.inc
@@ -0,0 +1,37 @@
+Route1_MapScripts:: @ 8167EFD
+	.byte 0
+
+Route1_EventScript_167EFE:: @ 8167EFE
+	lock
+	faceplayer
+	checkflag FLAG_0x230
+	goto_if_eq EventScript_167F48
+	msgbox gUnknown_818329D
+	textcolor 3
+	checkitemspace ITEM_POTION, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A6BF9
+	getitemname 1, ITEM_POTION
+	playfanfare MUS_FANFA1
+	message Text_1A51F6
+	waitmessage
+	waitfanfare
+	additem ITEM_POTION, 1
+	msgbox gUnknown_8183387
+	call EventScript_1A6675
+	setflag FLAG_0x230
+	release
+	end
+
+EventScript_167F48:: @ 8167F48
+	msgbox gUnknown_8183347
+	release
+	end
+
+Route1_EventScript_167F52:: @ 8167F52
+	msgbox gUnknown_81833B9, 2
+	end
+
+Route1_EventScript_167F5B:: @ 8167F5B
+	msgbox gUnknown_818343A, 3
+	end
diff --git a/data/maps/Route1/text.inc b/data/maps/Route1/text.inc
new file mode 100644
index 000000000..7b4150b03
--- /dev/null
+++ b/data/maps/Route1/text.inc
@@ -0,0 +1,28 @@
+gUnknown_818329D:: @ 818329D
+    .string "Hi!\n"
+    .string "I work at a POKéMON MART.\p"
+    .string "It's part of a convenient chain\n"
+    .string "selling all sorts of items.\p"
+    .string "Please, visit us in VIRIDIAN CITY.\p"
+    .string "I know, I'll give you a sample.\n"
+    .string "Here you go!$"
+
+gUnknown_8183347:: @ 8183347
+    .string "Please come see us if you need\n"
+    .string "POKé BALLS for catching POKéMON.$"
+
+gUnknown_8183387:: @ 8183387
+    .string "{PLAYER} put the POTION away in\n"
+    .string "the BAG's ITEMS POCKET.$"
+
+gUnknown_81833B9:: @ 81833B9
+    .string "See those ledges along the road?\p"
+    .string "It's a bit scary, but you can jump\n"
+    .string "from them.\p"
+    .string "You can get back to PALLET TOWN\n"
+    .string "quicker that way.$"
+
+gUnknown_818343A:: @ 818343A
+    .string "ROUTE 1\n"
+    .string "PALLET TOWN - VIRIDIAN CITY$"
+
diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json
new file mode 100644
index 000000000..0038ec3d9
--- /dev/null
+++ b/data/maps/Route10/map.json
@@ -0,0 +1,264 @@
+{
+  "id": "MAP_ROUTE10",
+  "name": "Route10",
+  "layout": "LAYOUT_ROUTE10",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_10",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_LAVENDER_TOWN",
+      "offset": 0,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE9",
+      "offset": 0,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "40",
+      "x": 7,
+      "y": 60,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route10_EventScript_1A9FE5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 4,
+      "y": 62,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route10_EventScript_1AA09F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 15,
+      "y": 70,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route10_EventScript_1AA061",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 4,
+      "y": 68,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route10_EventScript_1AA0DD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 13,
+      "y": 44,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route10_EventScript_1AA023",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 9,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route10_EventScript_1A9FA7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 10,
+      "y": 20,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "95",
+      "x": 10,
+      "y": 22,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "95",
+      "x": 10,
+      "y": 24,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_EventScript_1BDF13",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "95",
+      "x": 10,
+      "y": 26,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_EventScript_1BDF13",
+      "flag": "21"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 57,
+      "elevation": 3,
+      "dest_map": "MAP_ROCK_TUNNEL_1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 7,
+      "y": 40,
+      "elevation": 3,
+      "dest_map": "MAP_POWER_PLANT",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 13,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE10_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 37,
+      "elevation": 3,
+      "dest_map": "MAP_POWER_PLANT",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 59,
+      "elevation": 0,
+      "script": "Route10_EventScript_167FE4"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 42,
+      "elevation": 0,
+      "script": "Route10_EventScript_167FED"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 21,
+      "elevation": 0,
+      "script": "Route10_EventScript_167FDB"
+    },
+    {
+      "type": "hidden_item",
+      "x": 10,
+      "y": 19,
+      "elevation": 0,
+      "item": "ITEM_SUPER_POTION",
+      "flag": "9",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 40,
+      "elevation": 3,
+      "item": "ITEM_MAX_ETHER",
+      "flag": "10",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 6,
+      "y": 26,
+      "elevation": 3,
+      "item": "ITEM_CHERI_BERRY",
+      "flag": "126",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 17,
+      "y": 29,
+      "elevation": 3,
+      "item": "ITEM_PERSIM_BERRY",
+      "flag": "125",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 20,
+      "y": 57,
+      "elevation": 3,
+      "item": "ITEM_NANAB_BERRY",
+      "flag": "151",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc
new file mode 100644
index 000000000..96ce99c8e
--- /dev/null
+++ b/data/maps/Route10/scripts.inc
@@ -0,0 +1,17 @@
+Route10_MapScripts:: @ 8167FD9
+	.byte 0
+
+Route10_EventScript_167FDA:: @ 8167FDA
+	end
+
+Route10_EventScript_167FDB:: @ 8167FDB
+	msgbox gUnknown_8184EC5, 3
+	end
+
+Route10_EventScript_167FE4:: @ 8167FE4
+	msgbox gUnknown_8184EE9, 3
+	end
+
+Route10_EventScript_167FED:: @ 8167FED
+	msgbox gUnknown_8184EF5, 3
+	end
diff --git a/data/maps/Route10/text.inc b/data/maps/Route10/text.inc
new file mode 100644
index 000000000..af45c8923
--- /dev/null
+++ b/data/maps/Route10/text.inc
@@ -0,0 +1,86 @@
+Text_184B8A:: @ 8184B8A
+    .string "Wow, you came all the way here?\n"
+    .string "Maybe you're a POKéMANIAC, too?\l"
+    .string "Want to see my collection?$"
+
+Text_184BE5:: @ 8184BE5
+    .string "Humph.\n"
+    .string "I'm not angry!$"
+
+Text_184BFB:: @ 8184BFB
+    .string "I have more rare POKéMON at home!$"
+
+Text_184C1D:: @ 8184C1D
+    .string "Ha-hahah-ah-ha!$"
+
+Text_184C2D:: @ 8184C2D
+    .string "Ha-haha!\n"
+    .string "Not laughing!\l"
+    .string "Ha-hay fever! Haha-ha-choo!$"
+
+Text_184C60:: @ 8184C60
+    .string "Haha-ha-choo!\n"
+    .string "Ha-choo!\l"
+    .string "Snort! Snivel!$"
+
+Text_184C86:: @ 8184C86
+    .string "Hi, kid!\n"
+    .string "Want to see my POKéMON?$"
+
+Text_184CA7:: @ 8184CA7
+    .string "Oh, no!\n"
+    .string "My POKéMON!$"
+
+Text_184CBB:: @ 8184CBB
+    .string "I don't like you.\n"
+    .string "I don't like anyone better than me!$"
+
+Text_184CF1:: @ 8184CF1
+    .string "I've been out at a POKéMON GYM\n"
+    .string "a few times.\p"
+    .string "…But I always lose.$"
+
+Text_184D31:: @ 8184D31
+    .string "Ohh!\n"
+    .string "After all my training!$"
+
+Text_184D4D:: @ 8184D4D
+    .string "I noticed some POKéMANIACS\n"
+    .string "prowling around.\p"
+    .string "Can you imagine? Them?\n"
+    .string "Up here in the mountains?$"
+
+Text_184DAA:: @ 8184DAA
+    .string "Ah!\n"
+    .string "This mountain air is delicious!$"
+
+Text_184DCE:: @ 8184DCE
+    .string "That cleared my head!$"
+
+Text_184DE4:: @ 8184DE4
+    .string "I feel bloated on mountain air!$"
+
+Text_184E04:: @ 8184E04
+    .string "I'm feeling a bit faint.\n"
+    .string "I haven't hiked in some time.$"
+
+Text_184E3B:: @ 8184E3B
+    .string "I'm too tired.\n"
+    .string "I wasn't up for it.$"
+
+Text_184E5E:: @ 8184E5E
+    .string "The POKéMON here in the mountains\n"
+    .string "are so chunky…\p"
+    .string "I wish there were pink POKéMON\n"
+    .string "with a floral pattern!$"
+
+gUnknown_8184EC5:: @ 8184EC5
+    .string "ROCK TUNNEL\n"
+    .string "Detour to LAVENDER TOWN$"
+
+gUnknown_8184EE9:: @ 8184EE9
+    .string "ROCK TUNNEL$"
+
+gUnknown_8184EF5:: @ 8184EF5
+    .string "POWER PLANT$"
+
diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..0dcb36f49
--- /dev/null
+++ b/data/maps/Route10_PokemonCenter_1F/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_ROUTE10_POKEMON_CENTER_1F",
+  "name": "Route10_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_ROUTE_10",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_1F_EventScript_16FC41",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_1F_EventScript_16FC53",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "27",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_1F_EventScript_16FC4A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_1F_EventScript_16FC5C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_1F_EventScript_16FC65",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE10",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_ROUTE10_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..7d47d07df
--- /dev/null
+++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,64 @@
+Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F
+	map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A
+	map_script 5, Route10_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A
+	setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F
+	setrespawn SPAWN_ROUTE10
+	end
+
+Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A
+	msgbox gUnknown_819E59D, 2
+	end
+
+Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53
+	msgbox gUnknown_819E523, 2
+	end
+
+Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C
+	msgbox gUnknown_819E5D2, 2
+	end
+
+Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
+	lock
+	faceplayer
+	call EventScript_16FCF1
+	checkflag FLAG_0x2FA
+	goto_if_eq EventScript_16FCE7
+	msgbox gUnknown_819E5FB, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AD1
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, Special_GetPokedexCount
+	getnumberstring 2, VAR_0x8006
+	call EventScript_16FCF1
+	compare_var_to_value VAR_0x8006, 20
+	goto_if 0, EventScript_1A7ABD
+	msgbox gUnknown_819E733
+	checkitemspace ITEM_EVERSTONE, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AC7
+	additem ITEM_EVERSTONE, 1
+	giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE
+	setflag FLAG_0x2FA
+	msgbox gUnknown_819E7AF
+	release
+	end
+
+EventScript_16FCE7:: @ 816FCE7
+	msgbox gUnknown_819E7AF
+	release
+	end
+
+EventScript_16FCF1:: @ 816FCF1
+	getnumberstring 0, 20
+	getitemname 1, ITEM_EVERSTONE
+	return
diff --git a/data/maps/Route10_PokemonCenter_1F/text.inc b/data/maps/Route10_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..3360854fe
--- /dev/null
+++ b/data/maps/Route10_PokemonCenter_1F/text.inc
@@ -0,0 +1,48 @@
+gUnknown_819E523:: @ 819E523
+    .string "The types of POKéMON match up\n"
+    .string "differently with each other.\p"
+    .string "Every type is stronger than some\n"
+    .string "types and weaker than others.$"
+
+gUnknown_819E59D:: @ 819E59D
+    .string "A NUGGET is totally useless.\n"
+    .string "So I sold it for ¥5000.$"
+
+gUnknown_819E5D2:: @ 819E5D2
+    .string "I heard that ghosts haunt\n"
+    .string "LAVENDER TOWN.$"
+
+gUnknown_819E5FB:: @ 819E5FB
+    .string "Oh… {PLAYER}!\n"
+    .string "I've been looking for you!\p"
+    .string "It's me, one of the ever-present\n"
+    .string "AIDES to PROF. OAK.\p"
+    .string "If your POKéDEX has complete data\n"
+    .string "on twenty species, I'm supposed to\l"
+    .string "give you a reward from PROF. OAK.\p"
+    .string "He entrusted me with this\n"
+    .string "EVERSTONE.\p"
+    .string "So, {PLAYER}, let me ask you.\p"
+    .string "Have you gathered data on at least\n"
+    .string "twenty kinds of POKéMON?$"
+
+gUnknown_819E733:: @ 819E733
+    .string "Great! You have caught or owned\n"
+    .string "{STR_VAR_3} kinds of POKéMON!\p"
+    .string "Congratulations!\n"
+    .string "Here you go!$"
+
+gUnknown_819E786:: @ 819E786
+    .string "{PLAYER} received the EVERSTONE\n"
+    .string "from the AIDE.$"
+
+gUnknown_819E7AF:: @ 819E7AF
+    .string "Making POKéMON evolve certainly\n"
+    .string "can add to the POKéDEX.\p"
+    .string "However, at times, you may not\n"
+    .string "want a certain POKéMON to evolve.\p"
+    .string "In that case, give the EVERSTONE\n"
+    .string "to that POKéMON.\p"
+    .string "It will prevent evolution according\n"
+    .string "to the PROFESSOR.$"
+
diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..599efb07c
--- /dev/null
+++ b/data/maps/Route10_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_ROUTE10_POKEMON_CENTER_2F",
+  "name": "Route10_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_ROUTE_10",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_ROUTE10_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..54b5d0036
--- /dev/null
+++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA
+	map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, Route10_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F
+	call EventScript_1BB4A3
+	end
+
+EventScript_16FD15:: @ 816FD15
+	call EventScript_1BB6AB
+	end
+
+EventScript_16FD1B:: @ 816FD1B
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json
new file mode 100644
index 000000000..1403fe6de
--- /dev/null
+++ b/data/maps/Route11/map.json
@@ -0,0 +1,239 @@
+{
+  "id": "MAP_ROUTE11",
+  "name": "Route11",
+  "layout": "LAYOUT_ROUTE11",
+  "music": "BGM_FRLG_ROUTE_11",
+  "region_map_section": "MAPSEC_ROUTE_11",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_VERMILION_CITY",
+      "offset": -10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE12",
+      "offset": -60,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "18",
+      "x": 19,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route11_EventScript_1A9B0D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 16,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route11_EventScript_1A9C81",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 31,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "15",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route11_EventScript_1A9B4B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 28,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "40",
+      "movement_range_x": 8,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route11_EventScript_1A9BC7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 38,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route11_EventScript_1A9CBF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 50,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route11_EventScript_1A9D3B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 42,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route11_EventScript_1A9C05",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 50,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "25",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route11_EventScript_1A9B89",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 57,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route11_EventScript_1A9CFD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 32,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 6,
+      "script": "Route11_EventScript_1A9C43",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 42,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route11_EventScript_1BEAF0",
+      "flag": "449"
+    },
+    {
+      "graphics_id": "92",
+      "x": 63,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route11_EventScript_1BEB99",
+      "flag": "462"
+    },
+    {
+      "graphics_id": "92",
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route11_EventScript_1BEBA6",
+      "flag": "463"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 58,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 65,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "script": "Route11_EventScript_167FF7"
+    },
+    {
+      "type": "hidden_item",
+      "x": 58,
+      "y": 5,
+      "elevation": 0,
+      "item": "ITEM_ESCAPE_ROPE",
+      "flag": "41",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc
new file mode 100644
index 000000000..fa85a5bb8
--- /dev/null
+++ b/data/maps/Route11/scripts.inc
@@ -0,0 +1,6 @@
+Route11_MapScripts:: @ 8167FF6
+	.byte 0
+
+Route11_EventScript_167FF7:: @ 8167FF7
+	msgbox gUnknown_8185308, 3
+	end
diff --git a/data/maps/Route11/text.inc b/data/maps/Route11/text.inc
new file mode 100644
index 000000000..19515d010
--- /dev/null
+++ b/data/maps/Route11/text.inc
@@ -0,0 +1,113 @@
+Text_184F01:: @ 8184F01
+    .string "Win, lose, or draw!$"
+
+Text_184F15:: @ 8184F15
+    .string "Atcha!\n"
+    .string "Didn't go my way!$"
+
+Text_184F2E:: @ 8184F2E
+    .string "POKéMON is life!\n"
+    .string "And to live is to play games!$"
+
+Text_184F5D:: @ 8184F5D
+    .string "Competition!\n"
+    .string "I can't get enough!$"
+
+Text_184F7E:: @ 8184F7E
+    .string "I had a chance!$"
+
+Text_184F8E:: @ 8184F8E
+    .string "You can't be a coward in the world\n"
+    .string "of POKéMON!$"
+
+Text_184FBD:: @ 8184FBD
+    .string "Let's go, but don't cheat!$"
+
+Text_184FD8:: @ 8184FD8
+    .string "Huh?\n"
+    .string "That's not right!$"
+
+Text_184FEF:: @ 8184FEF
+    .string "I did my best.\n"
+    .string "I have no regrets.$"
+
+Text_185011:: @ 8185011
+    .string "Careful!\n"
+    .string "I'm laying down some cables!$"
+
+Text_185037:: @ 8185037
+    .string "That was electric!$"
+
+Text_18504A:: @ 818504A
+    .string "Spread the word to save energy!$"
+
+Text_18506A:: @ 818506A
+    .string "I just became a TRAINER.\n"
+    .string "But, I think I can win.$"
+
+Text_18509B:: @ 818509B
+    .string "My POKéMON couldn't win…\n"
+    .string "Haven't they grown enough?$"
+
+Text_1850CF:: @ 81850CF
+    .string "What now?\n"
+    .string "Leave me alone!$"
+
+Text_1850E9:: @ 81850E9
+    .string "Fwahaha!\n"
+    .string "I have never lost!$"
+
+Text_185105:: @ 8185105
+    .string "My first loss!$"
+
+Text_185114:: @ 8185114
+    .string "You were just lucky, that's all.$"
+
+Text_185135:: @ 8185135
+    .string "I have never won before…$"
+
+Text_18514E:: @ 818514E
+    .string "I saw this coming…$"
+
+Text_185161:: @ 8185161
+    .string "I was unlucky, as always.$"
+
+Text_18517B:: @ 818517B
+    .string "I'm the best in my class.\n"
+    .string "I train every morning.$"
+
+Text_1851AC:: @ 81851AC
+    .string "Darn!\n"
+    .string "My POKéMON need to be stronger!$"
+
+Text_1851D2:: @ 81851D2
+    .string "There's a fat POKéMON that comes\n"
+    .string "down from the mountains.\p"
+    .string "I bet it'd be strong if you can\n"
+    .string "catch it.$"
+
+Text_185236:: @ 8185236
+    .string "Watch out for live wires!$"
+
+Text_185250:: @ 8185250
+    .string "Whoa!\n"
+    .string "You spark plug!$"
+
+Text_185266:: @ 8185266
+    .string "Well, better get back to work.$"
+
+Text_185285:: @ 8185285
+    .string "I raised my POKéMON carefully.\n"
+    .string "They should be ready by now!$"
+
+Text_1852C1:: @ 81852C1
+    .string "Bye-bye!\n"
+    .string "Thank you, and good-bye!$"
+
+Text_1852E3:: @ 81852E3
+    .string "Tch…\n"
+    .string "I better go find stronger ones!$"
+
+gUnknown_8185308:: @ 8185308
+    .string "DIGLETT'S CAVE$"
+
diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json
new file mode 100644
index 000000000..a4e6448b4
--- /dev/null
+++ b/data/maps/Route11_EastEntrance_1F/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_ROUTE11_EAST_ENTRANCE_1F",
+  "name": "Route11_EastEntrance_1F",
+  "layout": "LAYOUT_ENTRANCE_1F",
+  "music": "BGM_FRLG_VERMILION_CITY",
+  "region_map_section": "MAPSEC_ROUTE_11",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route11_EastEntrance_1F_EventScript_16FD22",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "60",
+      "x": 4,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route11_EastEntrance_1F_EventScript_16FD2B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc
new file mode 100644
index 000000000..476379753
--- /dev/null
+++ b/data/maps/Route11_EastEntrance_1F/scripts.inc
@@ -0,0 +1,10 @@
+Route11_EastEntrance_1F_MapScripts:: @ 816FD21
+	.byte 0
+
+Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22
+	msgbox gUnknown_819E8A6, 2
+	end
+
+Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B
+	msgbox gUnknown_819E97B, 2
+	end
diff --git a/data/maps/Route11_EastEntrance_1F/text.inc b/data/maps/Route11_EastEntrance_1F/text.inc
new file mode 100644
index 000000000..335e7e3e9
--- /dev/null
+++ b/data/maps/Route11_EastEntrance_1F/text.inc
@@ -0,0 +1,20 @@
+Text_19E890:: @ 819E890
+    .string "{PLAYER}{KUN}の　バッグ\n"
+    .string "いっぱい　みたい　だね$"
+
+gUnknown_819E8A6:: @ 819E8A6
+    .string "Don't you think it's hard to think\n"
+    .string "up good names for POKéMON?\p"
+    .string "Especially if you've caught a\n"
+    .string "whole bunch?\p"
+    .string "In LAVENDER TOWN, there's a man\n"
+    .string "who rates POKéMON nicknames.\p"
+    .string "He can even help you rename your\n"
+    .string "POKéMON, too.$"
+
+gUnknown_819E97B:: @ 819E97B
+    .string "If you're aiming to reach LAVENDER\n"
+    .string "TOWN, take ROCK TUNNEL.\p"
+    .string "You can get to ROCK TUNNEL from\n"
+    .string "CERULEAN CITY.$"
+
diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json
new file mode 100644
index 000000000..c6bdd37f5
--- /dev/null
+++ b/data/maps/Route11_EastEntrance_2F/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_ROUTE11_EAST_ENTRANCE_2F",
+  "name": "Route11_EastEntrance_2F",
+  "layout": "LAYOUT_ENTRANCE_2F",
+  "music": "BGM_FRLG_VERMILION_CITY",
+  "region_map_section": "MAPSEC_ROUTE_11",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "18",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route11_EastEntrance_2F_EventScript_16FD5C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route11_EastEntrance_2F_EventScript_16FDD8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route11_EastEntrance_2F_EventScript_16FD35"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route11_EastEntrance_2F_EventScript_16FD53"
+    }
+  ]
+}
diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc
new file mode 100644
index 000000000..334e71ec4
--- /dev/null
+++ b/data/maps/Route11_EastEntrance_2F/scripts.inc
@@ -0,0 +1,93 @@
+Route11_EastEntrance_2F_MapScripts:: @ 816FD34
+	.byte 0
+
+Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35
+	lockall
+	checkflag FLAG_0x253
+	goto_if_eq EventScript_16FD49
+	msgbox gUnknown_819EC8A
+	releaseall
+	end
+
+EventScript_16FD49:: @ 816FD49
+	msgbox gUnknown_819ECD9
+	releaseall
+	end
+
+Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53
+	msgbox gUnknown_819ED1F, 3
+	end
+
+Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
+	lock
+	faceplayer
+	setvar VAR_0x8008, 4
+	call EventScript_1A8CAD
+	checkflag FLAG_0x251
+	goto_if_eq EventScript_16FDCE
+	msgbox gUnknown_81A597B, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16FDB6
+	call EventScript_1A8CBD
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16FDB6
+	call EventScript_1A8CC9
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_16FDC0
+	call EventScript_1A8CD9
+	msgbox gUnknown_81A59DA
+	setflag FLAG_0x251
+	release
+	end
+
+EventScript_16FDB6:: @ 816FDB6
+	msgbox gUnknown_81A59B6
+	release
+	end
+
+EventScript_16FDC0:: @ 816FDC0
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_81A59C6
+	release
+	end
+
+EventScript_16FDCE:: @ 816FDCE
+	msgbox gUnknown_81A59E7
+	release
+	end
+
+Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
+	lock
+	faceplayer
+	call EventScript_16FE64
+	checkflag FLAG_0x252
+	goto_if_eq EventScript_16FE5A
+	msgbox gUnknown_819E9E5, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AD1
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, Special_GetPokedexCount
+	getnumberstring 2, VAR_0x8006
+	call EventScript_16FE64
+	compare_var_to_value VAR_0x8006, 30
+	goto_if 0, EventScript_1A7ABD
+	msgbox gUnknown_819EAE4
+	checkitemspace ITEM_ITEMFINDER, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AC7
+	additem ITEM_ITEMFINDER, 1
+	giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER
+	setflag FLAG_0x252
+	msgbox gUnknown_819EB59
+	release
+	end
+
+EventScript_16FE5A:: @ 816FE5A
+	msgbox gUnknown_819EB59
+	release
+	end
+
+EventScript_16FE64:: @ 816FE64
+	getnumberstring 0, 30
+	getitemname 1, ITEM_ITEMFINDER
+	return
diff --git a/data/maps/Route11_EastEntrance_2F/text.inc b/data/maps/Route11_EastEntrance_2F/text.inc
new file mode 100644
index 000000000..aa693a495
--- /dev/null
+++ b/data/maps/Route11_EastEntrance_2F/text.inc
@@ -0,0 +1,52 @@
+gUnknown_819E9E5:: @ 819E9E5
+    .string "Hi! Remember me?\n"
+    .string "I'm one of PROF. OAK's AIDES.\p"
+    .string "If your POKéDEX has complete data\n"
+    .string "on {STR_VAR_1} species, I'm supposed to\l"
+    .string "give you a reward.\p"
+    .string "PROF. OAK entrusted me with the\n"
+    .string "{STR_VAR_2} for you.\p"
+    .string "So, {PLAYER}, let me ask you.\p"
+    .string "Have you gathered data on at least\n"
+    .string "{STR_VAR_1} kinds of POKéMON?$"
+
+gUnknown_819EAE4:: @ 819EAE4
+    .string "Great! You have caught or owned\n"
+    .string "{STR_VAR_3} kinds of POKéMON!\p"
+    .string "Congratulations!\n"
+    .string "Here you go!$"
+
+gUnknown_819EB37:: @ 819EB37
+    .string "{PLAYER} received the {STR_VAR_2}\n"
+    .string "from the AIDE.$"
+
+gUnknown_819EB59:: @ 819EB59
+    .string "There are items on the ground that\n"
+    .string "may be hidden from view.\p"
+    .string "Use the ITEMFINDER to detect any\n"
+    .string "hidden items close to you.\p"
+    .string "The machine is a bit limited.\n"
+    .string "It can't pinpoint item locations.\p"
+    .string "What it does is show the direction\n"
+    .string "where the item is.\p"
+    .string "Use it to get your bearings, then\n"
+    .string "search the suspect area by hand.$"
+
+gUnknown_819EC8A:: @ 819EC8A
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "A big POKéMON is asleep on a road!$"
+
+gUnknown_819ECD9:: @ 819ECD9
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "What a breathtaking view!$"
+
+gUnknown_819ED1F:: @ 819ED1F
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "To get to LAVENDER TOWN from\n"
+    .string "CERULEAN CITY…\p"
+    .string "ROCK TUNNEL appears to be a good\n"
+    .string "route to take.$"
+
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json
new file mode 100644
index 000000000..76603c9d5
--- /dev/null
+++ b/data/maps/Route12/map.json
@@ -0,0 +1,289 @@
+{
+  "id": "MAP_ROUTE12",
+  "name": "Route12",
+  "layout": "LAYOUT_ROUTE12",
+  "music": "BGM_FRLG_ROUTE_11",
+  "region_map_section": "MAPSEC_ROUTE_12",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_LAVENDER_TOWN",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE13",
+      "offset": -48,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE11",
+      "offset": 60,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 17,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route12_EventScript_1AA451",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 9,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route12_EventScript_1AA48F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 16,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route12_EventScript_1AA4CD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 13,
+      "y": 59,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route12_EventScript_1AA50B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "109",
+      "x": 14,
+      "y": 70,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_EventScript_168014",
+      "flag": "84"
+    },
+    {
+      "graphics_id": "26",
+      "x": 13,
+      "y": 92,
+      "elevation": 3,
+      "movement_type": "37",
+      "movement_range_x": 4,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route12_EventScript_1AA587",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 10,
+      "y": 99,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route12_EventScript_1AA5C5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 18,
+      "y": 108,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route12_EventScript_1AA549",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 11,
+      "y": 100,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "92",
+      "x": 18,
+      "y": 36,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_EventScript_1BE7B0",
+      "flag": "382"
+    },
+    {
+      "graphics_id": "92",
+      "x": 9,
+      "y": 101,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_EventScript_1BE7BD",
+      "flag": "383"
+    },
+    {
+      "graphics_id": "29",
+      "x": 19,
+      "y": 64,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_EventScript_1AA649",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 19,
+      "y": 63,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_EventScript_1AA603",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 12,
+      "y": 111,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_EventScript_1BDF13",
+      "flag": "19"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 86,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE12_FISHING_HOUSE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 17,
+      "y": 13,
+      "elevation": 0,
+      "script": "Route12_EventScript_1680A3"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 69,
+      "elevation": 0,
+      "script": "Route12_EventScript_1680AC"
+    },
+    {
+      "type": "hidden_item",
+      "x": 18,
+      "y": 57,
+      "elevation": 3,
+      "item": "ITEM_HYPER_POTION",
+      "flag": "42",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 70,
+      "elevation": 3,
+      "item": "ITEM_LEFTOVERS",
+      "flag": "131",
+      "unknown": 129
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 116,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "130",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc
new file mode 100644
index 000000000..81be7952e
--- /dev/null
+++ b/data/maps/Route12/scripts.inc
@@ -0,0 +1,67 @@
+Route12_MapScripts:: @ 8168000
+	map_script 5, Route12_MapScript1_168006
+	.byte 0
+
+Route12_MapScript1_168006:: @ 8168006
+	checkflag FLAG_0x807
+	call_if 1, EventScript_168010
+	end
+
+EventScript_168010:: @ 8168010
+	removeobject VAR_LAST_TALKED
+	return
+
+Route12_EventScript_168014:: @ 8168014
+	lock
+	faceplayer
+	checkflag FLAG_0x23D
+	goto_if 0, EventScript_168099
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	msgbox gUnknown_81853CC, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16808D
+	call EventScript_1A924B
+	setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
+	waitse
+	playmoncry SPECIES_SNORLAX, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_0x054
+	setflag FLAG_0x807
+	setflag FLAG_0x253
+	dowildbattle
+	clearflag FLAG_0x807
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16808F
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_16808F
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_16808F
+	release
+	end
+
+EventScript_16808D:: @ 816808D
+	release
+	end
+
+EventScript_16808F:: @ 816808F
+	msgbox gUnknown_8185383
+	release
+	end
+
+EventScript_168099:: @ 8168099
+	msgbox gUnknown_8185317
+	release
+	end
+
+Route12_EventScript_1680A3:: @ 81680A3
+	msgbox gUnknown_8185797, 3
+	end
+
+Route12_EventScript_1680AC:: @ 81680AC
+	msgbox gUnknown_81857B3, 3
+	end
diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc
new file mode 100644
index 000000000..bf82fcf59
--- /dev/null
+++ b/data/maps/Route12/text.inc
@@ -0,0 +1,111 @@
+gUnknown_8185317:: @ 8185317
+    .string "A POKéMON is sprawled out in\n"
+    .string "a deep and comfortable slumber.$"
+
+Text_185354:: @ 8185354
+    .string "SNORLAX woke up!\p"
+    .string "It attacked in a grumpy rage!$"
+
+gUnknown_8185383:: @ 8185383
+    .string "SNORLAX calmed down.\n"
+    .string "It gave a huge yawn…\l"
+    .string "And returned to the mountains.$"
+
+gUnknown_81853CC:: @ 81853CC
+    .string "Want to use the POKé FLUTE?$"
+
+Text_1853E8:: @ 81853E8
+    .string "{PLAYER} played the POKé FLUTE.$"
+
+Text_185402:: @ 8185402
+    .string "Yeah!\n"
+    .string "I got a bite here!$"
+
+Text_18541B:: @ 818541B
+    .string "Tch!\n"
+    .string "Just a small fry…$"
+
+Text_185432:: @ 8185432
+    .string "Hang on!\n"
+    .string "My line's snagged!$"
+
+Text_18544E:: @ 818544E
+    .string "Be patient.\n"
+    .string "Fishing is a waiting game.$"
+
+Text_185475:: @ 8185475
+    .string "That one got away!$"
+
+Text_185488:: @ 8185488
+    .string "With a better ROD, I could catch\n"
+    .string "better POKéMON…$"
+
+Text_1854B9:: @ 81854B9
+    .string "I'm searching for a MOON STONE.\n"
+    .string "Have you found one?$"
+
+Text_1854ED:: @ 81854ED
+    .string "Oww!$"
+
+Text_1854F2:: @ 81854F2
+    .string "I could have made my POKéMON\n"
+    .string "evolve with a MOON STONE.\p"
+    .string "I would have won then, I bet.$"
+
+Text_185547:: @ 8185547
+    .string "Electricity is my specialty.\p"
+    .string "I don't know a thing about POKéMON\n"
+    .string "of the sea, though.$"
+
+Text_18559B:: @ 818559B
+    .string "Unplugged!$"
+
+Text_1855A6:: @ 81855A6
+    .string "Water conducts electricity, so you\n"
+    .string "should zap sea POKéMON.$"
+
+Text_1855E1:: @ 81855E1
+    .string "The FISHING FOOL versus POKéMON\n"
+    .string "KID!$"
+
+Text_185606:: @ 8185606
+    .string "Touch too much!$"
+
+Text_185616:: @ 8185616
+    .string "I guess you get to be good at\n"
+    .string "what you like.\p"
+    .string "Well, you beat me at POKéMON,\n"
+    .string "but you can't top me at fishing.$"
+
+Text_185682:: @ 8185682
+    .string "I love fishing, don't get me wrong.\p"
+    .string "But it'd be best if I also had more\n"
+    .string "work.$"
+
+Text_1856D0:: @ 81856D0
+    .string "It's not easy…$"
+
+Text_1856DF:: @ 81856DF
+    .string "It's all right.\n"
+    .string "Losing doesn't bug me anymore.$"
+
+Text_18570E:: @ 818570E
+    .string "What's catching?\p"
+    .string "You never know what you could\n"
+    .string "catch!$"
+
+Text_185744:: @ 8185744
+    .string "Lost it!$"
+
+Text_18574D:: @ 818574D
+    .string "What, MAGIKARP?\p"
+    .string "I catch them all the time, sure.\n"
+    .string "But, boy are they wimpy.$"
+
+gUnknown_8185797:: @ 8185797
+    .string "ROUTE 12 \n"
+    .string "North to LAVENDER$"
+
+gUnknown_81857B3:: @ 81857B3
+    .string "SPORTFISHING AREA$"
+
diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json
new file mode 100644
index 000000000..6628b4966
--- /dev/null
+++ b/data/maps/Route12_FishingHouse/map.json
@@ -0,0 +1,63 @@
+{
+  "id": "MAP_ROUTE12_FISHING_HOUSE",
+  "name": "Route12_FishingHouse",
+  "layout": "LAYOUT_HOUSE4",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_ROUTE_12",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_FishingHouse_EventScript_16FF0C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE12",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE12",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route12_FishingHouse_EventScript_170067"
+    }
+  ]
+}
diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc
new file mode 100644
index 000000000..d4472473f
--- /dev/null
+++ b/data/maps/Route12_FishingHouse/scripts.inc
@@ -0,0 +1,116 @@
+Route12_FishingHouse_MapScripts:: @ 816FF0B
+	.byte 0
+
+Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
+	lock
+	faceplayer
+	checkflag FLAG_0x255
+	goto_if_eq EventScript_16FF7F
+	msgbox gUnknown_819EFE0, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16FF34
+	msgbox gUnknown_819F1FA
+	release
+	end
+
+EventScript_16FF34:: @ 816FF34
+	checkitemspace ITEM_SUPER_ROD, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16FF75
+	additem ITEM_SUPER_ROD, 1
+	msgbox gUnknown_819F05B
+	giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD
+	setflag FLAG_0x255
+	msgbox gUnknown_819F0EB
+	release
+	end
+
+EventScript_16FF75:: @ 816FF75
+	msgbox gUnknown_819F494
+	release
+	end
+
+EventScript_16FF7F:: @ 816FF7F
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	setvar VAR_0x8004, SPECIES_MAGIKARP
+	specialvar VAR_RESULT, sub_80CC48C
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16FFF5
+	special sub_80A096C
+	msgbox gUnknown_819F2DB
+	special sub_80BF8FC
+	waitstate
+	copyvar VAR_RESULT, VAR_0x8004
+	compare_var_to_value VAR_RESULT, 6
+	goto_if 4, EventScript_16FFFF
+	special sub_80A0984
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_170001
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_17000B
+	compare_var_to_value VAR_RESULT, 3
+	goto_if_eq EventScript_170031
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_17001E
+	release
+	end
+
+EventScript_16FFF5:: @ 816FFF5
+	msgbox gUnknown_819F217
+	release
+	end
+
+EventScript_16FFFF:: @ 816FFFF
+	release
+	end
+
+EventScript_170001:: @ 8170001
+	msgbox gUnknown_819F468
+	release
+	end
+
+EventScript_17000B:: @ 817000B
+	checkflag FLAG_0x29C
+	goto_if 0, EventScript_170031
+	msgbox gUnknown_819F40A
+	release
+	end
+
+EventScript_17001E:: @ 817001E
+	checkflag FLAG_0x29C
+	goto_if 0, EventScript_170031
+	msgbox gUnknown_819F3CB
+	release
+	end
+
+EventScript_170031:: @ 8170031
+	setflag FLAG_0x29C
+	msgbox gUnknown_819F31B
+	giveitem ITEM_NET_BALL
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_17005D
+	msgbox gUnknown_819F395
+	release
+	end
+
+EventScript_17005D:: @ 817005D
+	msgbox gUnknown_819F494
+	release
+	end
+
+Route12_FishingHouse_EventScript_170067:: @ 8170067
+	lockall
+	checkflag FLAG_0x29C
+	goto_if_eq EventScript_17007B
+	msgbox gUnknown_819F50C
+	releaseall
+	end
+
+EventScript_17007B:: @ 817007B
+	special sub_80A096C
+	msgbox gUnknown_819F4CF
+	releaseall
+	end
diff --git a/data/maps/Route12_FishingHouse/text.inc b/data/maps/Route12_FishingHouse/text.inc
new file mode 100644
index 000000000..4f1f3f1fd
--- /dev/null
+++ b/data/maps/Route12_FishingHouse/text.inc
@@ -0,0 +1,89 @@
+gUnknown_819EFE0:: @ 819EFE0
+    .string "I'm the FISHING GURU's younger\n"
+    .string "brother.\p"
+    .string "I simply looove fishing!\n"
+    .string "I can't bear to go without.\p"
+    .string "Tell me, do you like to fish?$"
+
+gUnknown_819F05B:: @ 819F05B
+    .string "Grand! I like your style.\n"
+    .string "I think we can be friends.\p"
+    .string "Take this and fish, young friend!$"
+
+gUnknown_819F0B2:: @ 819F0B2
+    .string "{PLAYER} received a SUPER ROD from\n"
+    .string "the FISHING GURU's brother.$"
+
+gUnknown_819F0EB:: @ 819F0EB
+    .string "Fishing is a way of life!\n"
+    .string "It is like the finest poetry.\p"
+    .string "From the seas to rivers, go out\n"
+    .string "and land the big one, my friend.\p"
+    .string "Now, I have a request.\p"
+    .string "If you catch a big MAGIKARP \n"
+    .string "with that ROD, I want to see it.\p"
+    .string "As much as I love to fish, I also\n"
+    .string "love seeing gigantic MAGIKARP.$"
+
+gUnknown_819F1FA:: @ 819F1FA
+    .string "Oh…\n"
+    .string "That's so disappointing…$"
+
+gUnknown_819F217:: @ 819F217
+    .string "Hello there, {PLAYER}!\n"
+    .string "Have you been fishing?\p"
+    .string "Try fishing with the SUPER ROD in\n"
+    .string "any body of water.\p"
+    .string "You'll find different POKéMON in\n"
+    .string "different places.\p"
+    .string "Oh, and don't forget to bring me\n"
+    .string "gigantic MAGIKARP.$"
+
+gUnknown_819F2DB:: @ 819F2DB
+    .string "Oh? {PLAYER}?\n"
+    .string "Why, if it isn't a MAGIKARP!\p"
+    .string "Allow me to see it, quick!$"
+
+gUnknown_819F31B:: @ 819F31B
+    .string "… … …Whoa!\n"
+    .string "{STR_VAR_2} inches!\p"
+    .string "You have a rare appreciation for\n"
+    .string "the fine, poetic aspects of fishing!\p"
+    .string "You must take this.\n"
+    .string "I insist!$"
+
+gUnknown_819F395:: @ 819F395
+    .string "I'll look forward to seeing greater\n"
+    .string "records from you!$"
+
+gUnknown_819F3CB:: @ 819F3CB
+    .string "Huh?\n"
+    .string "{STR_VAR_2} inches?\p"
+    .string "This is the same size as the one\n"
+    .string "I saw before.$"
+
+gUnknown_819F40A:: @ 819F40A
+    .string "Hmm…\n"
+    .string "This one is {STR_VAR_2} inches long.\p"
+    .string "It doesn't measure up to the\n"
+    .string "{STR_VAR_3}-inch one you brought before.$"
+
+gUnknown_819F468:: @ 819F468
+    .string "Uh… That doesn't look much like\n"
+    .string "a MAGIKARP.$"
+
+gUnknown_819F494:: @ 819F494
+    .string "Oh, no!\p"
+    .string "I had a gift for you, but you have\n"
+    .string "no room for it.$"
+
+gUnknown_819F4CF:: @ 819F4CF
+    .string "The most gigantic MAGIKARP\n"
+    .string "I have ever witnessed…\p"
+    .string "{STR_VAR_3} inches!$"
+
+gUnknown_819F50C:: @ 819F50C
+    .string "It's a blank chart of some sort.\p"
+    .string "It has spaces for writing in\n"
+    .string "records of some kind.$"
+
diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json
new file mode 100644
index 000000000..4eb283e56
--- /dev/null
+++ b/data/maps/Route12_NorthEntrance_1F/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_ROUTE12_NORTH_ENTRANCE_1F",
+  "name": "Route12_NorthEntrance_1F",
+  "layout": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_12",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_NorthEntrance_1F_EventScript_16FE6E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE12",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc
new file mode 100644
index 000000000..d91f0c7c8
--- /dev/null
+++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc
@@ -0,0 +1,6 @@
+Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D
+	.byte 0
+
+Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E
+	msgbox gUnknown_819EDA7, 2
+	end
diff --git a/data/maps/Route12_NorthEntrance_1F/text.inc b/data/maps/Route12_NorthEntrance_1F/text.inc
new file mode 100644
index 000000000..32f34428f
--- /dev/null
+++ b/data/maps/Route12_NorthEntrance_1F/text.inc
@@ -0,0 +1,4 @@
+gUnknown_819EDA7:: @ 819EDA7
+    .string "There's a lookout spot upstairs.\n"
+    .string "The view is magnificent.$"
+
diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json
new file mode 100644
index 000000000..b14f95f2c
--- /dev/null
+++ b/data/maps/Route12_NorthEntrance_2F/map.json
@@ -0,0 +1,56 @@
+{
+  "id": "MAP_ROUTE12_NORTH_ENTRANCE_2F",
+  "name": "Route12_NorthEntrance_2F",
+  "layout": "LAYOUT_ENTRANCE_2F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_12",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route12_NorthEntrance_2F_EventScript_16FE8A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route12_NorthEntrance_2F_EventScript_16FE78"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route12_NorthEntrance_2F_EventScript_16FE81"
+    }
+  ]
+}
diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc
new file mode 100644
index 000000000..3c8727208
--- /dev/null
+++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc
@@ -0,0 +1,48 @@
+Route12_NorthEntrance_2F_MapScripts:: @ 816FE77
+	.byte 0
+
+Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78
+	msgbox gUnknown_819EF5D, 3
+	end
+
+Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81
+	msgbox gUnknown_819EFA0, 3
+	end
+
+Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A
+	lock
+	faceplayer
+	checkflag FLAG_0x25B
+	goto_if_eq EventScript_16FF01
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16FEE5
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_16FEEE
+	checkitemspace ITEM_TM27, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16FEF7
+	additem ITEM_TM27, 1
+	giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27
+	msgbox gUnknown_819EEC6
+	setflag FLAG_0x25B
+	release
+	end
+
+EventScript_16FEE5:: @ 816FEE5
+	msgbox gUnknown_819EDE1
+	return
+
+EventScript_16FEEE:: @ 816FEEE
+	msgbox gUnknown_819EE40
+	return
+
+EventScript_16FEF7:: @ 816FEF7
+	msgbox gUnknown_819EF3F
+	release
+	end
+
+EventScript_16FF01:: @ 816FF01
+	msgbox gUnknown_819EEC6
+	release
+	end
diff --git a/data/maps/Route12_NorthEntrance_2F/text.inc b/data/maps/Route12_NorthEntrance_2F/text.inc
new file mode 100644
index 000000000..df2ac596b
--- /dev/null
+++ b/data/maps/Route12_NorthEntrance_2F/text.inc
@@ -0,0 +1,35 @@
+gUnknown_819EDE1:: @ 819EDE1
+    .string "My POKéMON's ashes are stored in\n"
+    .string "POKéMON TOWER.\p"
+    .string "You can have this TM.\n"
+    .string "I don't need it anymore…$"
+
+gUnknown_819EE40:: @ 819EE40
+    .string "My POKéMON's ashes are stored in\n"
+    .string "POKéMON TOWER.\p"
+    .string "You can have this TM.\n"
+    .string "I don't need it anymore…$"
+
+gUnknown_819EE9F:: @ 819EE9F
+    .string "{PLAYER} received TM27\n"
+    .string "from the little girl.$"
+
+gUnknown_819EEC6:: @ 819EEC6
+    .string "TM27 is a move called RETURN…\p"
+    .string "If you treat your POKéMON good,\n"
+    .string "it will return your love by working\l"
+    .string "its hardest in battle.$"
+
+gUnknown_819EF3F:: @ 819EF3F
+    .string "You don't have room for this.$"
+
+gUnknown_819EF5D:: @ 819EF5D
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "There's a man fishing!$"
+
+gUnknown_819EFA0:: @ 819EFA0
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "It's POKéMON TOWER!$"
+
diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json
new file mode 100644
index 000000000..f67b3f3b5
--- /dev/null
+++ b/data/maps/Route13/map.json
@@ -0,0 +1,205 @@
+{
+  "id": "MAP_ROUTE13",
+  "name": "Route13",
+  "layout": "LAYOUT_ROUTE13",
+  "music": "BGM_FRLG_ROUTE_11",
+  "region_map_section": "MAPSEC_ROUTE_13",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE12",
+      "offset": 48,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE14",
+      "offset": 0,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "40",
+      "x": 62,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route13_EventScript_1AA803",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 63,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route13_EventScript_1AA749",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 54,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route13_EventScript_1AA841",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 42,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route13_EventScript_1AA70B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 43,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route13_EventScript_1AA6CD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 35,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route13_EventScript_1AA87F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 29,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route13_EventScript_1AA8BD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 9,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route13_EventScript_1AA7C5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 16,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route13_EventScript_1AA787",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 14,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route13_EventScript_1AA68F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 44,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route13_EventScript_1BDF13",
+      "flag": "18"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 41,
+      "y": 12,
+      "elevation": 0,
+      "script": "Route13_EventScript_1680C8"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 37,
+      "y": 6,
+      "elevation": 0,
+      "script": "Route13_EventScript_1680BF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 14,
+      "elevation": 0,
+      "script": "Route13_EventScript_1680B6"
+    },
+    {
+      "type": "hidden_item",
+      "x": 23,
+      "y": 14,
+      "elevation": 3,
+      "item": "ITEM_PP_UP",
+      "flag": "15",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc
new file mode 100644
index 000000000..fcec8204a
--- /dev/null
+++ b/data/maps/Route13/scripts.inc
@@ -0,0 +1,14 @@
+Route13_MapScripts:: @ 81680B5
+	.byte 0
+
+Route13_EventScript_1680B6:: @ 81680B6
+	msgbox gUnknown_8185DB7, 3
+	end
+
+Route13_EventScript_1680BF:: @ 81680BF
+	msgbox gUnknown_8185DEF, 3
+	end
+
+Route13_EventScript_1680C8:: @ 81680C8
+	msgbox gUnknown_8185E2C, 3
+	end
diff --git a/data/maps/Route13/text.inc b/data/maps/Route13/text.inc
new file mode 100644
index 000000000..1b570d424
--- /dev/null
+++ b/data/maps/Route13/text.inc
@@ -0,0 +1,162 @@
+Text_1857C5:: @ 81857C5
+    .string "JES: If I win, I'm going to\n"
+    .string "propose to GIA.$"
+
+Text_1857F1:: @ 81857F1
+    .string "JES: Oh, please, why couldn't you\n"
+    .string "let us win?$"
+
+Text_18581F:: @ 818581F
+    .string "JES: Oh, GIA, forgive me,\n"
+    .string "my love!$"
+
+Text_185842:: @ 8185842
+    .string "JES: GIA and I, we'll be\n"
+    .string "together forever.\p"
+    .string "We won't battle unless you have\n"
+    .string "two POKéMON of your own.$"
+
+Text_1858A6:: @ 81858A6
+    .string "GIA: Hey, JES…\p"
+    .string "If we win, I'll marry you!$"
+
+Text_1858D0:: @ 81858D0
+    .string "GIA: Oh, but why?$"
+
+Text_1858E2:: @ 81858E2
+    .string "GIA: JES, you silly!\n"
+    .string "You ruined this!$"
+
+Text_185908:: @ 8185908
+    .string "GIA: I can't bear to battle\n"
+    .string "without my JES!\p"
+    .string "Don't you have one more POKéMON?$"
+
+Text_185955:: @ 8185955
+    .string "My bird POKéMON want to battle\n"
+    .string "with you!$"
+
+Text_18597E:: @ 818597E
+    .string "My PIDGEY and PIDGEOTTO combo\n"
+    .string "lost?$"
+
+Text_1859A2:: @ 81859A2
+    .string "My POKéMON look happy even though\n"
+    .string "they lost.$"
+
+Text_1859CF:: @ 81859CF
+    .string "I'm told I'm good for a kid.$"
+
+Text_1859EC:: @ 81859EC
+    .string "Ohh!\n"
+    .string "I lost!$"
+
+Text_1859F9:: @ 81859F9
+    .string "I want to become a good TRAINER.\n"
+    .string "I'll train hard, just watch.$"
+
+Text_185A37:: @ 8185A37
+    .string "Wow!\n"
+    .string "Your BADGES are too cool!$"
+
+Text_185A56:: @ 8185A56
+    .string "Not enough!$"
+
+Text_185A62:: @ 8185A62
+    .string "You got those BADGES from GYM\n"
+    .string "LEADERS. I know!$"
+
+Text_185A91:: @ 8185A91
+    .string "My cute POKéMON wish to make your\n"
+    .string "acquaintance.$"
+
+Text_185AC1:: @ 8185AC1
+    .string "Good going!\n"
+    .string "You totally won!$"
+
+Text_185ADE:: @ 8185ADE
+    .string "You have to make POKéMON battle\n"
+    .string "to toughen them up.$"
+
+Text_185B12:: @ 8185B12
+    .string "I found CARBOS in a cave once\n"
+    .string "while I was spelunking.$"
+
+Text_185B48:: @ 8185B48
+    .string "Oh, too bad!\n"
+    .string "I just messed up!$"
+
+Text_185B67:: @ 8185B67
+    .string "CARBOS boosted the SPEED of my\n"
+    .string "POKéMON.$"
+
+Text_185B8F:: @ 8185B8F
+    .string "I'm not going to lose.\n"
+    .string "Not when the wind's blowing my way!$"
+
+Text_185BCA:: @ 8185BCA
+    .string "The wind turned!$"
+
+Text_185BDB:: @ 8185BDB
+    .string "I'm beat.\n"
+    .string "I guess I'll FLY home.$"
+
+Text_185BFC:: @ 8185BFC
+    .string "Sure, I'll play with you, sweetie.$"
+
+Text_185C1F:: @ 8185C1F
+    .string "Oh!\n"
+    .string "You little beast!$"
+
+Text_185C35:: @ 8185C35
+    .string "I wonder which is stronger, male or\n"
+    .string "female POKéMON?$"
+
+Text_185C69:: @ 8185C69
+    .string "Do you want to battle some\n"
+    .string "POKéMON with me?$"
+
+Text_185C95:: @ 8185C95
+    .string "It's over already?$"
+
+Text_185CA8:: @ 8185CA8
+    .string "I don't know anything about\n"
+    .string "POKéMON actually.\p"
+    .string "The ones I use… I picked them\n"
+    .string "for their looks!$"
+
+Text_185D05:: @ 8185D05
+    .string "What're you lookin' at?$"
+
+Text_185D1D:: @ 8185D1D
+    .string "Dang!\n"
+    .string "Stripped gears!$"
+
+Text_185D33:: @ 8185D33
+    .string "Get lost!$"
+
+Text_185D3D:: @ 8185D3D
+    .string "I always go with bird POKéMON.\n"
+    .string "I've dedicated myself to them.$"
+
+Text_185D7B:: @ 8185D7B
+    .string "Out of power!$"
+
+Text_185D89:: @ 8185D89
+    .string "I wish I could fly like PIDGEY and\n"
+    .string "PIDGEOTTO…$"
+
+gUnknown_8185DB7:: @ 8185DB7
+    .string "TRAINER TIPS\p"
+    .string "Look, look!\n"
+    .string "Look to the left of that post!$"
+
+gUnknown_8185DEF:: @ 8185DEF
+    .string "TRAINER TIPS\p"
+    .string "Use SELECT to switch items in the\n"
+    .string "ITEMS window.$"
+
+gUnknown_8185E2C:: @ 8185E2C
+    .string "ROUTE 13\n"
+    .string "North to SILENCE BRIDGE$"
+
diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json
new file mode 100644
index 000000000..95ba61886
--- /dev/null
+++ b/data/maps/Route14/map.json
@@ -0,0 +1,252 @@
+{
+  "id": "MAP_ROUTE14",
+  "name": "Route14",
+  "layout": "LAYOUT_ROUTE14",
+  "music": "BGM_FRLG_ROUTE_11",
+  "region_map_section": "MAPSEC_ROUTE_14",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE15",
+      "offset": 40,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE13",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "53",
+      "x": 7,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route14_EventScript_1AA9B5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 18,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route14_EventScript_1AA9F3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 10,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route14_EventScript_1AAAEB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 16,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route14_EventScript_1AAB29",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 7,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route14_EventScript_1AA977",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 7,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route14_EventScript_1AA8FB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route14_EventScript_1AAAAD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route14_EventScript_1AAA6F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 10,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "25",
+      "movement_range_x": 1,
+      "movement_range_y": 6,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route14_EventScript_1AA939",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 18,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route14_EventScript_1AAA31",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 7,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route14_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "95",
+      "x": 12,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route14_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "95",
+      "x": 1,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route14_EventScript_1BDF13",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "17",
+      "x": 13,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route14_EventScript_1AABAD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 12,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route14_EventScript_1AAB67",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 17,
+      "y": 12,
+      "elevation": 0,
+      "script": "Route14_EventScript_1680D2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 20,
+      "elevation": 3,
+      "item": "ITEM_ZINC",
+      "flag": "149",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 53,
+      "elevation": 3,
+      "item": "ITEM_PINAP_BERRY",
+      "flag": "157",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc
new file mode 100644
index 000000000..207604cdc
--- /dev/null
+++ b/data/maps/Route14/scripts.inc
@@ -0,0 +1,6 @@
+Route14_MapScripts:: @ 81680D1
+	.byte 0
+
+Route14_EventScript_1680D2:: @ 81680D2
+	msgbox gUnknown_8186399, 3
+	end
diff --git a/data/maps/Route14/text.inc b/data/maps/Route14/text.inc
new file mode 100644
index 000000000..37008ab3b
--- /dev/null
+++ b/data/maps/Route14/text.inc
@@ -0,0 +1,126 @@
+Text_185E4D:: @ 8185E4D
+    .string "You need to use TMs to teach good\n"
+    .string "moves to POKéMON.$"
+
+Text_185E81:: @ 8185E81
+    .string "Not good enough quite yet.$"
+
+Text_185E9C:: @ 8185E9C
+    .string "You have some HMs, right? POKéMON\n"
+    .string "can't forget those moves easily.$"
+
+Text_185EDF:: @ 8185EDF
+    .string "My bird POKéMON should be ready\n"
+    .string "for battle.$"
+
+Text_185F0B:: @ 8185F0B
+    .string "Not ready yet!$"
+
+Text_185F1A:: @ 8185F1A
+    .string "My bird POKéMON need to learn\n"
+    .string "better moves.$"
+
+Text_185F46:: @ 8185F46
+    .string "They have TMs on sale at the\n"
+    .string "CELADON DEPT. STORE.\p"
+    .string "TMs aren't really rare, but not\n"
+    .string "many people have HMs.$"
+
+Text_185FAE:: @ 8185FAE
+    .string "Aww, bummer!$"
+
+Text_185FBB:: @ 8185FBB
+    .string "Try teaching POKéMON a move that's\n"
+    .string "the same type as it.\p"
+    .string "That apparently boosts the power\n"
+    .string "of the move.$"
+
+Text_186021:: @ 8186021
+    .string "Have you taught your bird POKéMON\n"
+    .string "how to FLY?\p"
+    .string "You'll be able to soar with it into\n"
+    .string "the sky!$"
+
+Text_18607C:: @ 818607C
+    .string "Shot down in flames!$"
+
+Text_186091:: @ 8186091
+    .string "Bird POKéMON are my one true love.\n"
+    .string "I don't want to raise anything else.$"
+
+Text_1860D9:: @ 81860D9
+    .string "Have you heard the legend of the\n"
+    .string "winged mirages?$"
+
+Text_18610A:: @ 818610A
+    .string "Why?\n"
+    .string "Why'd I lose?$"
+
+Text_18611D:: @ 818611D
+    .string "Well, the winged mirages are the\n"
+    .string "legendary bird POKéMON.\p"
+    .string "There are three of them: ARTICUNO,\n"
+    .string "ZAPDOS, and MOLTRES.$"
+
+Text_18618E:: @ 818618E
+    .string "I'm not into it, but okay.\n"
+    .string "Let's go!$"
+
+Text_1861B3:: @ 81861B3
+    .string "I knew it!$"
+
+Text_1861BE:: @ 81861BE
+    .string "Winning, losing… It's insignificant\n"
+    .string "under this huge sky.$"
+
+Text_1861F7:: @ 81861F7
+    .string "C'mon, c'mon.\n"
+    .string "Let's go, let's go, let's go!$"
+
+Text_186223:: @ 8186223
+    .string "Arrg!\n"
+    .string "Lost! Get lost!$"
+
+Text_186239:: @ 8186239
+    .string "What, what, what?\n"
+    .string "What do you want still?$"
+
+Text_186263:: @ 8186263
+    .string "I need to burn some time.\n"
+    .string "Shut up and battle.$"
+
+Text_186291:: @ 8186291
+    .string "What?\n"
+    .string "You!?$"
+
+Text_18629D:: @ 818629D
+    .string "Raising POKéMON is a drag, man.$"
+
+Text_1862BD:: @ 81862BD
+    .string "We ride out here because of the\n"
+    .string "wide-open spaces.$"
+
+Text_1862EF:: @ 81862EF
+    .string "Wipeout!$"
+
+Text_1862F8:: @ 81862F8
+    .string "It's cool you made your POKéMON so\n"
+    .string "strong.\p"
+    .string "Might is right!\n"
+    .string "And you know it!$"
+
+Text_186344:: @ 8186344
+    .string "POKéMON battle?\n"
+    .string "Cool! Rumble!$"
+
+Text_186362:: @ 8186362
+    .string "Blown away!$"
+
+Text_18636E:: @ 818636E
+    .string "You know who'd win, you and me\n"
+    .string "one-on-one!$"
+
+gUnknown_8186399:: @ 8186399
+    .string "ROUTE 14\n"
+    .string "West to FUCHSIA CITY$"
+
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
new file mode 100644
index 000000000..84f075445
--- /dev/null
+++ b/data/maps/Route15/map.json
@@ -0,0 +1,236 @@
+{
+  "id": "MAP_ROUTE15",
+  "name": "Route15",
+  "layout": "LAYOUT_ROUTE15",
+  "music": "BGM_FRLG_ROUTE_11",
+  "region_map_section": "MAPSEC_ROUTE_15",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_FUCHSIA_CITY",
+      "offset": -10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE14",
+      "offset": -40,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "40",
+      "x": 22,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AAD67",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 31,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route15_EventScript_1AACEB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 37,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route15_EventScript_1AAD29",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 44,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AADA5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 50,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route15_EventScript_1AACAD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 59,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route15_EventScript_1AAC31",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 63,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AABF3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 52,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AADE3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 54,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route15_EventScript_1AAC6F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 28,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AAE21",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 20,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route15_EventScript_1BE7CA",
+      "flag": "384"
+    },
+    {
+      "graphics_id": "54",
+      "x": 39,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AAEA5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "24",
+      "x": 40,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AAE5F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65375",
+      "x": 73,
+      "y": 7,
+      "elevation": 13,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 32,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 41,
+      "y": 11,
+      "elevation": 0,
+      "script": "Route15_EventScript_1680DC"
+    }
+  ]
+}
diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc
new file mode 100644
index 000000000..a4d0a3240
--- /dev/null
+++ b/data/maps/Route15/scripts.inc
@@ -0,0 +1,6 @@
+Route15_MapScripts:: @ 81680DB
+	.byte 0
+
+Route15_EventScript_1680DC:: @ 81680DC
+	msgbox gUnknown_8186A77, 3
+	end
diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc
new file mode 100644
index 000000000..34e3a0c60
--- /dev/null
+++ b/data/maps/Route15/text.inc
@@ -0,0 +1,153 @@
+Text_1863B7:: @ 81863B7
+    .string "KIRI: JAN, let's try really,\n"
+    .string "really hard together.$"
+
+Text_1863EA:: @ 81863EA
+    .string "KIRI: Whimper…\n"
+    .string "We lost, didn't we?$"
+
+Text_18640D:: @ 818640D
+    .string "KIRI: Did we lose because of me?$"
+
+Text_18642E:: @ 818642E
+    .string "KIRI: We can battle if you have\n"
+    .string "two POKéMON.$"
+
+Text_18645B:: @ 818645B
+    .string "JAN: KIRI, here we go!\n"
+    .string "We have to try hard!$"
+
+Text_186487:: @ 8186487
+    .string "JAN: Eeeeh!\n"
+    .string "No fair!$"
+
+Text_18649C:: @ 818649C
+    .string "JAN: KIRI, don't cry!\n"
+    .string "We'll just try harder next time.$"
+
+Text_1864D3:: @ 81864D3
+    .string "JAN: You want to battle?\n"
+    .string "You don't have enough POKéMON.$"
+
+Text_18650B:: @ 818650B
+    .string "I just got some POKéMON in trades.\n"
+    .string "Can I try them out on you?$"
+
+Text_186549:: @ 8186549
+    .string "Not good enough!$"
+
+Text_18655A:: @ 818655A
+    .string "You can't change the nickname of\n"
+    .string "any POKéMON you get in a trade.\p"
+    .string "Only the Original TRAINER can get\n"
+    .string "the nickname changed.$"
+
+Text_1865D3:: @ 81865D3
+    .string "You look gentle, so I think I can\n"
+    .string "beat you.\p"
+    .string "I'll give it a go!$"
+
+Text_186612:: @ 8186612
+    .string "No, wrong!$"
+
+Text_18661D:: @ 818661D
+    .string "I'm afraid of BIKERS. They look so\n"
+    .string "ugly and mean!$"
+
+Text_18664F:: @ 818664F
+    .string "When I whistle, I can summon bird\n"
+    .string "POKéMON.$"
+
+Text_18667A:: @ 818667A
+    .string "Ow!\n"
+    .string "That's tragic!$"
+
+Text_18668D:: @ 818668D
+    .string "Maybe I'm not cut out for battles.\n"
+    .string "I'm not the right type, I guess.$"
+
+Text_1866D1:: @ 81866D1
+    .string "Hmm? My birds are shivering!\n"
+    .string "You're good, aren't you?$"
+
+Text_186707:: @ 8186707
+    .string "Just as I thought!$"
+
+Text_18671A:: @ 818671A
+    .string "This is so obvious, you should know\n"
+    .string "this, but…\p"
+    .string "Moves like EARTHQUAKE and FISSURE\n"
+    .string "have no effect on bird POKéMON.$"
+
+Text_18678B:: @ 818678B
+    .string "Oh, you're a little cutie!\n"
+    .string "So like a darling POKéMON!$"
+
+Text_1867C1:: @ 81867C1
+    .string "You looked so cute, too!$"
+
+Text_1867DA:: @ 81867DA
+    .string "I forgive you.\n"
+    .string "I can take it.\l"
+    .string "I'm a big girl now.$"
+
+Text_18680C:: @ 818680C
+    .string "I raise POKéMON for protection\n"
+    .string "because I live alone.$"
+
+Text_186841:: @ 8186841
+    .string "POKéMON isn't about winning or\n"
+    .string "losing for me.$"
+
+Text_18686F:: @ 818686F
+    .string "I love having my POKéMON greet me\n"
+    .string "when I get home.\p"
+    .string "It's so reassuring.$"
+
+Text_1868B6:: @ 81868B6
+    .string "Hey, kid! C'mon!\n"
+    .string "I just got these off some loser!$"
+
+Text_1868E8:: @ 81868E8
+    .string "Why not?$"
+
+Text_1868F1:: @ 81868F1
+    .string "Life's too short.\n"
+    .string "It's cool to live as an outlaw.\l"
+    .string "TEAM ROCKET RULES!$"
+
+Text_186936:: @ 8186936
+    .string "Fork over all your cash when you\n"
+    .string "lose to me, kid!$"
+
+Text_186968:: @ 8186968
+    .string "That can't be true!$"
+
+Text_18697C:: @ 818697C
+    .string "I was just joking about the money.\n"
+    .string "Don't take me all serious.$"
+
+Text_1869BA:: @ 81869BA
+    .string "What's cool and happening?\n"
+    .string "Trading POKéMON!$"
+
+Text_1869E6:: @ 81869E6
+    .string "I said trade!$"
+
+Text_1869F4:: @ 81869F4
+    .string "I trade POKéMON with my friends\n"
+    .string "all the time.$"
+
+Text_186A22:: @ 8186A22
+    .string "Want to play with my POKéMON?$"
+
+Text_186A40:: @ 8186A40
+    .string "I was too impatient!$"
+
+Text_186A55:: @ 8186A55
+    .string "I'll go train with weaker people.$"
+
+gUnknown_8186A77:: @ 8186A77
+    .string "ROUTE 15\n"
+    .string "West to FUCHSIA CITY$"
+
diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json
new file mode 100644
index 000000000..81896d704
--- /dev/null
+++ b/data/maps/Route15_WestEntrance_1F/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_ROUTE15_WEST_ENTRANCE_1F",
+  "name": "Route15_WestEntrance_1F",
+  "layout": "LAYOUT_ENTRANCE_1F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_15",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route15_WestEntrance_1F_EventScript_170089",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc
new file mode 100644
index 000000000..458f5e010
--- /dev/null
+++ b/data/maps/Route15_WestEntrance_1F/scripts.inc
@@ -0,0 +1,6 @@
+Route15_WestEntrance_1F_MapScripts:: @ 8170088
+	.byte 0
+
+Route15_WestEntrance_1F_EventScript_170089:: @ 8170089
+	msgbox gUnknown_819F560, 2
+	end
diff --git a/data/maps/Route15_WestEntrance_1F/text.inc b/data/maps/Route15_WestEntrance_1F/text.inc
new file mode 100644
index 000000000..e843e10a8
--- /dev/null
+++ b/data/maps/Route15_WestEntrance_1F/text.inc
@@ -0,0 +1,5 @@
+gUnknown_819F560:: @ 819F560
+    .string "Are you the kid who's working on\n"
+    .string "a POKéDEX?\p"
+    .string "PROF. OAK's AIDE came by here.$"
+
diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json
new file mode 100644
index 000000000..3d72c90e1
--- /dev/null
+++ b/data/maps/Route15_WestEntrance_2F/map.json
@@ -0,0 +1,56 @@
+{
+  "id": "MAP_ROUTE15_WEST_ENTRANCE_2F",
+  "name": "Route15_WestEntrance_2F",
+  "layout": "LAYOUT_ENTRANCE_2F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_15",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route15_WestEntrance_2F_EventScript_1700B9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route15_WestEntrance_2F_EventScript_170093"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route15_WestEntrance_2F_EventScript_1700B0"
+    }
+  ]
+}
diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc
new file mode 100644
index 000000000..1e06c0394
--- /dev/null
+++ b/data/maps/Route15_WestEntrance_2F/scripts.inc
@@ -0,0 +1,54 @@
+Route15_WestEntrance_2F_MapScripts:: @ 8170092
+	.byte 0
+
+Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
+	lockall
+	msgbox gUnknown_819F79C
+	drawmonpic SPECIES_ARTICUNO, 10, 3
+	delay 20
+	waitbuttonpress
+	erasemonpic
+	setvar VAR_0x8004, SPECIES_ARTICUNO
+	special sub_80CBDCC
+	releaseall
+	end
+
+Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0
+	msgbox gUnknown_819F7F8, 3
+	end
+
+Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
+	lock
+	faceplayer
+	call EventScript_170145
+	checkflag FLAG_0x256
+	goto_if_eq EventScript_17013B
+	msgbox gUnknown_819F5AB, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AD1
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, Special_GetPokedexCount
+	getnumberstring 2, VAR_0x8006
+	call EventScript_170145
+	compare_var_to_value VAR_0x8006, 50
+	goto_if 0, EventScript_1A7ABD
+	msgbox gUnknown_819F6AA
+	checkitemspace ITEM_EXP_SHARE, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AC7
+	additem ITEM_EXP_SHARE, 1
+	giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE
+	setflag FLAG_0x256
+	msgbox gUnknown_819F71F
+	release
+	end
+
+EventScript_17013B:: @ 817013B
+	msgbox gUnknown_819F71F
+	release
+	end
+
+EventScript_170145:: @ 8170145
+	getnumberstring 0, 50
+	getitemname 1, ITEM_EXP_SHARE
+	return
diff --git a/data/maps/Route15_WestEntrance_2F/text.inc b/data/maps/Route15_WestEntrance_2F/text.inc
new file mode 100644
index 000000000..e5518b8e2
--- /dev/null
+++ b/data/maps/Route15_WestEntrance_2F/text.inc
@@ -0,0 +1,41 @@
+gUnknown_819F5AB:: @ 819F5AB
+    .string "Hi! Remember me?\n"
+    .string "I'm one of PROF. OAK's AIDES.\p"
+    .string "If your POKéDEX has complete data\n"
+    .string "on {STR_VAR_1} species, I'm supposed to\l"
+    .string "give you a reward.\p"
+    .string "PROF. OAK entrusted me with the\n"
+    .string "{STR_VAR_2} for you.\p"
+    .string "So, {PLAYER}, let me ask you.\p"
+    .string "Have you gathered data on at least\n"
+    .string "{STR_VAR_1} kinds of POKéMON?$"
+
+gUnknown_819F6AA:: @ 819F6AA
+    .string "Great! You have caught or owned\n"
+    .string "{STR_VAR_3} kinds of POKéMON!\p"
+    .string "Congratulations!\n"
+    .string "Here you go!$"
+
+gUnknown_819F6FD:: @ 819F6FD
+    .string "{PLAYER} received the {STR_VAR_2}\n"
+    .string "from the AIDE.$"
+
+gUnknown_819F71F:: @ 819F71F
+    .string "EXP. SHARE is an item to be held\n"
+    .string "by a POKéMON.\p"
+    .string "The POKéMON will receive a share\n"
+    .string "of the EXP. Points without having\l"
+    .string "to battle.$"
+
+gUnknown_819F79C:: @ 819F79C
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "A large, shining bird is flying\n"
+    .string "toward the sea.$"
+
+gUnknown_819F7F8:: @ 819F7F8
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "It looks like a small island on\n"
+    .string "the horizon!$"
+
diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
new file mode 100644
index 000000000..50bcad08a
--- /dev/null
+++ b/data/maps/Route16/map.json
@@ -0,0 +1,221 @@
+{
+  "id": "MAP_ROUTE16",
+  "name": "Route16",
+  "layout": "LAYOUT_ROUTE16",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_16",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE17",
+      "offset": 0,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_CELADON_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "53",
+      "x": 16,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAEEB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 14,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAFA5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAFE3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAF67",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 10,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAF29",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 6,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AB021",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 41,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "29",
+      "x": 30,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AB0A5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 31,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AB05F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "109",
+      "x": 31,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_EventScript_168121",
+      "flag": "128"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE16_HOUSE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 27,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 27,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 17,
+      "elevation": 0,
+      "script": "Route16_EventScript_1681B6"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 33,
+      "y": 11,
+      "elevation": 0,
+      "script": "Route16_EventScript_1681AD"
+    },
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 13,
+      "elevation": 3,
+      "item": "ITEM_LEFTOVERS",
+      "flag": "132",
+      "unknown": 129
+    }
+  ]
+}
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
new file mode 100644
index 000000000..e5fd83934
--- /dev/null
+++ b/data/maps/Route16/scripts.inc
@@ -0,0 +1,85 @@
+Route16_MapScripts:: @ 81680E5
+	map_script 5, Route16_MapScript1_1680F5
+	map_script 3, Route16_MapScript2_168103
+	map_script 4, Route16_MapScript3_168113
+	.byte 0
+
+Route16_MapScript1_1680F5:: @ 81680F5
+	checkflag FLAG_0x807
+	call_if 1, EventScript_1680FF
+	end
+
+EventScript_1680FF:: @ 81680FF
+	removeobject VAR_LAST_TALKED
+	return
+
+Route16_MapScript2_168103:: @ 8168103
+	compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1
+	call_if 1, EventScript_16810F
+	end
+
+EventScript_16810F:: @ 816810F
+	setflag FLAG_0x830
+	return
+
+Route16_MapScript3_168113:: @ 8168113
+	map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16811D
+	.2byte 0
+
+EventScript_16811D:: @ 816811D
+	special sub_80CA630
+	end
+
+Route16_EventScript_168121:: @ 8168121
+	lock
+	faceplayer
+	checkflag FLAG_0x23D
+	goto_if 0, EventScript_1681A3
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	msgbox gUnknown_81853CC, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_168197
+	call EventScript_1A924B
+	setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
+	waitse
+	playmoncry SPECIES_SNORLAX, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_0x080
+	setflag FLAG_0x807
+	dowildbattle
+	clearflag FLAG_0x807
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_168199
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_168199
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_168199
+	release
+	end
+
+EventScript_168197:: @ 8168197
+	release
+	end
+
+EventScript_168199:: @ 8168199
+	msgbox gUnknown_8185383
+	release
+	end
+
+EventScript_1681A3:: @ 81681A3
+	msgbox gUnknown_8186F3D
+	release
+	end
+
+Route16_EventScript_1681AD:: @ 81681AD
+	msgbox gUnknown_8186F7A, 3
+	end
+
+Route16_EventScript_1681B6:: @ 81681B6
+	msgbox gUnknown_8186F98, 3
+	end
diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc
new file mode 100644
index 000000000..1945cf510
--- /dev/null
+++ b/data/maps/Route16/text.inc
@@ -0,0 +1,113 @@
+Text_186A95:: @ 8186A95
+    .string "MYA: You're perfect.\n"
+    .string "Help me train my little brother?$"
+
+Text_186ACB:: @ 8186ACB
+    .string "MYA: RON, you have to focus!\n"
+    .string "Concentrate on what you're doing!$"
+
+Text_186B0A:: @ 8186B0A
+    .string "MYA: Okay, we'll turn it up.\n"
+    .string "I'll add to our training menu!$"
+
+Text_186B46:: @ 8186B46
+    .string "MYA: Do you want to challenge us?\n"
+    .string "You'll need two POKéMON, though.$"
+
+Text_186B89:: @ 8186B89
+    .string "RON: My sister gets scary when we\n"
+    .string "lose.$"
+
+Text_186BB1:: @ 8186BB1
+    .string "RON: Oh, no, no…\n"
+    .string "Sis, I'm sorry!$"
+
+Text_186BD2:: @ 8186BD2
+    .string "RON: Oh, bleah…\n"
+    .string "I wish I had a nice sister…$"
+
+Text_186BFE:: @ 8186BFE
+    .string "RON: Did you want to battle with\n"
+    .string "my sister and me?\p"
+    .string "You need two POKéMON, then.$"
+
+Text_186C4D:: @ 8186C4D
+    .string "What do you want?$"
+
+Text_186C5F:: @ 8186C5F
+    .string "Don't you dare laugh!$"
+
+Text_186C75:: @ 8186C75
+    .string "We like just hanging here.\n"
+    .string "What's it to you?$"
+
+Text_186CA2:: @ 8186CA2
+    .string "Nice BIKE!\n"
+    .string "Hand it over!$"
+
+Text_186CBB:: @ 8186CBB
+    .string "Knockout!$"
+
+Text_186CC5:: @ 8186CC5
+    .string "Forget it, who needs your BIKE!$"
+
+Text_186CE5:: @ 8186CE5
+    .string "Come out and play, little mouse!$"
+
+Text_186D06:: @ 8186D06
+    .string "You little rat!$"
+
+Text_186D16:: @ 8186D16
+    .string "I hate losing!\n"
+    .string "Get out of my face!$"
+
+Text_186D39:: @ 8186D39
+    .string "Hey, you just bumped me!$"
+
+Text_186D52:: @ 8186D52
+    .string "Kaboom!$"
+
+Text_186D5A:: @ 8186D5A
+    .string "We'll always be hanging around here\n"
+    .string "even if you don't like it.\p"
+    .string "You can detour to VERMILION from\n"
+    .string "FUCHSIA going along the coast.$"
+
+Text_186DD9:: @ 8186DD9
+    .string "I'm feeling hungry and mean!\n"
+    .string "I need a punching bag!$"
+
+Text_186E0D:: @ 8186E0D
+    .string "Bad, bad, bad!$"
+
+Text_186E1C:: @ 8186E1C
+    .string "If I'm going to have POKéMON, they\n"
+    .string "may as well be ferocious.\p"
+    .string "I'd use them to leave my enemies\n"
+    .string "in tatters.$"
+
+Text_186E86:: @ 8186E86
+    .string "Hey, there!\n"
+    .string "Let's have ourselves a good time!$"
+
+Text_186EB4:: @ 8186EB4
+    .string "Don't make me mad!$"
+
+Text_186EC7:: @ 8186EC7
+    .string "I get my kicks by harassing people\n"
+    .string "with my stinking POKéMON.\p"
+    .string "They're great for startling people.\n"
+    .string "And, they bite, too.$"
+
+gUnknown_8186F3D:: @ 8186F3D
+    .string "A POKéMON is sprawled out in\n"
+    .string "a deep and comfortable slumber.$"
+
+gUnknown_8186F7A:: @ 8186F7A
+    .string "Enjoy the slope!\n"
+    .string "CYCLING ROAD$"
+
+gUnknown_8186F98:: @ 8186F98
+    .string "ROUTE 16\n"
+    .string "CELADON CITY - FUCHSIA CITY$"
+
diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json
new file mode 100644
index 000000000..834ef6ef6
--- /dev/null
+++ b/data/maps/Route16_House/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_ROUTE16_HOUSE",
+  "name": "Route16_House",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "BGM_FRLG_CELADON_CITY",
+  "region_map_section": "MAPSEC_ROUTE_16",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "23",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_House_EventScript_17014F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "133",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_House_EventScript_1701AF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc
new file mode 100644
index 000000000..82cc7a6f4
--- /dev/null
+++ b/data/maps/Route16_House/scripts.inc
@@ -0,0 +1,38 @@
+Route16_House_MapScripts:: @ 817014E
+	.byte 0
+
+Route16_House_EventScript_17014F:: @ 817014F
+	lock
+	faceplayer
+	checkflag FLAG_0x238
+	goto_if_eq EventScript_1701A5
+	msgbox gUnknown_819F851
+	checkitemspace ITEM_HM02, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_17019B
+	additem ITEM_HM02, 1
+	giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02
+	msgbox gUnknown_819F8E0
+	setflag FLAG_0x238
+	release
+	end
+
+EventScript_17019B:: @ 817019B
+	msgbox gUnknown_819F92D
+	release
+	end
+
+EventScript_1701A5:: @ 81701A5
+	msgbox gUnknown_819F8E0
+	release
+	end
+
+Route16_House_EventScript_1701AF:: @ 81701AF
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_FEAROW, 0
+	msgbox gUnknown_819F94F
+	waitmoncry
+	release
+	end
diff --git a/data/maps/Route16_House/text.inc b/data/maps/Route16_House/text.inc
new file mode 100644
index 000000000..136cf9604
--- /dev/null
+++ b/data/maps/Route16_House/text.inc
@@ -0,0 +1,21 @@
+gUnknown_819F851:: @ 819F851
+    .string "Oh, dear.\n"
+    .string "You've found my secret retreat.\p"
+    .string "Please don't tell anyone I'm here.\n"
+    .string "I'll make it up to you with this!$"
+
+gUnknown_819F8C0:: @ 819F8C0
+    .string "{PLAYER} received HM02\n"
+    .string "from the girl.$"
+
+gUnknown_819F8E0:: @ 819F8E0
+    .string "HM02 is FLY.\n"
+    .string "It's a wonderfully convenient move.\p"
+    .string "Please, put it to good use.$"
+
+gUnknown_819F92D:: @ 819F92D
+    .string "You don't have any room for this.$"
+
+gUnknown_819F94F:: @ 819F94F
+    .string "FEAROW: Kyueen!$"
+
diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json
new file mode 100644
index 000000000..bcb49452d
--- /dev/null
+++ b/data/maps/Route16_NorthEntrance_1F/map.json
@@ -0,0 +1,182 @@
+{
+  "id": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+  "name": "Route16_NorthEntrance_1F",
+  "layout": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_16",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_1701DB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_1702B5",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 11,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 9,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 1,
+      "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+    },
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_1701E4"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_1701F0"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 1,
+      "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 1,
+      "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_1701FC"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_170208"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 14,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route16_NorthEntrance_1F_EventScript_170214"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc
new file mode 100644
index 000000000..c30f309fd
--- /dev/null
+++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc
@@ -0,0 +1,119 @@
+Route16_NorthEntrance_1F_MapScripts:: @ 81701C2
+	map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8
+	.byte 0
+
+Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8
+	clearflag FLAG_0x830
+	checkflag FLAG_0x271
+	call_if 1, EventScript_1701D5
+	end
+
+EventScript_1701D5:: @ 81701D5
+	setvar VAR_0x4001, 1
+	return
+
+Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB
+	msgbox gUnknown_819F98B, 2
+	end
+
+Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4
+	lockall
+	setvar VAR_0x8008, 0
+	goto EventScript_170220
+	end
+
+Route16_NorthEntrance_1F_EventScript_1701F0:: @ 81701F0
+	lockall
+	setvar VAR_0x8008, 1
+	goto EventScript_170220
+	end
+
+Route16_NorthEntrance_1F_EventScript_1701FC:: @ 81701FC
+	lockall
+	setvar VAR_0x8008, 2
+	goto EventScript_170220
+	end
+
+Route16_NorthEntrance_1F_EventScript_170208:: @ 8170208
+	lockall
+	setvar VAR_0x8008, 3
+	goto EventScript_170220
+	end
+
+Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214
+	lockall
+	setvar VAR_0x8008, 4
+	goto EventScript_170220
+	end
+
+EventScript_170220:: @ 8170220
+	textcolor 0
+	msgbox gUnknown_819F9CC
+	closemessage
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	delay 20
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_170279
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, EventScript_170284
+	compare_var_to_value VAR_0x8008, 3
+	call_if 1, EventScript_17028F
+	compare_var_to_value VAR_0x8008, 4
+	call_if 1, EventScript_17029A
+	msgbox gUnknown_819F95F
+	closemessage
+	applymovement 255, Movement_1702B3
+	waitmovement 0
+	releaseall
+	end
+
+EventScript_170279:: @ 8170279
+	applymovement 255, Movement_1702A5
+	waitmovement 0
+	return
+
+EventScript_170284:: @ 8170284
+	applymovement 255, Movement_1702A7
+	waitmovement 0
+	return
+
+EventScript_17028F:: @ 817028F
+	applymovement 255, Movement_1702AA
+	waitmovement 0
+	return
+
+EventScript_17029A:: @ 817029A
+	applymovement 255, Movement_1702AE
+	waitmovement 0
+	return
+
+Movement_1702A5:: @ 81702A5
+	step_11
+	step_end
+
+Movement_1702A7:: @ 81702A7
+	step_11
+	step_11
+	step_end
+
+Movement_1702AA:: @ 81702AA
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_1702AE:: @ 81702AE
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_1702B3:: @ 81702B3
+	step_13
+	step_end
+
+Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5
+	msgbox gUnknown_819F9E8, 2
+	end
diff --git a/data/maps/Route16_NorthEntrance_1F/text.inc b/data/maps/Route16_NorthEntrance_1F/text.inc
new file mode 100644
index 000000000..8cc60117c
--- /dev/null
+++ b/data/maps/Route16_NorthEntrance_1F/text.inc
@@ -0,0 +1,16 @@
+gUnknown_819F95F:: @ 819F95F
+    .string "No pedestrians are allowed on\n"
+    .string "CYCLING ROAD!$"
+
+gUnknown_819F98B:: @ 819F98B
+    .string "CYCLING ROAD is a downhill course\n"
+    .string "by the sea. It's a great ride.$"
+
+gUnknown_819F9CC:: @ 819F9CC
+    .string "Excuse me!\n"
+    .string "Wait up, please!$"
+
+gUnknown_819F9E8:: @ 819F9E8
+    .string "How'd you get in?\n"
+    .string "Good effort!$"
+
diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json
new file mode 100644
index 000000000..85d1ccccb
--- /dev/null
+++ b/data/maps/Route16_NorthEntrance_2F/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_ROUTE16_NORTH_ENTRANCE_2F",
+  "name": "Route16_NorthEntrance_2F",
+  "layout": "LAYOUT_ENTRANCE_2F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_16",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "16",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_NorthEntrance_2F_EventScript_1702BF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_NorthEntrance_2F_EventScript_1702C8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 10,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_NorthEntrance_2F_EventScript_1702E3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route16_NorthEntrance_2F_EventScript_1702D1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route16_NorthEntrance_2F_EventScript_1702DA"
+    }
+  ]
+}
diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc
new file mode 100644
index 000000000..6fa870c27
--- /dev/null
+++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc
@@ -0,0 +1,54 @@
+Route16_NorthEntrance_2F_MapScripts:: @ 81702BE
+	.byte 0
+
+Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF
+	msgbox gUnknown_819FA07, 2
+	end
+
+Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8
+	msgbox gUnknown_819FA41, 2
+	end
+
+Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1
+	msgbox gUnknown_819FA6F, 3
+	end
+
+Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA
+	msgbox gUnknown_819FAB9, 3
+	end
+
+Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
+	lock
+	faceplayer
+	call EventScript_17036F
+	checkflag FLAG_0x2FD
+	goto_if_eq EventScript_170365
+	msgbox gUnknown_819FB0E, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AD1
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, Special_GetPokedexCount
+	getnumberstring 2, VAR_0x8006
+	call EventScript_17036F
+	compare_var_to_value VAR_0x8006, 40
+	goto_if 0, EventScript_1A7ABD
+	msgbox gUnknown_819FC15
+	checkitemspace ITEM_AMULET_COIN, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AC7
+	additem ITEM_AMULET_COIN, 1
+	giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN
+	setflag FLAG_0x2FD
+	msgbox gUnknown_819FC93
+	release
+	end
+
+EventScript_170365:: @ 8170365
+	msgbox gUnknown_819FC93
+	release
+	end
+
+EventScript_17036F:: @ 817036F
+	getnumberstring 0, 40
+	getitemname 1, ITEM_AMULET_COIN
+	return
diff --git a/data/maps/Route16_NorthEntrance_2F/text.inc b/data/maps/Route16_NorthEntrance_2F/text.inc
new file mode 100644
index 000000000..4839bfe8a
--- /dev/null
+++ b/data/maps/Route16_NorthEntrance_2F/text.inc
@@ -0,0 +1,47 @@
+gUnknown_819FA07:: @ 819FA07
+    .string "I'm on a relaxing ride on my new\n"
+    .string "bike with my girlfriend.$"
+
+gUnknown_819FA41:: @ 819FA41
+    .string "We're going riding together on our\n"
+    .string "new bikes.$"
+
+gUnknown_819FA6F:: @ 819FA6F
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "It's the CELADON DEPT. STORE!$"
+
+gUnknown_819FAB9:: @ 819FAB9
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "There's a long path over water far\n"
+    .string "away.$"
+
+gUnknown_819FB0E:: @ 819FB0E
+    .string "Hi! Remember me?\n"
+    .string "I'm one of PROF. OAK's AIDES.\p"
+    .string "If your POKéDEX has complete data\n"
+    .string "on 40 species, I'm supposed to\l"
+    .string "give you a reward.\p"
+    .string "PROF. OAK entrusted me with an\n"
+    .string "AMULET COIN for you.\p"
+    .string "So, {PLAYER}, let me ask you.\p"
+    .string "Have you gathered data on at least\n"
+    .string "40 kinds of POKéMON?$"
+
+gUnknown_819FC15:: @ 819FC15
+    .string "Great! You have caught or owned\n"
+    .string "{STR_VAR_3} kinds of POKéMON!\p"
+    .string "Congratulations!\n"
+    .string "Here you go!$"
+
+gUnknown_819FC68:: @ 819FC68
+    .string "{PLAYER} received the AMULET COIN\n"
+    .string "from the AIDE.$"
+
+gUnknown_819FC93:: @ 819FC93
+    .string "An AMULET COIN is an item to be\n"
+    .string "held by a POKéMON.\p"
+    .string "If the POKéMON appears in a winning\n"
+    .string "battle, you will earn more money.$"
+
diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json
new file mode 100644
index 000000000..f51773f86
--- /dev/null
+++ b/data/maps/Route17/map.json
@@ -0,0 +1,249 @@
+{
+  "id": "MAP_ROUTE17",
+  "name": "Route17",
+  "layout": "LAYOUT_ROUTE17",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_17",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE16",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE18",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "53",
+      "x": 4,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "26",
+      "movement_range_x": 1,
+      "movement_range_y": 6,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route17_EventScript_1AB319",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "26",
+      "movement_range_x": 1,
+      "movement_range_y": 5,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route17_EventScript_1AB221",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 15,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "52",
+      "movement_range_x": 4,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route17_EventScript_1AB1E3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 18,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "26",
+      "movement_range_x": 1,
+      "movement_range_y": 5,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route17_EventScript_1AB129",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 7,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route17_EventScript_1AB0EB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 2,
+      "y": 61,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route17_EventScript_1AB29D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 21,
+      "y": 61,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route17_EventScript_1AB25F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 18,
+      "y": 94,
+      "elevation": 3,
+      "movement_type": "26",
+      "movement_range_x": 1,
+      "movement_range_y": 5,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route17_EventScript_1AB2DB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 16,
+      "y": 134,
+      "elevation": 3,
+      "movement_type": "47",
+      "movement_range_x": 8,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route17_EventScript_1AB1A5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 4,
+      "y": 116,
+      "elevation": 3,
+      "movement_type": "26",
+      "movement_range_x": 1,
+      "movement_range_y": 5,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route17_EventScript_1AB167",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 97,
+      "elevation": 0,
+      "script": "Route17_EventScript_1681DB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 83,
+      "elevation": 0,
+      "script": "Route17_EventScript_1681D2"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 68,
+      "elevation": 0,
+      "script": "Route17_EventScript_1681C9"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 53,
+      "elevation": 0,
+      "script": "Route17_EventScript_1681C0"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 125,
+      "elevation": 3,
+      "script": "Route17_EventScript_1681E4"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 157,
+      "elevation": 0,
+      "script": "Route17_EventScript_1681ED"
+    },
+    {
+      "type": "hidden_item",
+      "x": 18,
+      "y": 83,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "17",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 10,
+      "y": 53,
+      "elevation": 3,
+      "item": "ITEM_FULL_RESTORE",
+      "flag": "18",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 4,
+      "y": 68,
+      "elevation": 3,
+      "item": "ITEM_PP_UP",
+      "flag": "19",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 4,
+      "y": 125,
+      "elevation": 3,
+      "item": "ITEM_MAX_REVIVE",
+      "flag": "20",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 157,
+      "elevation": 3,
+      "item": "ITEM_MAX_ELIXIR",
+      "flag": "21",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc
new file mode 100644
index 000000000..12d99102a
--- /dev/null
+++ b/data/maps/Route17/scripts.inc
@@ -0,0 +1,26 @@
+Route17_MapScripts:: @ 81681BF
+	.byte 0
+
+Route17_EventScript_1681C0:: @ 81681C0
+	msgbox gUnknown_81874E4, 3
+	end
+
+Route17_EventScript_1681C9:: @ 81681C9
+	msgbox gUnknown_8187512, 3
+	end
+
+Route17_EventScript_1681D2:: @ 81681D2
+	msgbox gUnknown_818757B, 3
+	end
+
+Route17_EventScript_1681DB:: @ 81681DB
+	msgbox gUnknown_81875BE, 3
+	end
+
+Route17_EventScript_1681E4:: @ 81681E4
+	msgbox gUnknown_81875E3, 3
+	end
+
+Route17_EventScript_1681ED:: @ 81681ED
+	msgbox gUnknown_8187622, 3
+	end
diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc
new file mode 100644
index 000000000..6627d5cd0
--- /dev/null
+++ b/data/maps/Route17/text.inc
@@ -0,0 +1,165 @@
+Text_186FBD:: @ 8186FBD
+    .string "JED: Our love knows no bounds.\n"
+    .string "We're in love and we show it!$"
+
+Text_186FFA:: @ 8186FFA
+    .string "JED: Oh, no!\n"
+    .string "My love has seen me as a loser!$"
+
+Text_187027:: @ 8187027
+    .string "JED: Listen, LEA.\n"
+    .string "You need to focus less on me.$"
+
+Text_187057:: @ 8187057
+    .string "JED: You have just one POKéMON?\n"
+    .string "Is there no love in your heart?$"
+
+Text_187097:: @ 8187097
+    .string "LEA: Sometimes, the intensity of\n"
+    .string "our love scares me.$"
+
+Text_1870CC:: @ 81870CC
+    .string "LEA: Ohh! But JED looks cool\n"
+    .string "even in a loss!$"
+
+Text_1870F9:: @ 81870F9
+    .string "LEA: Ehehe, I'm sorry.\n"
+    .string "JED is so cool.$"
+
+Text_187120:: @ 8187120
+    .string "LEA: Oh, you don't have two\n"
+    .string "POKéMON with you?\p"
+    .string "Doesn't it feel lonely for you or\n"
+    .string "your POKéMON?$"
+
+Text_18717E:: @ 818717E
+    .string "There's no getting rich quick in\n"
+    .string "battling kids.$"
+
+Text_1871AE:: @ 81871AE
+    .string "Burned out!$"
+
+Text_1871BA:: @ 81871BA
+    .string "You can find good stuff lying\n"
+    .string "around on CYCLING ROAD.\p"
+    .string "There's good money in picking them\n"
+    .string "up and selling them.$"
+
+Text_187228:: @ 8187228
+    .string "I'm mighty proud of my bod, kiddo.\n"
+    .string "Come on!$"
+
+Text_187254:: @ 8187254
+    .string "Whoo!$"
+
+Text_18725A:: @ 818725A
+    .string "I could belly-bump you outta\n"
+    .string "here!$"
+
+Text_18727D:: @ 818727D
+    .string "You heading to FUCHSIA?$"
+
+Text_187295:: @ 8187295
+    .string "Crash and burn!$"
+
+Text_1872A5:: @ 81872A5
+    .string "I love racing downhill!$"
+
+Text_1872BD:: @ 81872BD
+    .string "We're BIKERS!\n"
+    .string "We rule the roads, man!$"
+
+Text_1872E3:: @ 81872E3
+    .string "Smoked!$"
+
+Text_1872EB:: @ 81872EB
+    .string "Are you looking for adventure?$"
+
+Text_18730A:: @ 818730A
+    .string "Let VOLTORB electrify you!$"
+
+Text_187325:: @ 8187325
+    .string "Grounded out!$"
+
+Text_187333:: @ 8187333
+    .string "I got my VOLTORB at the abandoned\n"
+    .string "POWER PLANT.$"
+
+Text_187362:: @ 8187362
+    .string "I leveled up my POKéMON, but it\n"
+    .string "won't evolve. Why?$"
+
+Text_187395:: @ 8187395
+    .string "Why, you!$"
+
+Text_18739F:: @ 818739F
+    .string "Maybe some POKéMON need element\n"
+    .string "STONES to evolve.$"
+
+Text_1873D1:: @ 81873D1
+    .string "I need a little exercise!$"
+
+Text_1873EB:: @ 81873EB
+    .string "Whew!\n"
+    .string "Good workout!$"
+
+Text_1873FF:: @ 81873FF
+    .string "I'm sure I lost weight there!$"
+
+Text_18741D:: @ 818741D
+    .string "Be a rebel!$"
+
+Text_187429:: @ 8187429
+    .string "Aaaargh!$"
+
+Text_187432:: @ 8187432
+    .string "Be ready to fight for your beliefs!$"
+
+Text_187456:: @ 8187456
+    .string "Nice BIKE!\n"
+    .string "How's it handle?$"
+
+Text_187472:: @ 8187472
+    .string "Shoot!$"
+
+Text_187479:: @ 8187479
+    .string "The slope makes it hard to steer.$"
+
+Text_18749B:: @ 818749B
+    .string "Get lost, kid!\n"
+    .string "I'm bushed!$"
+
+Text_1874B6:: @ 81874B6
+    .string "Are you satisfied?$"
+
+Text_1874C9:: @ 81874C9
+    .string "I need to catch a few z's!$"
+
+gUnknown_81874E4:: @ 81874E4
+    .string "It's a notice.\p"
+    .string "Watch out for discarded items.$"
+
+gUnknown_8187512:: @ 8187512
+    .string "TRAINER TIPS\p"
+    .string "All POKéMON are unique.\p"
+    .string "Even POKéMON of the same species\n"
+    .string "and level grow at different rates.$"
+
+gUnknown_818757B:: @ 818757B
+    .string "TRAINER TIPS\p"
+    .string "Press the B Button to stay in place\n"
+    .string "while on a slope.$"
+
+gUnknown_81875BE:: @ 81875BE
+    .string "ROUTE 17\n"
+    .string "CELADON CITY - FUCHSIA CITY$"
+
+gUnknown_81875E3:: @ 81875E3
+    .string "It's a notice!\p"
+    .string "Don't throw the game, throw POKé\n"
+    .string "BALLS instead!$"
+
+gUnknown_8187622:: @ 8187622
+    .string "CYCLING ROAD\n"
+    .string "Slope ends here!$"
+
diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json
new file mode 100644
index 000000000..f18809806
--- /dev/null
+++ b/data/maps/Route18/map.json
@@ -0,0 +1,100 @@
+{
+  "id": "MAP_ROUTE18",
+  "name": "Route18",
+  "layout": "LAYOUT_ROUTE18",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_18",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE17",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_FUCHSIA_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "26",
+      "x": 46,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route18_EventScript_1AB3D3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 41,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route18_EventScript_1AB395",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 39,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 6,
+      "script": "Route18_EventScript_1AB357",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 41,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 48,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 37,
+      "y": 7,
+      "elevation": 0,
+      "script": "Route18_EventScript_168228"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 52,
+      "y": 7,
+      "elevation": 0,
+      "script": "Route18_EventScript_16821F"
+    }
+  ]
+}
diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc
new file mode 100644
index 000000000..548fdeeb6
--- /dev/null
+++ b/data/maps/Route18/scripts.inc
@@ -0,0 +1,29 @@
+Route18_MapScripts:: @ 81681F6
+	map_script 3, Route18_MapScript1_168201
+	map_script 4, Route18_MapScript2_168211
+	.byte 0
+
+Route18_MapScript1_168201:: @ 8168201
+	compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1
+	call_if 1, EventScript_16820D
+	end
+
+EventScript_16820D:: @ 816820D
+	setflag FLAG_0x830
+	return
+
+Route18_MapScript2_168211:: @ 8168211
+	map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B
+	.2byte 0
+
+EventScript_16821B:: @ 816821B
+	special sub_80CA630
+	end
+
+Route18_EventScript_16821F:: @ 816821F
+	msgbox gUnknown_8187757, 3
+	end
+
+Route18_EventScript_168228:: @ 8168228
+	msgbox gUnknown_818777C, 3
+	end
diff --git a/data/maps/Route18/text.inc b/data/maps/Route18/text.inc
new file mode 100644
index 000000000..c22a6360a
--- /dev/null
+++ b/data/maps/Route18/text.inc
@@ -0,0 +1,40 @@
+Text_187640:: @ 8187640
+    .string "I always check every grassy area\n"
+    .string "for new POKéMON.$"
+
+Text_187672:: @ 8187672
+    .string "Tch!$"
+
+Text_187677:: @ 8187677
+    .string "I wish I had a BIKE!$"
+
+Text_18768C:: @ 818768C
+    .string "Kurukkoo!\n"
+    .string "How do you like my birdcall?$"
+
+Text_1876B3:: @ 81876B3
+    .string "I had to bug you!$"
+
+Text_1876C5:: @ 81876C5
+    .string "I collect sea POKéMON on weekends\n"
+    .string "because the sea is so close.$"
+
+Text_187704:: @ 8187704
+    .string "This is my turf!\n"
+    .string "Get out of here!$"
+
+Text_187726:: @ 8187726
+    .string "Darn!$"
+
+Text_18772C:: @ 818772C
+    .string "This is my fave area for catching\n"
+    .string "POKéMON.$"
+
+gUnknown_8187757:: @ 8187757
+    .string "ROUTE 18\n"
+    .string "CELADON CITY - FUCHSIA CITY$"
+
+gUnknown_818777C:: @ 818777C
+    .string "CYCLING ROAD\n"
+    .string "No pedestrians permitted!$"
+
diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json
new file mode 100644
index 000000000..1342a562e
--- /dev/null
+++ b/data/maps/Route18_EastEntrance_1F/map.json
@@ -0,0 +1,155 @@
+{
+  "id": "MAP_ROUTE18_EAST_ENTRANCE_1F",
+  "name": "Route18_EastEntrance_1F",
+  "layout": "LAYOUT_ENTRANCE_1F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_18",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_170391",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE18",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE18",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_17039A"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_1703A6"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_1703B2"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_1703BE"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_1703CA"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 1,
+      "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 1,
+      "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 1,
+      "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_MAP_SCENE_ROUTE16",
+      "var_value": 0,
+      "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc
new file mode 100644
index 000000000..70a8d196b
--- /dev/null
+++ b/data/maps/Route18_EastEntrance_1F/scripts.inc
@@ -0,0 +1,115 @@
+Route18_EastEntrance_1F_MapScripts:: @ 8170378
+	map_script 3, Route18_EastEntrance_1F_MapScript1_17037E
+	.byte 0
+
+Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E
+	clearflag FLAG_0x830
+	checkflag FLAG_0x271
+	call_if 1, EventScript_17038B
+	end
+
+EventScript_17038B:: @ 817038B
+	setvar VAR_0x4001, 1
+	return
+
+Route18_EastEntrance_1F_EventScript_170391:: @ 8170391
+	msgbox gUnknown_819FD3A, 2
+	end
+
+Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A
+	lockall
+	setvar VAR_0x8008, 0
+	goto EventScript_1703D6
+	end
+
+Route18_EastEntrance_1F_EventScript_1703A6:: @ 81703A6
+	lockall
+	setvar VAR_0x8008, 1
+	goto EventScript_1703D6
+	end
+
+Route18_EastEntrance_1F_EventScript_1703B2:: @ 81703B2
+	lockall
+	setvar VAR_0x8008, 2
+	goto EventScript_1703D6
+	end
+
+Route18_EastEntrance_1F_EventScript_1703BE:: @ 81703BE
+	lockall
+	setvar VAR_0x8008, 3
+	goto EventScript_1703D6
+	end
+
+Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA
+	lockall
+	setvar VAR_0x8008, 4
+	goto EventScript_1703D6
+	end
+
+EventScript_1703D6:: @ 81703D6
+	textcolor 0
+	msgbox gUnknown_819FD60
+	closemessage
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	delay 20
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_17042F
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, EventScript_17043A
+	compare_var_to_value VAR_0x8008, 3
+	call_if 1, EventScript_170445
+	compare_var_to_value VAR_0x8008, 4
+	call_if 1, EventScript_170450
+	msgbox gUnknown_819FD0C
+	closemessage
+	applymovement 255, Movement_170469
+	waitmovement 0
+	releaseall
+	end
+
+EventScript_17042F:: @ 817042F
+	applymovement 255, Movement_17045B
+	waitmovement 0
+	return
+
+EventScript_17043A:: @ 817043A
+	applymovement 255, Movement_17045D
+	waitmovement 0
+	return
+
+EventScript_170445:: @ 8170445
+	applymovement 255, Movement_170460
+	waitmovement 0
+	return
+
+EventScript_170450:: @ 8170450
+	applymovement 255, Movement_170464
+	waitmovement 0
+	return
+
+Movement_17045B:: @ 817045B
+	step_11
+	step_end
+
+Movement_17045D:: @ 817045D
+	step_11
+	step_11
+	step_end
+
+Movement_170460:: @ 8170460
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_170464:: @ 8170464
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_170469:: @ 8170469
+	step_13
+	step_end
diff --git a/data/maps/Route18_EastEntrance_1F/text.inc b/data/maps/Route18_EastEntrance_1F/text.inc
new file mode 100644
index 000000000..5de293cba
--- /dev/null
+++ b/data/maps/Route18_EastEntrance_1F/text.inc
@@ -0,0 +1,11 @@
+gUnknown_819FD0C:: @ 819FD0C
+    .string "You need a BICYCLE to go out on\n"
+    .string "CYCLING ROAD!$"
+
+gUnknown_819FD3A:: @ 819FD3A
+    .string "CYCLING ROAD is all uphill from\n"
+    .string "here.$"
+
+gUnknown_819FD60:: @ 819FD60
+    .string "Excuse me!$"
+
diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json
new file mode 100644
index 000000000..c8be7d1e5
--- /dev/null
+++ b/data/maps/Route18_EastEntrance_2F/map.json
@@ -0,0 +1,56 @@
+{
+  "id": "MAP_ROUTE18_EAST_ENTRANCE_2F",
+  "name": "Route18_EastEntrance_2F",
+  "layout": "LAYOUT_ENTRANCE_2F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_18",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "19",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route18_EastEntrance_2F_EventScript_17047E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route18_EastEntrance_2F_EventScript_17046C"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "Route18_EastEntrance_2F_EventScript_170475"
+    }
+  ]
+}
diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc
new file mode 100644
index 000000000..204a0f879
--- /dev/null
+++ b/data/maps/Route18_EastEntrance_2F/scripts.inc
@@ -0,0 +1,48 @@
+Route18_EastEntrance_2F_MapScripts:: @ 817046B
+	.byte 0
+
+Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C
+	msgbox gUnknown_819FD6B, 3
+	end
+
+Route18_EastEntrance_2F_EventScript_170475:: @ 8170475
+	msgbox gUnknown_819FDB3, 3
+	end
+
+Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
+	lock
+	faceplayer
+	setvar VAR_0x8008, 5
+	call EventScript_1A8CAD
+	checkflag FLAG_0x257
+	goto_if_eq EventScript_1704F0
+	msgbox gUnknown_81A597B, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1704D8
+	call EventScript_1A8CBD
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_1704D8
+	call EventScript_1A8CC9
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_1704E2
+	call EventScript_1A8CD9
+	msgbox gUnknown_81A59DA
+	setflag FLAG_0x257
+	release
+	end
+
+EventScript_1704D8:: @ 81704D8
+	msgbox gUnknown_81A59B6
+	release
+	end
+
+EventScript_1704E2:: @ 81704E2
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_81A59C6
+	release
+	end
+
+EventScript_1704F0:: @ 81704F0
+	msgbox gUnknown_81A59E7
+	release
+	end
diff --git a/data/maps/Route18_EastEntrance_2F/text.inc b/data/maps/Route18_EastEntrance_2F/text.inc
new file mode 100644
index 000000000..8a479371c
--- /dev/null
+++ b/data/maps/Route18_EastEntrance_2F/text.inc
@@ -0,0 +1,10 @@
+gUnknown_819FD6B:: @ 819FD6B
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "PALLET TOWN is in the west.$"
+
+gUnknown_819FDB3:: @ 819FDB3
+    .string "Let's see what the binoculars have\n"
+    .string "to show…\p"
+    .string "There are people swimming.$"
+
diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json
new file mode 100644
index 000000000..afa7b3b03
--- /dev/null
+++ b/data/maps/Route19/map.json
@@ -0,0 +1,195 @@
+{
+  "id": "MAP_ROUTE19",
+  "name": "Route19",
+  "layout": "LAYOUT_ROUTE19",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_19",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_FUCHSIA_CITY",
+      "offset": -12,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE20",
+      "offset": 40,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "45",
+      "x": 15,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 6,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route19_EventScript_1AB44F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "45",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route19_EventScript_1AB411",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 12,
+      "y": 17,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route19_EventScript_1AB547",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 18,
+      "y": 33,
+      "elevation": 1,
+      "movement_type": "51",
+      "movement_range_x": 5,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route19_EventScript_1AB48D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 8,
+      "y": 27,
+      "elevation": 1,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route19_EventScript_1AB4CB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 16,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 6,
+      "script": "Route19_EventScript_1AB509",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 11,
+      "y": 47,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route19_EventScript_1AB585",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 14,
+      "y": 48,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route19_EventScript_1AB601",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 12,
+      "y": 49,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route19_EventScript_1AB63F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 9,
+      "y": 48,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route19_EventScript_1AB5C3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 8,
+      "y": 41,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route19_EventScript_1AB67D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "36",
+      "x": 9,
+      "y": 41,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route19_EventScript_1AB6C3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 12,
+      "elevation": 0,
+      "script": "Route19_EventScript_168232"
+    }
+  ]
+}
diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc
new file mode 100644
index 000000000..28a71830d
--- /dev/null
+++ b/data/maps/Route19/scripts.inc
@@ -0,0 +1,6 @@
+Route19_MapScripts:: @ 8168231
+	.byte 0
+
+Route19_EventScript_168232:: @ 8168232
+	msgbox gUnknown_8187C06, 3
+	end
diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc
new file mode 100644
index 000000000..a76ff89d7
--- /dev/null
+++ b/data/maps/Route19/text.inc
@@ -0,0 +1,119 @@
+Text_1877A3:: @ 81877A3
+    .string "I have to exercise and warm up\n"
+    .string "before going out for a swim.$"
+
+Text_1877DF:: @ 81877DF
+    .string "All warmed up!$"
+
+Text_1877EE:: @ 81877EE
+    .string "Thanks, kid!\n"
+    .string "I'm ready for a swim.$"
+
+Text_187811:: @ 8187811
+    .string "Wait! Slow down!\n"
+    .string "You'll have a heart attack!$"
+
+Text_18783E:: @ 818783E
+    .string "Ooh!\n"
+    .string "That's chilly!$"
+
+Text_187852:: @ 8187852
+    .string "Watch out for TENTACOOL.\n"
+    .string "They sting so painfully.$"
+
+Text_187884:: @ 8187884
+    .string "I love swimming!\n"
+    .string "What about you?$"
+
+Text_1878A5:: @ 81878A5
+    .string "Belly flop!$"
+
+Text_1878B1:: @ 81878B1
+    .string "I can beat even marine POKéMON\n"
+    .string "at swimming.$"
+
+Text_1878DD:: @ 81878DD
+    .string "What's beyond the horizon?$"
+
+Text_1878F8:: @ 81878F8
+    .string "Glub!$"
+
+Text_1878FE:: @ 81878FE
+    .string "I see a couple of islands over\n"
+    .string "yonder!$"
+
+Text_187925:: @ 8187925
+    .string "I tried diving for POKéMON, but it\n"
+    .string "was a no-go.$"
+
+Text_187955:: @ 8187955
+    .string "Help!$"
+
+Text_18795B:: @ 818795B
+    .string "I guess you have to fish for sea\n"
+    .string "POKéMON.$"
+
+Text_187985:: @ 8187985
+    .string "I look at the sea to forget all\n"
+    .string "the bad things that happened.$"
+
+Text_1879C3:: @ 81879C3
+    .string "Ooh!\n"
+    .string "Traumatic!$"
+
+Text_1879D3:: @ 81879D3
+    .string "I'm looking at the sea to forget\n"
+    .string "the bad thing that happened!$"
+
+Text_187A11:: @ 8187A11
+    .string "Oh, I just love your ride!\n"
+    .string "Can I have it if I win?$"
+
+Text_187A44:: @ 8187A44
+    .string "Oh! I lost!$"
+
+Text_187A50:: @ 8187A50
+    .string "It's still a long way to go to\n"
+    .string "SEAFOAM ISLANDS…\p"
+    .string "I want to go back to FUCHSIA…$"
+
+Text_187A9E:: @ 8187A9E
+    .string "Swimming's great!\n"
+    .string "Sunburns aren't!$"
+
+Text_187AC1:: @ 8187AC1
+    .string "Shocker!$"
+
+Text_187ACA:: @ 8187ACA
+    .string "My boyfriend wanted to swim to\n"
+    .string "SEAFOAM ISLANDS.$"
+
+Text_187AFA:: @ 8187AFA
+    .string "Ahoy, there!\n"
+    .string "These waters are treacherous!$"
+
+Text_187B25:: @ 8187B25
+    .string "Ooh!\n"
+    .string "Dangerous!$"
+
+Text_187B35:: @ 8187B35
+    .string "M-my legs! They cramped up!\n"
+    .string "Glub, glub…$"
+
+Text_187B5D:: @ 8187B5D
+    .string "I swam here with my friends…\n"
+    .string "I'm tired…$"
+
+Text_187B85:: @ 8187B85
+    .string "I'm exhausted…$"
+
+Text_187B94:: @ 8187B94
+    .string "If I were to ride a POKéMON on\n"
+    .string "the sea, I'd like a LAPRAS.\p"
+    .string "LAPRAS is so big, I bet it\n"
+    .string "would keep me dry on water.$"
+
+gUnknown_8187C06:: @ 8187C06
+    .string "SEA ROUTE 19\n"
+    .string "FUCHSIA CITY - SEAFOAM ISLANDS$"
+
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
new file mode 100644
index 000000000..92a7b66e8
--- /dev/null
+++ b/data/maps/Route2/map.json
@@ -0,0 +1,208 @@
+{
+  "id": "MAP_ROUTE2",
+  "name": "Route2",
+  "layout": "LAYOUT_ROUTE2",
+  "music": "BGM_FRLG_ROUTE_1",
+  "region_map_section": "MAPSEC_ROUTE_2",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_PEWTER_CITY",
+      "offset": -12,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_VIRIDIAN_CITY",
+      "offset": -12,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "95",
+      "x": 16,
+      "y": 62,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BDF13",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "95",
+      "x": 15,
+      "y": 69,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "95",
+      "x": 11,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BDF13",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "95",
+      "x": 18,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BDF13",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 54,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BE58E",
+      "flag": "340"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 64,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BE59B",
+      "flag": "341"
+    },
+    {
+      "graphics_id": "65375",
+      "x": 6,
+      "y": 85,
+      "elevation": 8,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 51,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 17,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 17,
+      "y": 22,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2_HOUSE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 18,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_EAST_BUILDING",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 18,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_EAST_BUILDING",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 19,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_EAST_BUILDING",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 19,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_EAST_BUILDING",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 51,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 12,
+      "elevation": 0,
+      "script": "Route2_EventScript_167F6E"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 73,
+      "elevation": 0,
+      "script": "Route2_EventScript_167F65"
+    }
+  ]
+}
diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc
new file mode 100644
index 000000000..67ba5729e
--- /dev/null
+++ b/data/maps/Route2/scripts.inc
@@ -0,0 +1,10 @@
+Route2_MapScripts:: @ 8167F64
+	.byte 0
+
+Route2_EventScript_167F65:: @ 8167F65
+	msgbox gUnknown_818345E, 3
+	end
+
+Route2_EventScript_167F6E:: @ 8167F6E
+	msgbox gUnknown_8183482, 3
+	end
diff --git a/data/maps/Route2/text.inc b/data/maps/Route2/text.inc
new file mode 100644
index 000000000..4197b7071
--- /dev/null
+++ b/data/maps/Route2/text.inc
@@ -0,0 +1,7 @@
+gUnknown_818345E:: @ 818345E
+    .string "ROUTE 2\n"
+    .string "VIRIDIAN CITY - PEWTER CITY$"
+
+gUnknown_8183482:: @ 8183482
+    .string "DIGLETT'S CAVE$"
+
diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json
new file mode 100644
index 000000000..86db038c8
--- /dev/null
+++ b/data/maps/Route20/map.json
@@ -0,0 +1,213 @@
+{
+  "id": "MAP_ROUTE20",
+  "name": "Route20",
+  "layout": "LAYOUT_ROUTE20",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_20",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_CINNABAR_ISLAND",
+      "offset": 0,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE19",
+      "offset": -40,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "44",
+      "x": 8,
+      "y": 11,
+      "elevation": 1,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route20_EventScript_1AB83F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 16,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route20_EventScript_1AB8F9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 34,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route20_EventScript_1AB801",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 43,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route20_EventScript_1AB8BB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 23,
+      "y": 10,
+      "elevation": 1,
+      "movement_type": "52",
+      "movement_range_x": 5,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route20_EventScript_1AB747",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 73,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route20_EventScript_1AB937",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 111,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "45",
+      "movement_range_x": 5,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route20_EventScript_1AB709",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 106,
+      "y": 11,
+      "elevation": 1,
+      "movement_type": "50",
+      "movement_range_x": 5,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route20_EventScript_1AB785",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 93,
+      "y": 10,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route20_EventScript_1AB87D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 54,
+      "y": 11,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route20_EventScript_1AB7C3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 69,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route20_EventScript_1ACE36",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 60,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 72,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 68,
+      "y": 14,
+      "elevation": 0,
+      "script": "Route20_EventScript_168280"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 64,
+      "y": 8,
+      "elevation": 0,
+      "script": "Route20_EventScript_168280"
+    },
+    {
+      "type": "hidden_item",
+      "x": 23,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_STARDUST",
+      "flag": "153",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc
new file mode 100644
index 000000000..d99bebdd7
--- /dev/null
+++ b/data/maps/Route20/scripts.inc
@@ -0,0 +1,34 @@
+Route20_MapScripts:: @ 816823B
+	map_script 3, Route20_MapScript1_168241
+	.byte 0
+
+Route20_MapScript1_168241:: @ 8168241
+	checkflag FLAG_0x2D2
+	call_if 0, EventScript_168254
+	checkflag FLAG_0x2D3
+	call_if 0, EventScript_16826D
+	end
+
+EventScript_168254:: @ 8168254
+	clearflag FLAG_0x040
+	clearflag FLAG_0x041
+	setflag FLAG_0x042
+	setflag FLAG_0x043
+	setflag FLAG_0x044
+	setflag FLAG_0x045
+	setflag FLAG_0x046
+	setflag FLAG_0x047
+	return
+
+EventScript_16826D:: @ 816826D
+	clearflag FLAG_0x048
+	clearflag FLAG_0x049
+	clearflag FLAG_0x04A
+	clearflag FLAG_0x04B
+	setflag FLAG_0x04C
+	setflag FLAG_0x04D
+	return
+
+Route20_EventScript_168280:: @ 8168280
+	msgbox gUnknown_81882D1, 3
+	end
diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc
new file mode 100644
index 000000000..070575cc7
--- /dev/null
+++ b/data/maps/Route20/text.inc
@@ -0,0 +1,151 @@
+Text_187C32:: @ 8187C32
+    .string "LIA: I'm looking after my brother.\n"
+    .string "He just became a TRAINER.$"
+
+Text_187C6F:: @ 8187C6F
+    .string "LIA: That's no way to treat my\n"
+    .string "little brother!$"
+
+Text_187C9E:: @ 8187C9E
+    .string "LIA: Do you have a younger\n"
+    .string "brother?\p"
+    .string "I hope you're teaching him all\n"
+    .string "sorts of things.$"
+
+Text_187CF2:: @ 8187CF2
+    .string "LIA: I want to battle together\n"
+    .string "with my little brother.\p"
+    .string "Don't you have two POKéMON?$"
+
+Text_187D45:: @ 8187D45
+    .string "LUC: My big sis taught me how\n"
+    .string "to swim and train POKéMON.$"
+
+Text_187D7E:: @ 8187D7E
+    .string "LUC: Oh, wow!\n"
+    .string "Someone tougher than my big sis!$"
+
+Text_187DAD:: @ 8187DAD
+    .string "LUC: My big sis is strong and nice.\n"
+    .string "I think she's awesome!$"
+
+Text_187DE8:: @ 8187DE8
+    .string "LUC: I don't want to if I can't\n"
+    .string "battle you with my big sis.\p"
+    .string "Don't you have two POKéMON?$"
+
+Text_187E40:: @ 8187E40
+    .string "The water is shallow here.\n"
+    .string "There are many people swimming.$"
+
+Text_187E7B:: @ 8187E7B
+    .string "Splash!$"
+
+Text_187E83:: @ 8187E83
+    .string "I wish I could ride my POKéMON.\n"
+    .string "I bet you're not tired.$"
+
+Text_187EBB:: @ 8187EBB
+    .string "SEAFOAM is a quiet getaway.\n"
+    .string "I'm vacationing here.$"
+
+Text_187EED:: @ 8187EED
+    .string "Quit it!$"
+
+Text_187EF6:: @ 8187EF6
+    .string "There's a huge cavern underneath\n"
+    .string "this island.$"
+
+Text_187F24:: @ 8187F24
+    .string "I love floating with the fishes\n"
+    .string "here among the waves.$"
+
+Text_187F5A:: @ 8187F5A
+    .string "Yowch!$"
+
+Text_187F61:: @ 8187F61
+    .string "Want to float with me?$"
+
+Text_187F78:: @ 8187F78
+    .string "Are you on vacation, too?$"
+
+Text_187F92:: @ 8187F92
+    .string "No mercy at all!$"
+
+Text_187FA3:: @ 8187FA3
+    .string "SEAFOAM used to be a single island\n"
+    .string "in the distant past.$"
+
+Text_187FDB:: @ 8187FDB
+    .string "Check out my buff physique!$"
+
+Text_187FF7:: @ 8187FF7
+    .string "Wimpy!$"
+
+Text_187FFE:: @ 8187FFE
+    .string "I should've been buffing up my\n"
+    .string "POKéMON, not me!$"
+
+Text_18802E:: @ 818802E
+    .string "Why are you riding a POKéMON?\n"
+    .string "Can't you swim?$"
+
+Text_18805C:: @ 818805C
+    .string "Ouch!\n"
+    .string "Torpedoed!$"
+
+Text_18806D:: @ 818806D
+    .string "Riding a POKéMON sure looks fun!$"
+
+Text_18808E:: @ 818808E
+    .string "I rode my bird POKéMON here.$"
+
+Text_1880AB:: @ 81880AB
+    .string "Oh, no!\n"
+    .string "Now what am I to do?$"
+
+Text_1880C8:: @ 81880C8
+    .string "My birds are exhausted.\n"
+    .string "They can't FLY me back!$"
+
+Text_1880F8:: @ 81880F8
+    .string "My boyfriend gave me big pearls.$"
+
+Text_188119:: @ 8188119
+    .string "Oh, no!\n"
+    .string "My pearls were in them!$"
+
+Text_188139:: @ 8188139
+    .string "Will my pearls grow bigger inside\n"
+    .string "CLOYSTER?$"
+
+Text_188165:: @ 8188165
+    .string "I swam here from CINNABAR ISLAND.\n"
+    .string "It wasn't easy, I tell you.$"
+
+Text_1881A3:: @ 81881A3
+    .string "I'm so disappointed!$"
+
+Text_1881B8:: @ 81881B8
+    .string "POKéMON have taken over an\n"
+    .string "abandoned mansion on CINNABAR.\p"
+    .string "They call it the POKéMON MANSION\n"
+    .string "now.$"
+
+Text_188218:: @ 8188218
+    .string "CINNABAR, in the west, has a LAB\n"
+    .string "for POKéMON.\p"
+    .string "My daddy works there.$"
+
+Text_18825C:: @ 818825C
+    .string "Wait!\n"
+    .string "You're supposed to wait!$"
+
+Text_18827B:: @ 818827B
+    .string "CINNABAR is a volcanic island.\p"
+    .string "I heard it rose out of the sea\n"
+    .string "when a volcano erupted.$"
+
+gUnknown_81882D1:: @ 81882D1
+    .string "SEAFOAM ISLANDS$"
+
diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json
new file mode 100644
index 000000000..1a5a65b84
--- /dev/null
+++ b/data/maps/Route21_North/map.json
@@ -0,0 +1,119 @@
+{
+  "id": "MAP_ROUTE21_NORTH",
+  "name": "Route21_North",
+  "layout": "LAYOUT_ROUTE21_NORTH",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_21",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_PALLET_TOWN",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE21_SOUTH",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 7,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route21_North_EventScript_1AB975",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 16,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route21_North_EventScript_1AB9F1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 12,
+      "y": 44,
+      "elevation": 1,
+      "movement_type": "51",
+      "movement_range_x": 4,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route21_North_EventScript_1ABA6D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 14,
+      "y": 35,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route21_North_EventScript_1ABB65",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "36",
+      "x": 15,
+      "y": 35,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route21_North_EventScript_1ABBAB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65307",
+      "x": 13,
+      "y": 65533,
+      "elevation": 2,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 17,
+      "y": 42,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "154",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route21_North/scripts.inc b/data/maps/Route21_North/scripts.inc
new file mode 100644
index 000000000..473a8ac59
--- /dev/null
+++ b/data/maps/Route21_North/scripts.inc
@@ -0,0 +1,2 @@
+Route21_North_MapScripts:: @ 8168289
+	.byte 0
diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json
new file mode 100644
index 000000000..324dd7ea0
--- /dev/null
+++ b/data/maps/Route21_South/map.json
@@ -0,0 +1,96 @@
+{
+  "id": "MAP_ROUTE21_SOUTH",
+  "name": "Route21_South",
+  "layout": "LAYOUT_ROUTE21_SOUTH",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_21",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE21_NORTH",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_CINNABAR_ISLAND",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route21_South_EventScript_1AB9B3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 14,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route21_South_EventScript_1ABA2F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 15,
+      "y": 24,
+      "elevation": 1,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route21_South_EventScript_1ABAAB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 15,
+      "y": 38,
+      "elevation": 1,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route21_South_EventScript_1ABAE9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 10,
+      "y": 29,
+      "elevation": 1,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route21_South_EventScript_1ABB27",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route21_South/scripts.inc b/data/maps/Route21_South/scripts.inc
new file mode 100644
index 000000000..caab96b6a
--- /dev/null
+++ b/data/maps/Route21_South/scripts.inc
@@ -0,0 +1,2 @@
+Route21_South_MapScripts:: @ 816828A
+	.byte 0
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
new file mode 100644
index 000000000..5b6ea3621
--- /dev/null
+++ b/data/maps/Route22/map.json
@@ -0,0 +1,122 @@
+{
+  "id": "MAP_ROUTE22",
+  "name": "Route22",
+  "layout": "LAYOUT_ROUTE22",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_22",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE23",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_VIRIDIAN_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "72",
+      "x": 25,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "79"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4054",
+      "var_value": 1,
+      "script": "Route22_EventScript_16828C"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4054",
+      "var_value": 1,
+      "script": "Route22_EventScript_168298"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 6,
+      "elevation": 0,
+      "var": "VAR_0x4054",
+      "var_value": 1,
+      "script": "Route22_EventScript_1682AB"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4054",
+      "var_value": 3,
+      "script": "Route22_EventScript_1683ED"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4054",
+      "var_value": 3,
+      "script": "Route22_EventScript_1683F9"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 6,
+      "elevation": 0,
+      "var": "VAR_0x4054",
+      "var_value": 3,
+      "script": "Route22_EventScript_16840C"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 12,
+      "elevation": 0,
+      "script": "Route22_EventScript_1684E2"
+    }
+  ]
+}
diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc
new file mode 100644
index 000000000..a116b73eb
--- /dev/null
+++ b/data/maps/Route22/scripts.inc
@@ -0,0 +1,261 @@
+Route22_MapScripts:: @ 816828B
+	.byte 0
+
+Route22_EventScript_16828C:: @ 816828C
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_1682BE
+
+EventScript_168297:: @ 8168297
+	end
+
+Route22_EventScript_168298:: @ 8168298
+	lockall
+	setvar VAR_0x4001, 1
+	setobjectxyperm 1, 25, 5
+	goto EventScript_1682BE
+
+EventScript_1682AA:: @ 81682AA
+	end
+
+Route22_EventScript_1682AB:: @ 81682AB
+	lockall
+	setvar VAR_0x4001, 2
+	setobjectxyperm 1, 25, 5
+	goto EventScript_1682BE
+
+EventScript_1682BD:: @ 81682BD
+	end
+
+EventScript_1682BE:: @ 81682BE
+	textcolor 0
+	playbgm BGM_FRLG_RIVAL, 0
+	addobject 1
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_168350
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_168350
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16835B
+	delay 6
+	msgbox gUnknown_8188890
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_16836D
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_16837C
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_16838B
+	msgbox gUnknown_8188974
+	closemessage
+	delay 10
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16839A
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16839A
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1683A5
+	fadedefaultbgm
+	removeobject 1
+	setvar VAR_0x4054, 2
+	releaseall
+	end
+
+EventScript_168350:: @ 8168350
+	applymovement 1, Movement_1683D1
+	waitmovement 0
+	return
+
+EventScript_16835B:: @ 816835B
+	applymovement 1, Movement_1683D9
+	applymovement 255, Movement_1683E3
+	waitmovement 0
+	return
+
+EventScript_16836D:: @ 816836D
+	trainerbattle 9, 329, 0, Text_188959, Text_18DE1A
+	return
+
+EventScript_16837C:: @ 816837C
+	trainerbattle 9, 330, 0, Text_188959, Text_18DE1A
+	return
+
+EventScript_16838B:: @ 816838B
+	trainerbattle 9, 331, 0, Text_188959, Text_18DE1A
+	return
+
+EventScript_16839A:: @ 816839A
+	applymovement 1, Movement_1683B8
+	waitmovement 0
+	return
+
+EventScript_1683A5:: @ 81683A5
+	applymovement 1, Movement_1683C5
+	waitmovement 0
+	return
+
+Movement_1683B0:: @ 8
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_1683B8:: @ 81683B8
+	step_10
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_1683C5:: @ 81683C5
+	step_13
+	step_13
+	step_13
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_1683D1:: @ 81683D1
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_end
+
+Movement_1683D9:: @ 81683D9
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_13
+	step_2d
+	step_end
+
+Movement_1683E3:: @ 81683E3
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_1b
+	step_2e
+	step_end
+
+Route22_EventScript_1683ED:: @ 81683ED
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16841F
+
+EventScript_1683F8:: @ 81683F8
+	end
+
+Route22_EventScript_1683F9:: @ 81683F9
+	lockall
+	setvar VAR_0x4001, 1
+	setobjectxyperm 1, 25, 5
+	goto EventScript_16841F
+
+EventScript_16840B:: @ 816840B
+	end
+
+Route22_EventScript_16840C:: @ 816840C
+	lockall
+	setvar VAR_0x4001, 2
+	setobjectxyperm 1, 25, 5
+	goto EventScript_16841F
+
+EventScript_16841E:: @ 816841E
+	end
+
+EventScript_16841F:: @ 816841F
+	textcolor 0
+	playbgm BGM_FRLG_RIVAL, 0
+	addobject 1
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16849C
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16849C
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1684A7
+	msgbox gUnknown_8188A3C
+	setvar VAR_LAST_TALKED, 1
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_1684B9
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_1684C4
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_1684CF
+	msgbox gUnknown_8188B29
+	closemessage
+	delay 10
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	applymovement 1, Movement_1684DA
+	waitmovement 0
+	fadedefaultbgm
+	removeobject 1
+	setvar VAR_0x4054, 4
+	releaseall
+	end
+
+EventScript_16849C:: @ 816849C
+	applymovement 1, Movement_1683D1
+	waitmovement 0
+	return
+
+EventScript_1684A7:: @ 81684A7
+	applymovement 1, Movement_1683D9
+	applymovement 255, Movement_1683E3
+	waitmovement 0
+	return
+
+EventScript_1684B9:: @ 81684B9
+	trainerbattle 3, 435, 0, Text_188B08
+	return
+
+EventScript_1684C4:: @ 81684C4
+	trainerbattle 3, 436, 0, Text_188B08
+	return
+
+EventScript_1684CF:: @ 81684CF
+	trainerbattle 3, 437, 0, Text_188B08
+	return
+
+Movement_1684DA:: @ 81684DA
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_12
+	step_end
+
+Route22_EventScript_1684E2:: @ 81684E2
+	msgbox gUnknown_8188BFF, 3
+	end
diff --git a/data/maps/Route22/text.inc b/data/maps/Route22/text.inc
new file mode 100644
index 000000000..7bfe6931b
--- /dev/null
+++ b/data/maps/Route22/text.inc
@@ -0,0 +1,201 @@
+Text_1882E1:: @ 81882E1
+    .string "Strong TRAINERS and WATER POKéMON\n"
+    .string "are common sights in these parts.\p"
+    .string "They say that MISTY of the\n"
+    .string "CERULEAN GYM trains here.$"
+
+Text_18835A:: @ 818835A
+    .string "You want to know if the fish are\n"
+    .string "biting?$"
+
+Text_188383:: @ 8188383
+    .string "Dang!$"
+
+Text_188389:: @ 8188389
+    .string "I can't catch anything good.\n"
+    .string "Not one good POKéMON to be had!$"
+
+Text_1883C6:: @ 81883C6
+    .string "I got a big haul!\n"
+    .string "Wanna go for it?$"
+
+Text_1883E9:: @ 81883E9
+    .string "Heheh, MAGIKARP just don't make\n"
+    .string "the grade, do they?$"
+
+Text_18841D:: @ 818841D
+    .string "I seem to only catch MAGIKARP!$"
+
+Text_18843C:: @ 818843C
+    .string "The sea cleanses my body and soul!$"
+
+Text_18845F:: @ 818845F
+    .string "Ayah!$"
+
+Text_188465:: @ 8188465
+    .string "The sea is great and all, but I\n"
+    .string "like the mountains, too.$"
+
+Text_18849E:: @ 818849E
+    .string "おれだって　たまには\n"
+    .string "およぎに　くるぜ！$"
+
+Text_1884B3:: @ 81884B3
+    .string "ぐわわ！$"
+
+Text_1884B8:: @ 81884B8
+    .string "うきやすそう　だと？\n"
+    .string "うるせー　おおきな　おせわだッ！$"
+
+Text_1884D4:: @ 81884D4
+    .string "I caught my POKéMON at sea.$"
+
+Text_1884F0:: @ 81884F0
+    .string "Diver!!\n"
+    .string "Down!!$"
+
+Text_1884FF:: @ 81884FF
+    .string "Where'd you catch your POKéMON?$"
+
+Text_18851F:: @ 818851F
+    .string "Right now, I'm in a triathlon meet.$"
+
+Text_188543:: @ 8188543
+    .string "Pant…\n"
+    .string "Pant… Pant…$"
+
+Text_188555:: @ 8188555
+    .string "I'm beat! But, I still have the\n"
+    .string "bike race and marathon left!$"
+
+Text_188592:: @ 8188592
+    .string "Ahh!\n"
+    .string "Feel the sun and the wind!$"
+
+Text_1885B2:: @ 81885B2
+    .string "Yow!\n"
+    .string "I lost!$"
+
+Text_1885BF:: @ 81885BF
+    .string "I'm sunburnt to a crisp!$"
+
+Text_1885D8:: @ 81885D8
+    .string "Hey, don't scare away the fish!$"
+
+Text_1885F8:: @ 81885F8
+    .string "Sorry! I'm just so frustrated from\n"
+    .string "not catching anything.$"
+
+Text_188632:: @ 8188632
+    .string "Sheesh, I haven't caught a thing.\n"
+    .string "Could this place actually be a\l"
+    .string "giant pool or something?$"
+
+Text_18868C:: @ 818868C
+    .string "Keep me company till I get a hit.$"
+
+Text_1886AE:: @ 81886AE
+    .string "That burned some time.$"
+
+Text_1886C5:: @ 81886C5
+    .string "Oh wait!\n"
+    .string "I got a bite! Yeah!$"
+
+Text_1886E2:: @ 81886E2
+    .string "LIL: Huh? A battle?\n"
+    .string "IAN, can't you do it alone?$"
+
+Text_188712:: @ 8188712
+    .string "LIL: Oh, see?\n"
+    .string "We lost. Happy now?$"
+
+Text_188734:: @ 8188734
+    .string "LIL: I'm tired.\n"
+    .string "Can't we go home already?$"
+
+Text_18875E:: @ 818875E
+    .string "LIL: Huh? A battle?\n"
+    .string "I can't be bothered to do it alone.\l"
+    .string "Bring two POKéMON, won't you?$"
+
+Text_1887B4:: @ 81887B4
+    .string "IAN: My sis doesn't get enough\n"
+    .string "exercise, so I made her come.$"
+
+Text_1887F1:: @ 81887F1
+    .string "IAN: Awww, Sis!\n"
+    .string "Get it together!$"
+
+Text_188812:: @ 8188812
+    .string "IAN: Come on, Sis!\p"
+    .string "You're not going to lose weight\n"
+    .string "like this!$"
+
+Text_188850:: @ 8188850
+    .string "IAN: We want a two-on-two battle.\n"
+    .string "So can you bring two POKéMON?$"
+
+gUnknown_8188890:: @ 8188890
+    .string "{RIVAL}: Hey! {PLAYER}!\p"
+    .string "You're off to the POKéMON LEAGUE?\n"
+    .string "Forget about it!\p"
+    .string "You probably don't have any\n"
+    .string "BADGES, do you?\p"
+    .string "The guard won't let you through\n"
+    .string "without them.\p"
+    .string "By the way, did your POKéMON get\n"
+    .string "any stronger?$"
+
+Text_188959:: @ 8188959
+    .string "Awww!\n"
+    .string "You just lucked out!$"
+
+gUnknown_8188974:: @ 8188974
+    .string "I heard the POKéMON LEAGUE is\n"
+    .string "crawling with tough TRAINERS.\p"
+    .string "I have to figure out how to get\n"
+    .string "past them.\p"
+    .string "You should quit dawdling and get a\n"
+    .string "move on!$"
+
+Text_188A07:: @ 8188A07
+    .string "{RIVAL}“なんだ？\n"
+    .string "ポケモン　2ひきも\l"
+    .string "もってるの　なぜか　だって？\p"
+    .string "おまえも\n"
+    .string "つかまえれば　いい　じゃん！$"
+
+gUnknown_8188A3C:: @ 8188A3C
+    .string "{RIVAL}: What? {PLAYER}!\n"
+    .string "What a surprise to see you here!\p"
+    .string "So you're going to the POKéMON\n"
+    .string "LEAGUE?\p"
+    .string "You collected all the BADGES, too?\n"
+    .string "That's cool!\p"
+    .string "Then I'll whip you, {PLAYER}, as a\n"
+    .string "warm-up for the POKéMON LEAGUE!\p"
+    .string "Come on!$"
+
+Text_188B08:: @ 8188B08
+    .string "What!?\p"
+    .string "I was just careless, you!$"
+
+gUnknown_8188B29:: @ 8188B29
+    .string "That loosened me up.\n"
+    .string "I'm ready for the POKéMON LEAGUE!\p"
+    .string "{PLAYER}, you need more practice.\p"
+    .string "But hey, you know that!\n"
+    .string "I'm out of here. Smell ya!$"
+
+Text_188BAF:: @ 8188BAF
+    .string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
+    .string "それで　がんばってるのかよ！\l"
+    .string "おれの　さいのうに　くらべりゃ\l"
+    .string "{PLAYER}は　まだまだ　だな！\p"
+    .string "もっと　れんしゅう　こいよ！\n"
+    .string "あははーッ！$"
+
+gUnknown_8188BFF:: @ 8188BFF
+    .string "POKéMON LEAGUE\n"
+    .string "Front Gate$"
+
diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json
new file mode 100644
index 000000000..2f341b5fc
--- /dev/null
+++ b/data/maps/Route22_NorthEntrance/map.json
@@ -0,0 +1,72 @@
+{
+  "id": "MAP_ROUTE22_NORTH_ENTRANCE",
+  "name": "Route22_NorthEntrance",
+  "layout": "LAYOUT_ROUTE22_NORTH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_ROUTE_22",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route22_NorthEntrance_EventScript_1704FC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE23",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE22",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE22",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE22",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 0,
+      "script": "Route22_NorthEntrance_EventScript_17050D"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/Route22_NorthEntrance/scripts.inc b/data/maps/Route22_NorthEntrance/scripts.inc
new file mode 100644
index 000000000..49fba6173
--- /dev/null
+++ b/data/maps/Route22_NorthEntrance/scripts.inc
@@ -0,0 +1,18 @@
+Route22_NorthEntrance_MapScripts:: @ 81704FB
+	.byte 0
+
+Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC
+	lock
+	faceplayer
+	setvar VAR_0x4001, 1
+	getstdstring 0, 15
+	goto EventScript_1A7803
+	end
+
+Route22_NorthEntrance_EventScript_17050D:: @ 817050D
+	lockall
+	setvar VAR_0x4001, 1
+	setvar VAR_0x8009, 1
+	getstdstring 0, 15
+	goto EventScript_1A796E
+	end
diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json
new file mode 100644
index 000000000..54238b10e
--- /dev/null
+++ b/data/maps/Route23/map.json
@@ -0,0 +1,610 @@
+{
+  "id": "MAP_ROUTE23",
+  "name": "Route23",
+  "layout": "LAYOUT_ROUTE23",
+  "music": "BGM_FRLG_INDIGO_PLATEAU",
+  "region_map_section": "MAPSEC_ROUTE_23",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_INDIGO_PLATEAU_EXTERIOR",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE22",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 15,
+      "y": 149,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route23_EventScript_16850C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "60",
+      "x": 8,
+      "y": 140,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route23_EventScript_16851D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "60",
+      "x": 14,
+      "y": 123,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route23_EventScript_16852E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "60",
+      "x": 16,
+      "y": 112,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route23_EventScript_16853F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "60",
+      "x": 10,
+      "y": 94,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route23_EventScript_168550",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "60",
+      "x": 14,
+      "y": 61,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route23_EventScript_168561",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "60",
+      "x": 6,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route23_EventScript_168572",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 28,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 18,
+      "y": 28,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_2F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 8,
+      "y": 153,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 154,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 149,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 1,
+      "script": "Route23_EventScript_168583"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 140,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 2,
+      "script": "Route23_EventScript_168598"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 123,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 3,
+      "script": "Route23_EventScript_1685AD"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 111,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 94,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 5,
+      "script": "Route23_EventScript_1685D7"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 61,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 6,
+      "script": "Route23_EventScript_1685EC"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 35,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 7,
+      "script": "Route23_EventScript_168601"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 34,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 7,
+      "script": "Route23_EventScript_168601"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 32,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 7,
+      "script": "Route23_EventScript_168601"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 33,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 7,
+      "script": "Route23_EventScript_168601"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 31,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 7,
+      "script": "Route23_EventScript_168601"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 36,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 7,
+      "script": "Route23_EventScript_168601"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 35,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 7,
+      "script": "Route23_EventScript_168601"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 35,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 7,
+      "script": "Route23_EventScript_168601"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 60,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 6,
+      "script": "Route23_EventScript_1685EC"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 61,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 6,
+      "script": "Route23_EventScript_1685EC"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 60,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 6,
+      "script": "Route23_EventScript_1685EC"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 94,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 5,
+      "script": "Route23_EventScript_1685D7"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 92,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 5,
+      "script": "Route23_EventScript_1685D7"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 94,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 5,
+      "script": "Route23_EventScript_1685D7"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 92,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 5,
+      "script": "Route23_EventScript_1685D7"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 92,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 5,
+      "script": "Route23_EventScript_1685D7"
+    },
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 92,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 5,
+      "script": "Route23_EventScript_1685D7"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 139,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 2,
+      "script": "Route23_EventScript_168598"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 139,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 2,
+      "script": "Route23_EventScript_168598"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 140,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 2,
+      "script": "Route23_EventScript_168598"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 122,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 3,
+      "script": "Route23_EventScript_1685AD"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 122,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 3,
+      "script": "Route23_EventScript_1685AD"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 123,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 3,
+      "script": "Route23_EventScript_1685AD"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 109,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 109,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 109,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 109,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 109,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 111,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 112,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 112,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 15,
+      "y": 112,
+      "elevation": 1,
+      "var": "VAR_0x405F",
+      "var_value": 4,
+      "script": "Route23_EventScript_1685C2"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 148,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 1,
+      "script": "Route23_EventScript_168583"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 148,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 1,
+      "script": "Route23_EventScript_168583"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 149,
+      "elevation": 3,
+      "var": "VAR_0x405F",
+      "var_value": 1,
+      "script": "Route23_EventScript_168583"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 148,
+      "elevation": 0,
+      "var": "VAR_0x405F",
+      "var_value": 1,
+      "script": "Route23_EventScript_168583"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 42,
+      "elevation": 0,
+      "item": "ITEM_FULL_RESTORE",
+      "flag": "34",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 20,
+      "y": 72,
+      "elevation": 0,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "35",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 101,
+      "elevation": 3,
+      "item": "ITEM_MAX_ETHER",
+      "flag": "36",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 18,
+      "elevation": 3,
+      "item": "ITEM_LUM_BERRY",
+      "flag": "145",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 2,
+      "y": 29,
+      "elevation": 3,
+      "item": "ITEM_SITRUS_BERRY",
+      "flag": "146",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 10,
+      "y": 67,
+      "elevation": 3,
+      "item": "ITEM_ASPEAR_BERRY",
+      "flag": "147",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 128,
+      "elevation": 3,
+      "item": "ITEM_LEPPA_BERRY",
+      "flag": "148",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "item": "ITEM_MAX_ELIXIR",
+      "flag": "155",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 31,
+      "elevation": 0,
+      "script": "Route23_EventScript_168616"
+    }
+  ]
+}
diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc
new file mode 100644
index 000000000..f5c504650
--- /dev/null
+++ b/data/maps/Route23/scripts.inc
@@ -0,0 +1,128 @@
+Route23_MapScripts:: @ 81684EB
+	map_script 3, Route23_MapScript1_1684F1
+	.byte 0
+
+Route23_MapScript1_1684F1:: @ 81684F1
+	clearflag FLAG_0x059
+	setflag FLAG_0x058
+	setvar VAR_0x4064, 0
+	setvar VAR_0x4065, 0
+	setvar VAR_0x4066, 0
+	setvar VAR_0x4067, 0
+	end
+
+Route23_EventScript_16850C:: @ 816850C
+	lock
+	faceplayer
+	setvar VAR_0x4001, 2
+	getstdstring 0, 16
+	goto EventScript_1A786C
+	end
+
+Route23_EventScript_16851D:: @ 816851D
+	lock
+	faceplayer
+	setvar VAR_0x4001, 3
+	getstdstring 0, 17
+	goto EventScript_1A786C
+	end
+
+Route23_EventScript_16852E:: @ 816852E
+	lock
+	faceplayer
+	setvar VAR_0x4001, 4
+	getstdstring 0, 18
+	goto EventScript_1A786C
+	end
+
+Route23_EventScript_16853F:: @ 816853F
+	lock
+	faceplayer
+	setvar VAR_0x4001, 5
+	getstdstring 0, 19
+	goto EventScript_1A786C
+	end
+
+Route23_EventScript_168550:: @ 8168550
+	lock
+	faceplayer
+	setvar VAR_0x4001, 6
+	getstdstring 0, 20
+	goto EventScript_1A786C
+	end
+
+Route23_EventScript_168561:: @ 8168561
+	lock
+	faceplayer
+	setvar VAR_0x4001, 7
+	getstdstring 0, 21
+	goto EventScript_1A786C
+	end
+
+Route23_EventScript_168572:: @ 8168572
+	lock
+	faceplayer
+	setvar VAR_0x4001, 8
+	getstdstring 0, 22
+	goto EventScript_1A786C
+	end
+
+Route23_EventScript_168583:: @ 8168583
+	lockall
+	setvar VAR_0x4001, 2
+	setvar VAR_0x8009, 1
+	getstdstring 0, 16
+	goto EventScript_1A796E
+	end
+
+Route23_EventScript_168598:: @ 8168598
+	lockall
+	setvar VAR_0x4001, 3
+	setvar VAR_0x8009, 2
+	getstdstring 0, 17
+	goto EventScript_1A796E
+	end
+
+Route23_EventScript_1685AD:: @ 81685AD
+	lockall
+	setvar VAR_0x4001, 4
+	setvar VAR_0x8009, 3
+	getstdstring 0, 18
+	goto EventScript_1A796E
+	end
+
+Route23_EventScript_1685C2:: @ 81685C2
+	lockall
+	setvar VAR_0x4001, 5
+	setvar VAR_0x8009, 4
+	getstdstring 0, 19
+	goto EventScript_1A796E
+	end
+
+Route23_EventScript_1685D7:: @ 81685D7
+	lockall
+	setvar VAR_0x4001, 6
+	setvar VAR_0x8009, 5
+	getstdstring 0, 20
+	goto EventScript_1A796E
+	end
+
+Route23_EventScript_1685EC:: @ 81685EC
+	lockall
+	setvar VAR_0x4001, 7
+	setvar VAR_0x8009, 6
+	getstdstring 0, 21
+	goto EventScript_1A796E
+	end
+
+Route23_EventScript_168601:: @ 8168601
+	lockall
+	setvar VAR_0x4001, 8
+	setvar VAR_0x8009, 7
+	getstdstring 0, 22
+	goto EventScript_1A796E
+	end
+
+Route23_EventScript_168616:: @ 8168616
+	msgbox gUnknown_8188C19, 3
+	end
diff --git a/data/maps/Route23/text.inc b/data/maps/Route23/text.inc
new file mode 100644
index 000000000..6bdcaf47d
--- /dev/null
+++ b/data/maps/Route23/text.inc
@@ -0,0 +1,4 @@
+gUnknown_8188C19:: @ 8188C19
+    .string "VICTORY ROAD GATE -\n"
+    .string "POKéMON LEAGUE$"
+
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
new file mode 100644
index 000000000..f4b8dee3f
--- /dev/null
+++ b/data/maps/Route24/map.json
@@ -0,0 +1,164 @@
+{
+  "id": "MAP_ROUTE24",
+  "name": "Route24",
+  "layout": "LAYOUT_ROUTE24",
+  "music": "BGM_FRLG_ROUTE_24",
+  "region_map_section": "MAPSEC_ROUTE_24",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_CERULEAN_CITY",
+      "offset": -12,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE25",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "25",
+      "x": 12,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route24_EventScript_168620",
+      "flag": "49"
+    },
+    {
+      "graphics_id": "39",
+      "x": 12,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A972D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 10,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A9673",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 12,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A95F7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 10,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A96B1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 12,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A9635",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 5,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route24_EventScript_1A96EF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route24_EventScript_1BE644",
+      "flag": "354"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x406B",
+      "var_value": 0,
+      "script": "Route24_EventScript_168660"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x406B",
+      "var_value": 0,
+      "script": "Route24_EventScript_16866C"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 4,
+      "elevation": 3,
+      "item": "ITEM_PECHA_BERRY",
+      "flag": "115",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc
new file mode 100644
index 000000000..91dfc90f0
--- /dev/null
+++ b/data/maps/Route24/scripts.inc
@@ -0,0 +1,104 @@
+Route24_MapScripts:: @ 816861F
+	.byte 0
+
+Route24_EventScript_168620:: @ 8168620
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x406B, 1
+	goto_if_eq EventScript_168656
+	msgbox gUnknown_8188C3C
+	checkitemspace ITEM_NUGGET, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16864C
+	call EventScript_1686B9
+	release
+	end
+
+EventScript_16864C:: @ 816864C
+	msgbox gUnknown_8188CC2
+	release
+	end
+
+EventScript_168656:: @ 8168656
+	msgbox gUnknown_8188DF1
+	release
+	end
+
+Route24_EventScript_168660:: @ 8168660
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_168678
+	end
+
+Route24_EventScript_16866C:: @ 816866C
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_168678
+	end
+
+EventScript_168678:: @ 8168678
+	textcolor 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_1686FD
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_168708
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	msgbox gUnknown_8188C3C
+	checkitemspace ITEM_NUGGET, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_168713
+	call EventScript_1686B9
+	releaseall
+	end
+
+EventScript_1686B9:: @ 81686B9
+	additem ITEM_NUGGET, 1
+	giveitemfanfaremsg gUnknown_8188C93, ITEM_NUGGET
+	message Text_188CDB
+	waitmessage
+	playbgm BGM_FRLG_SUSPICIOUS_EYE, 0
+	waitbuttonpress
+	setvar VAR_LAST_TALKED, 1
+	trainerbattle 3, 356, 0, Text_188DDC
+	msgbox gUnknown_8188DF1
+	setvar VAR_0x406B, 1
+	return
+
+EventScript_1686FD:: @ 81686FD
+	applymovement 1, Movement_16873E
+	waitmovement 0
+	return
+
+EventScript_168708:: @ 8168708
+	applymovement 1, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_168713:: @ 8168713
+	msgbox gUnknown_8188CC2
+	closemessage
+	applymovement 255, Movement_168743
+	waitmovement 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_168733
+	release
+	end
+
+EventScript_168733:: @ 8168733
+	applymovement 1, Movement_168740
+	waitmovement 0
+	return
+
+Movement_16873E:: @ 816873E
+	step_12
+	step_end
+
+Movement_168740:: @ 8168740
+	step_13
+	step_2f
+	step_end
+
+Movement_168743:: @ 8168743
+	step_10
+	step_end
diff --git a/data/maps/Route24/text.inc b/data/maps/Route24/text.inc
new file mode 100644
index 000000000..04ef64ea5
--- /dev/null
+++ b/data/maps/Route24/text.inc
@@ -0,0 +1,35 @@
+gUnknown_8188C3C:: @ 8188C3C
+    .string "Congratulations! You beat our\n"
+    .string "five contest TRAINERS!\p"
+    .string "You just earned a fabulous prize!$"
+
+gUnknown_8188C93:: @ 8188C93
+    .string "{PLAYER} received a NUGGET\n"
+    .string "from the mystery TRAINER!$"
+
+gUnknown_8188CC2:: @ 8188CC2
+    .string "You don't have any room!$"
+
+Text_188CDB:: @ 8188CDB
+    .string "By the way, how would you like to\n"
+    .string "join TEAM ROCKET?\p"
+    .string "We're a group of professional\n"
+    .string "criminals specializing in POKéMON!\p"
+    .string "Want to join?\p"
+    .string "Are you sure?\p"
+    .string "Come on, join us!\p"
+    .string "I'm telling you to join!\p"
+    .string "…Okay, you need convincing!\p"
+    .string "I'll make you an offer you can't\n"
+    .string "refuse!$"
+
+Text_188DDC:: @ 8188DDC
+    .string "Arrgh!\n"
+    .string "You are good!$"
+
+gUnknown_8188DF1:: @ 8188DF1
+    .string "With your ability, you'd become\n"
+    .string "a top leader in TEAM ROCKET.\p"
+    .string "Come on, think of the opportunity!\n"
+    .string "Don't let this chance go to waste.$"
+
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
new file mode 100644
index 000000000..de4155fe6
--- /dev/null
+++ b/data/maps/Route25/map.json
@@ -0,0 +1,247 @@
+{
+  "id": "MAP_ROUTE25",
+  "name": "Route25",
+  "layout": "LAYOUT_ROUTE25",
+  "music": "BGM_FRLG_ROUTE_24",
+  "region_map_section": "MAPSEC_ROUTE_25",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE24",
+      "offset": 0,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "56",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route25_EventScript_1A98A1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 18,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A976B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 17,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A991D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 22,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A97A9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 22,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A9825",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 27,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route25_EventScript_1A98DF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 28,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route25_EventScript_1A995B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 36,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "26",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A97E7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 42,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route25_EventScript_1A9863",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 26,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_EventScript_1BE651",
+      "flag": "355"
+    },
+    {
+      "graphics_id": "95",
+      "x": 30,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "29",
+      "x": 49,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_EventScript_1ACE4F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 49,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_EventScript_16874F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 51,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE25_SEA_COTTAGE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 48,
+      "y": 4,
+      "elevation": 0,
+      "script": "Route25_EventScript_168746"
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "item": "ITEM_ELIXIR",
+      "flag": "4",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 58,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_ETHER",
+      "flag": "5",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 33,
+      "y": 8,
+      "elevation": 3,
+      "item": "ITEM_ORAN_BERRY",
+      "flag": "116",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 40,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_BLUK_BERRY",
+      "flag": "117",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc
new file mode 100644
index 000000000..81b2704d4
--- /dev/null
+++ b/data/maps/Route25/scripts.inc
@@ -0,0 +1,10 @@
+Route25_MapScripts:: @ 8168745
+	.byte 0
+
+Route25_EventScript_168746:: @ 8168746
+	msgbox gUnknown_818954C, 3
+	end
+
+Route25_EventScript_16874F:: @ 816874F
+	msgbox gUnknown_81895C2, 2
+	end
diff --git a/data/maps/Route25/text.inc b/data/maps/Route25/text.inc
new file mode 100644
index 000000000..cdc124108
--- /dev/null
+++ b/data/maps/Route25/text.inc
@@ -0,0 +1,185 @@
+Text_188E74:: @ 8188E74
+    .string "I saw your feat from the grass!$"
+
+Text_188E94:: @ 8188E94
+    .string "I thought not!$"
+
+Text_188EA3:: @ 8188EA3
+    .string "I hid because the people on the\n"
+    .string "bridge frightened me.$"
+
+Text_188ED9:: @ 8188ED9
+    .string "Okay! I'm No. 5!\n"
+    .string "I'll stomp you!$"
+
+Text_188EFA:: @ 8188EFA
+    .string "Whoa!\n"
+    .string "Too much!$"
+
+Text_188F0A:: @ 8188F0A
+    .string "I did my best. I have no regrets!$"
+
+Text_188F2C:: @ 8188F2C
+    .string "I'm No. 4!\n"
+    .string "Getting tired?$"
+
+Text_188F46:: @ 8188F46
+    .string "I lost, too!$"
+
+Text_188F53:: @ 8188F53
+    .string "I did my best, so I've no regrets!$"
+
+Text_188F76:: @ 8188F76
+    .string "Here's No. 3!\n"
+    .string "I won't be easy!$"
+
+Text_188F95:: @ 8188F95
+    .string "Ow!\n"
+    .string "Stomped flat!$"
+
+Text_188FA7:: @ 8188FA7
+    .string "I did my best. I have no regrets!$"
+
+Text_188FC9:: @ 8188FC9
+    .string "I'm second!\n"
+    .string "Now it's serious!$"
+
+Text_188FE7:: @ 8188FE7
+    .string "How could I lose?$"
+
+Text_188FF9:: @ 8188FF9
+    .string "I did my best. I have no regrets!$"
+
+Text_18901B:: @ 818901B
+    .string "People call this the NUGGET\n"
+    .string "BRIDGE!\p"
+    .string "Beat us five TRAINERS and win\n"
+    .string "a fabulous prize!\p"
+    .string "Think you got what it takes?$"
+
+Text_18908C:: @ 818908C
+    .string "Whoo!\n"
+    .string "Good stuff!$"
+
+Text_18909E:: @ 818909E
+    .string "I did my best. I have no regrets!$"
+
+Text_1890C0:: @ 81890C0
+    .string "Local TRAINERS come here to\n"
+    .string "practice.$"
+
+Text_1890E6:: @ 81890E6
+    .string "You're decent.$"
+
+Text_1890F5:: @ 81890F5
+    .string "All POKéMON have weaknesses.\n"
+    .string "Even the strongest ones.\p"
+    .string "That's why it's best to raise\n"
+    .string "POKéMON of different types.$"
+
+Text_189165:: @ 8189165
+    .string "Dad took me to a great party on\n"
+    .string "the S.S. ANNE at VERMILION CITY.$"
+
+Text_1891A6:: @ 81891A6
+    .string "I'm not mad!$"
+
+Text_1891B3:: @ 81891B3
+    .string "On the S.S. ANNE, I saw TRAINERS\n"
+    .string "from around the world.$"
+
+Text_1891EB:: @ 81891EB
+    .string "I'm a cool guy.\n"
+    .string "I've got a girlfriend!$"
+
+Text_189212:: @ 8189212
+    .string "Aww, darn…$"
+
+Text_18921D:: @ 818921D
+    .string "Oh, well.\n"
+    .string "My girlfriend will cheer me up.$"
+
+Text_189247:: @ 8189247
+    .string "Hi!\n"
+    .string "My boyfriend is cool!$"
+
+Text_189261:: @ 8189261
+    .string "My conditioning isn't the best…$"
+
+Text_189281:: @ 8189281
+    .string "I wish my boyfriend was as good\n"
+    .string "as you.$"
+
+Text_1892A9:: @ 81892A9
+    .string "I had this feeling…\n"
+    .string "I knew I had to battle you!$"
+
+Text_1892D9:: @ 81892D9
+    .string "I knew I'd lose, too!$"
+
+Text_1892EF:: @ 81892EF
+    .string "If your POKéMON gets confused,\n"
+    .string "switch it out.\p"
+    .string "That's a good tactic.$"
+
+Text_189333:: @ 8189333
+    .string "My friend has many cute POKéMON.\n"
+    .string "I'm so jealous!$"
+
+Text_189364:: @ 8189364
+    .string "I'm not so jealous!$"
+
+Text_189378:: @ 8189378
+    .string "You came from MT. MOON?\n"
+    .string "May I have a CLEFAIRY?$"
+
+Text_1893A7:: @ 81893A7
+    .string "I just got down from MT. MOON,\n"
+    .string "but I've still got gas in the tank!$"
+
+Text_1893EA:: @ 81893EA
+    .string "You worked hard!$"
+
+Text_1893FB:: @ 81893FB
+    .string "Drat!\n"
+    .string "A ZUBAT bit me back in that cave.$"
+
+Text_189423:: @ 8189423
+    .string "I'm off to see a POKéMANIAC's\n"
+    .string "collection at the cape.$"
+
+Text_189459:: @ 8189459
+    .string "You done got me, and real good,\n"
+    .string "too!$"
+
+Text_18947E:: @ 818947E
+    .string "The POKéMANIAC sure lives up to\n"
+    .string "his name.\p"
+    .string "His collection includes many rare\n"
+    .string "species of POKéMON.$"
+
+Text_1894DE:: @ 81894DE
+    .string "You're going to see BILL?\n"
+    .string "First, we battle!$"
+
+Text_18950A:: @ 818950A
+    .string "You're something.$"
+
+Text_18951C:: @ 818951C
+    .string "The trail below is a shortcut to\n"
+    .string "CERULEAN CITY.$"
+
+gUnknown_818954C:: @ 818954C
+    .string "SEA COTTAGE\n"
+    .string "BILL lives here!$"
+
+Text_189569:: @ 8189569
+    .string "This cape is a famous date spot.\p"
+    .string "MISTY, the GYM LEADER, has high\n"
+    .string "hopes about this place.$"
+
+gUnknown_81895C2:: @ 81895C2
+    .string "Hello, are you here alone?\p"
+    .string "If you're out at CERULEAN's cape…\n"
+    .string "Well, it should be as a couple.$"
+
diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json
new file mode 100644
index 000000000..7777ee3da
--- /dev/null
+++ b/data/maps/Route25_SeaCottage/map.json
@@ -0,0 +1,76 @@
+{
+  "id": "MAP_ROUTE25_SEA_COTTAGE",
+  "name": "Route25_SeaCottage",
+  "layout": "LAYOUT_ROUTE25_SEA_COTTAGE",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_25",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "73",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_SeaCottage_EventScript_17054B",
+      "flag": "51"
+    },
+    {
+      "graphics_id": "113",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_SeaCottage_EventScript_17054B",
+      "flag": "50"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE25",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE25",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE25",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "script": "Route25_SeaCottage_EventScript_1706DD"
+    }
+  ]
+}
diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc
new file mode 100644
index 000000000..cbcdba4e9
--- /dev/null
+++ b/data/maps/Route25_SeaCottage/scripts.inc
@@ -0,0 +1,314 @@
+Route25_SeaCottage_MapScripts:: @ 8170523
+	map_script 3, Route25_SeaCottage_MapScript1_170529
+	.byte 0
+
+Route25_SeaCottage_MapScript1_170529:: @ 8170529
+	checkflag FLAG_0x233
+	call_if 0, EventScript_17053C
+	checkflag FLAG_0x234
+	call_if 1, EventScript_170547
+	end
+
+EventScript_17053C:: @ 817053C
+	clearflag FLAG_0x032
+	setobjectxyperm 1, 3, 3
+	return
+
+EventScript_170547:: @ 8170547
+	setflag FLAG_0x003
+	return
+
+Route25_SeaCottage_EventScript_17054B:: @ 817054B
+	lock
+	faceplayer
+	checkflag FLAG_0x003
+	goto_if_eq EventScript_1706C8
+	checkflag FLAG_0x234
+	goto_if_eq EventScript_170640
+	checkflag FLAG_0x233
+	goto_if_eq EventScript_17064A
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_170580
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_17058E
+	end
+
+EventScript_170580:: @ 8170580
+	msgbox gUnknown_819FDFA, MSGBOX_YESNO
+	goto EventScript_17059C
+	end
+
+EventScript_17058E:: @ 817058E
+	msgbox gUnknown_819FEE6, MSGBOX_YESNO
+	goto EventScript_17059C
+	end
+
+EventScript_17059C:: @ 817059C
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_170600
+	msgbox gUnknown_819FFD3
+	closemessage
+	delay 10
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_17062A
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_170635
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_170635
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_170635
+	opendoor 10, 3
+	waitdooranim
+	applymovement 2, Movement_1706DB
+	waitmovement 0
+	removeobject 2
+	playse SE_EXPMAX
+	closedoor 10, 3
+	waitdooranim
+	setflag FLAG_0x002
+	release
+	end
+
+EventScript_170600:: @ 8170600
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_170618
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_170621
+	return
+
+EventScript_170618:: @ 8170618
+	msgbox gUnknown_81A0035
+	return
+
+EventScript_170621:: @ 8170621
+	msgbox gUnknown_81A00B6
+	return
+
+EventScript_17062A:: @ 817062A
+	applymovement 2, Movement_1706D5
+	waitmovement 0
+	return
+
+EventScript_170635:: @ 8170635
+	applymovement 2, Movement_1706D2
+	waitmovement 0
+	return
+
+EventScript_170640:: @ 8170640
+	msgbox gUnknown_81A02CF
+	release
+	end
+
+EventScript_17064A:: @ 817064A
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_1706AC
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_1706B5
+	checkitemspace ITEM_SS_TICKET, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1706BE
+	additem ITEM_SS_TICKET, 1
+	giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, BGM_FRLG_ME_KEYITEM
+	setflag FLAG_0x235
+	setflag FLAG_0x031
+	setflag FLAG_0x234
+	setflag FLAG_SYS_NOT_SOMEONES_PC
+	goto EventScript_170640
+	end
+
+EventScript_1706AC:: @ 81706AC
+	msgbox gUnknown_81A013B
+	return
+
+EventScript_1706B5:: @ 81706B5
+	msgbox gUnknown_81A01E4
+	return
+
+EventScript_1706BE:: @ 81706BE
+	msgbox gUnknown_81A02B4
+	release
+	end
+
+EventScript_1706C8:: @ 81706C8
+	msgbox gUnknown_81A03AB
+	release
+	end
+
+Movement_1706D2:: @ 81706D2
+	step_11
+	step_11
+	step_end
+
+Movement_1706D5:: @ 81706D5
+	step_13
+	step_11
+	step_11
+	step_12
+	step_2e
+	step_end
+
+Movement_1706DB:: @ 81706DB
+	step_11
+	step_end
+
+Route25_SeaCottage_EventScript_1706DD:: @ 81706DD
+	lockall
+	checkflag FLAG_0x003
+	goto_if_eq EventScript_1707CA
+	checkflag FLAG_0x002
+	goto_if_eq EventScript_1706FA
+	msgbox gUnknown_81A0402
+	releaseall
+	end
+
+EventScript_1706FA:: @ 81706FA
+	fadeoutbgm 0
+	msgbox gUnknown_81A042D
+	closemessage
+	clearflag FLAG_0x002
+	setflag FLAG_0x233
+	special SpawnScriptFieldObject
+	applymovement 127, Movement_1707BE
+	waitmovement 0
+	delay 35
+	playse SE_PIN
+	waitse
+	setvar VAR_0x8004, 0
+	special sub_809C4A8
+	delay 10
+	call EventScript_1707B6
+	call EventScript_1707B6
+	call EventScript_1707B6
+	call EventScript_1707B6
+	call EventScript_1707B6
+	call EventScript_1707B6
+	call EventScript_1707B6
+	setvar VAR_0x8004, 1
+	special sub_809C4A8
+	playse SE_FU_ZUZUZU
+	special sub_809C5FC
+	waitse
+	call EventScript_1707B6
+	call EventScript_1707B6
+	call EventScript_1707B6
+	call EventScript_1707B6
+	call EventScript_1707B6
+	opendoor 3, 3
+	waitdooranim
+	fadeinbgm 0
+	addobject 1
+	clearflag FLAG_0x033
+	delay 50
+	playfanfare MUS_FANFA1
+	applymovement 1, Movement_170888
+	waitmovement 0
+	waitfanfare
+	applymovement 127, Movement_1707C3
+	waitmovement 0
+	playse SE_EXPMAX
+	closedoor 3, 3
+	waitdooranim
+	applymovement 1, Movement_170881
+	waitmovement 0
+	special RemoveScriptFieldObject
+	releaseall
+	end
+
+EventScript_1707B6:: @ 81707B6
+	playse SE_BOWA
+	waitse
+	delay 20
+	return
+
+Movement_1707BE:: @ 81707BE
+	step_11
+	step_11
+	step_13
+	step_13
+	step_end
+
+Movement_1707C3:: @ 81707C3
+	step_1c
+	step_1c
+	step_10
+	step_10
+	step_12
+	step_12
+	step_end
+
+EventScript_1707CA:: @ 81707CA
+	msgbox gUnknown_81A045B
+	goto EventScript_1707D8
+	end
+
+EventScript_1707D8:: @ 81707D8
+	message Text_1A0479
+	waitmessage
+	multichoice 0, 0, 1, 0
+	switch VAR_RESULT
+	case 0, EventScript_17082B
+	case 1, EventScript_170840
+	case 2, EventScript_170855
+	case 3, EventScript_17086A
+	case 4, EventScript_17087F
+	case 127, EventScript_17087F
+	end
+
+EventScript_17082B:: @ 817082B
+	drawmonpic SPECIES_EEVEE, 10, 3
+	waitbuttonpress
+	erasemonpic
+	setvar VAR_0x8004, SPECIES_EEVEE
+	special sub_80CBDCC
+	goto EventScript_1707D8
+	end
+
+EventScript_170840:: @ 8170840
+	drawmonpic SPECIES_FLAREON, 10, 3
+	waitbuttonpress
+	erasemonpic
+	setvar VAR_0x8004, SPECIES_FLAREON
+	special sub_80CBDCC
+	goto EventScript_1707D8
+	end
+
+EventScript_170855:: @ 8170855
+	drawmonpic SPECIES_JOLTEON, 10, 3
+	waitbuttonpress
+	erasemonpic
+	setvar VAR_0x8004, SPECIES_JOLTEON
+	special sub_80CBDCC
+	goto EventScript_1707D8
+	end
+
+EventScript_17086A:: @ 817086A
+	drawmonpic SPECIES_VAPOREON, 10, 3
+	waitbuttonpress
+	erasemonpic
+	setvar VAR_0x8004, SPECIES_VAPOREON
+	special sub_80CBDCC
+	goto EventScript_1707D8
+	end
+
+EventScript_17087F:: @ 817087F
+	releaseall
+	end
+
+Movement_170881:: @ 8170881
+	step_13
+	step_13
+	step_13
+	step_13
+	step_10
+	step_10
+	step_end
+
+Movement_170888:: @ 8170888
+	step_10
+	step_end
diff --git a/data/maps/Route25_SeaCottage/text.inc b/data/maps/Route25_SeaCottage/text.inc
new file mode 100644
index 000000000..6ecacdd89
--- /dev/null
+++ b/data/maps/Route25_SeaCottage/text.inc
@@ -0,0 +1,108 @@
+gUnknown_819FDFA:: @ 819FDFA
+    .string "Hiya! I'm a POKéMON…\n"
+    .string "…No I'm not!\p"
+    .string "Call me BILL!\n"
+    .string "I'm a true-blue POKéMANIAC!\p"
+    .string "Hey!\n"
+    .string "What's with that skeptical look?\p"
+    .string "I'm not joshing you, pal.\p"
+    .string "I screwed up an experiment and got\n"
+    .string "combined with a POKéMON!\p"
+    .string "So, how about it?\n"
+    .string "Help me out here!$"
+
+gUnknown_819FEE6:: @ 819FEE6
+    .string "Hiya! I'm a POKéMON…\n"
+    .string "…No I'm not!\p"
+    .string "Call me BILL!\n"
+    .string "I'm a true-blue POKéMANIAC!\p"
+    .string "Hey!\n"
+    .string "What's with that skeptical look?\p"
+    .string "I'm not joshing you, lady.\p"
+    .string "I screwed up an experiment and got\n"
+    .string "combined with a POKéMON!\p"
+    .string "So, how about it?\n"
+    .string "Help me out here!$"
+
+gUnknown_819FFD3:: @ 819FFD3
+    .string "Wait till I get inside the\n"
+    .string "TELEPORTER.\p"
+    .string "When I do, go to my PC and run\n"
+    .string "the Cell Separation System.$"
+
+gUnknown_81A0035:: @ 81A0035
+    .string "No!?\n"
+    .string "Now don't be so cold!\p"
+    .string "Come on, you gotta help a guy in\n"
+    .string "deep, deep trouble!\p"
+    .string "What do you say, chief?\n"
+    .string "Please?\l"
+    .string "Okay?\l"
+    .string "All right!$"
+
+gUnknown_81A00B6:: @ 81A00B6
+    .string "No!?\n"
+    .string "Now don't be so cold!\p"
+    .string "Come on, you gotta help a guy in\n"
+    .string "deep, deep trouble!\p"
+    .string "What do you say, beautiful?\n"
+    .string "Please?\l"
+    .string "Okay?\l"
+    .string "All right!$"
+
+gUnknown_81A013B:: @ 81A013B
+    .string "BILL: Yeehah!\n"
+    .string "Thanks, bud! I owe you one!\p"
+    .string "So, did you come to see my\n"
+    .string "POKéMON collection?\p"
+    .string "You didn't?\n"
+    .string "That's a bummer.\p"
+    .string "I've got to thank you…\n"
+    .string "Oh, here, maybe this'll do.$"
+
+gUnknown_81A01E4:: @ 81A01E4
+    .string "BILL: Yeehah!\n"
+    .string "Thanks, lady! I owe you one!\p"
+    .string "So, did you come to see my\n"
+    .string "POKéMON collection?\p"
+    .string "You didn't?\n"
+    .string "That's a bummer.\p"
+    .string "I've got to thank you…\n"
+    .string "Oh, here, maybe this'll do.$"
+
+gUnknown_81A028E:: @ 81A028E
+    .string "{PLAYER} received an S.S. TICKET\n"
+    .string "from BILL.$"
+
+gUnknown_81A02B4:: @ 81A02B4
+    .string "You've got too much stuff!$"
+
+gUnknown_81A02CF:: @ 81A02CF
+    .string "That cruise ship S.S. ANNE is in\n"
+    .string "VERMILION CITY.\p"
+    .string "I hear there are lots of TRAINERS\n"
+    .string "on board, too.\p"
+    .string "They invited me to their party, but\n"
+    .string "I can't stand fancy do's.\p"
+    .string "Why don't you go instead of me?\n"
+    .string "Go on and have a good time.$"
+
+gUnknown_81A03AB:: @ 81A03AB
+    .string "BILL: Feel like checking out some\n"
+    .string "of my rare POKéMON on my PC?\p"
+    .string "Go on, check out my PC.$"
+
+gUnknown_81A0402:: @ 81A0402
+    .string "TELEPORTER is displayed on the PC\n"
+    .string "monitor.$"
+
+gUnknown_81A042D:: @ 81A042D
+    .string "{PLAYER} initiated the TELEPORTER's\n"
+    .string "Cell Separator.$"
+
+gUnknown_81A045B:: @ 81A045B
+    .string "BILL's favorite POKéMON list!$"
+
+Text_1A0479:: @ 81A0479
+    .string "Which POKéMON do you want to see?$"
+
diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json
new file mode 100644
index 000000000..cf6552f51
--- /dev/null
+++ b/data/maps/Route2_EastBuilding/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_ROUTE2_EAST_BUILDING",
+  "name": "Route2_EastBuilding",
+  "layout": "LAYOUT_ROUTE2_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EastBuilding_EventScript_16F67F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EastBuilding_EventScript_16F714",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc
new file mode 100644
index 000000000..a1b2d0e7a
--- /dev/null
+++ b/data/maps/Route2_EastBuilding/scripts.inc
@@ -0,0 +1,42 @@
+Route2_EastBuilding_MapScripts:: @ 816F67E
+	.byte 0
+
+Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
+	lock
+	faceplayer
+	call EventScript_16F70B
+	checkflag FLAG_0x23B
+	goto_if_eq EventScript_16F701
+	msgbox gUnknown_819D64F, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AD1
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, Special_GetPokedexCount
+	getnumberstring 2, VAR_0x8006
+	call EventScript_16F70B
+	compare_var_to_value VAR_0x8006, 10
+	goto_if 0, EventScript_1A7ABD
+	msgbox gUnknown_819D74E
+	checkitemspace ITEM_HM05, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A7AC7
+	additem ITEM_HM05, 1
+	giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05
+	setflag FLAG_0x23B
+	msgbox gUnknown_819D7C1
+	release
+	end
+
+EventScript_16F701:: @ 816F701
+	msgbox gUnknown_819D7C1
+	release
+	end
+
+EventScript_16F70B:: @ 816F70B
+	getnumberstring 0, 10
+	getitemname 1, ITEM_HM05
+	return
+
+Route2_EastBuilding_EventScript_16F714:: @ 816F714
+	msgbox gUnknown_819D81E, 2
+	end
diff --git a/data/maps/Route2_EastBuilding/text.inc b/data/maps/Route2_EastBuilding/text.inc
new file mode 100644
index 000000000..228cf3c4d
--- /dev/null
+++ b/data/maps/Route2_EastBuilding/text.inc
@@ -0,0 +1,32 @@
+gUnknown_819D64F:: @ 819D64F
+    .string "Hi! Remember me?\n"
+    .string "I'm one of PROF. OAK's AIDES.\p"
+    .string "If your POKéDEX has complete data\n"
+    .string "on ten species, I'm supposed to\l"
+    .string "give you a reward.\p"
+    .string "PROF. OAK entrusted me with\n"
+    .string "HM05 for you.\p"
+    .string "So, {PLAYER}, let me ask you.\p"
+    .string "Have you gathered data on at least\n"
+    .string "ten kinds of POKéMON?$"
+
+gUnknown_819D74E:: @ 819D74E
+    .string "Great! You have caught or owned\n"
+    .string "{STR_VAR_3} kinds of POKéMON!\p"
+    .string "Congratulations!\n"
+    .string "Here you go!$"
+
+gUnknown_819D7A1:: @ 819D7A1
+    .string "{PLAYER} received HM05\n"
+    .string "from the AIDE.$"
+
+gUnknown_819D7C1:: @ 819D7C1
+    .string "HM05 contains the hidden move\n"
+    .string "FLASH.\p"
+    .string "FLASH lights up even the darkest\n"
+    .string "of caves and dungeons.$"
+
+gUnknown_819D81E:: @ 819D81E
+    .string "Once a POKéMON learns FLASH, you\n"
+    .string "can get through ROCK TUNNEL.$"
+
diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json
new file mode 100644
index 000000000..78d88e7e5
--- /dev/null
+++ b/data/maps/Route2_House/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_ROUTE2_HOUSE",
+  "name": "Route2_House",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_House_EventScript_16F5F9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "51",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_House_EventScript_16F602",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc
new file mode 100644
index 000000000..fd7ac6c05
--- /dev/null
+++ b/data/maps/Route2_House/scripts.inc
@@ -0,0 +1,44 @@
+Route2_House_MapScripts:: @ 816F5F8
+	.byte 0
+
+Route2_House_EventScript_16F5F9:: @ 816F5F9
+	msgbox gUnknown_819D5E7, 2
+	end
+
+Route2_House_EventScript_16F602:: @ 816F602
+	lock
+	faceplayer
+	setvar VAR_0x8008, 0
+	call EventScript_1A8CAD
+	checkflag FLAG_0x248
+	goto_if_eq EventScript_16F674
+	msgbox gUnknown_81A597B, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16F65C
+	call EventScript_1A8CBD
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16F65C
+	call EventScript_1A8CC9
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_16F666
+	call EventScript_1A8CD9
+	msgbox gUnknown_81A59DA
+	setflag FLAG_0x248
+	release
+	end
+
+EventScript_16F65C:: @ 816F65C
+	msgbox gUnknown_81A59B6
+	release
+	end
+
+EventScript_16F666:: @ 816F666
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_81A59C6
+	release
+	end
+
+EventScript_16F674:: @ 816F674
+	msgbox gUnknown_81A59E7
+	release
+	end
diff --git a/data/maps/Route2_House/text.inc b/data/maps/Route2_House/text.inc
new file mode 100644
index 000000000..5fde449d3
--- /dev/null
+++ b/data/maps/Route2_House/text.inc
@@ -0,0 +1,6 @@
+gUnknown_819D5E7:: @ 819D5E7
+    .string "A fainted POKéMON just has no\n"
+    .string "energy left to battle.\p"
+    .string "It can still use moves like CUT\n"
+    .string "outside of battle.$"
+
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
new file mode 100644
index 000000000..06dfcb2ad
--- /dev/null
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE",
+  "name": "Route2_ViridianForest_NorthEntrance",
+  "layout": "LAYOUT_ROUTE2_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "18",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F71E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F727",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F730",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_FOREST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_FOREST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_FOREST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc
new file mode 100644
index 000000000..6ed3f355a
--- /dev/null
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc
@@ -0,0 +1,14 @@
+Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D
+	.byte 0
+
+Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E
+	msgbox gUnknown_819D85C, 2
+	end
+
+Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727
+	msgbox gUnknown_819D8D0, 2
+	end
+
+Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730
+	msgbox gUnknown_819D93B, 2
+	end
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/text.inc b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc
new file mode 100644
index 000000000..630d39fc9
--- /dev/null
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc
@@ -0,0 +1,20 @@
+gUnknown_819D85C:: @ 819D85C
+    .string "Many POKéMON live only in forests \n"
+    .string "and caves.\p"
+    .string "You need to be persistent and look\n"
+    .string "everywhere to get different kinds.$"
+
+gUnknown_819D8D0:: @ 819D8D0
+    .string "Have you noticed the skinny trees\n"
+    .string "on the roadside?\p"
+    .string "They can be cut down by a special\n"
+    .string "POKéMON move, I hear.$"
+
+gUnknown_819D93B:: @ 819D93B
+    .string "Do you know the evolution-cancel\n"
+    .string "technique?\p"
+    .string "When a POKéMON is evolving, you\n"
+    .string "can stop the process.\p"
+    .string "It's a technique for raising\n"
+    .string "POKéMON the way they are.$"
+
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
new file mode 100644
index 000000000..9fcf669d5
--- /dev/null
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE",
+  "name": "Route2_ViridianForest_SouthEntrance",
+  "layout": "LAYOUT_ROUTE2_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5E6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5EF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_FOREST",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc
new file mode 100644
index 000000000..a8aba4941
--- /dev/null
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc
@@ -0,0 +1,10 @@
+Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5
+	.byte 0
+
+Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6
+	msgbox gUnknown_819D52C, 2
+	end
+
+Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF
+	msgbox gUnknown_819D58B, 2
+	end
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/text.inc b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc
new file mode 100644
index 000000000..c92538340
--- /dev/null
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc
@@ -0,0 +1,10 @@
+gUnknown_819D52C:: @ 819D52C
+    .string "Are you going to VIRIDIAN FOREST?\n"
+    .string "It's a natural maze in there.\l"
+    .string "Be careful you don't get lost.$"
+
+gUnknown_819D58B:: @ 819D58B
+    .string "RATTATA may be small, but don't\n"
+    .string "underestimate its wicked bite.\p"
+    .string "Have you caught one already?$"
+
diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json
new file mode 100644
index 000000000..7dd795ed8
--- /dev/null
+++ b/data/maps/Route3/map.json
@@ -0,0 +1,165 @@
+{
+  "id": "MAP_ROUTE3",
+  "name": "Route3",
+  "layout": "LAYOUT_ROUTE3",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_3",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE4",
+      "offset": 60,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_PEWTER_CITY",
+      "offset": -10,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "18",
+      "x": 70,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route3_EventScript_167F78",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 40,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route3_EventScript_1A957B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 32,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route3_EventScript_1A94C1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 30,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route3_EventScript_1A953D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 25,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route3_EventScript_1A9483",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 29,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route3_EventScript_1A9407",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 19,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route3_EventScript_1A94FF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route3_EventScript_1A9445",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 17,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route3_EventScript_1A93C9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 72,
+      "y": 11,
+      "elevation": 0,
+      "script": "Route3_EventScript_167F81"
+    },
+    {
+      "type": "hidden_item",
+      "x": 26,
+      "y": 9,
+      "elevation": 3,
+      "item": "ITEM_ORAN_BERRY",
+      "flag": "113",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc
new file mode 100644
index 000000000..7bf593794
--- /dev/null
+++ b/data/maps/Route3/scripts.inc
@@ -0,0 +1,10 @@
+Route3_MapScripts:: @ 8167F77
+	.byte 0
+
+Route3_EventScript_167F78:: @ 8167F78
+	msgbox gUnknown_8183491, 2
+	end
+
+Route3_EventScript_167F81:: @ 8167F81
+	msgbox gUnknown_81838C0, 3
+	end
diff --git a/data/maps/Route3/text.inc b/data/maps/Route3/text.inc
new file mode 100644
index 000000000..32aa96e19
--- /dev/null
+++ b/data/maps/Route3/text.inc
@@ -0,0 +1,104 @@
+gUnknown_8183491:: @ 8183491
+    .string "Whew… I better take a rest…\n"
+    .string "Groan…\p"
+    .string "That tunnel from CERULEAN takes a\n"
+    .string "lot out of you!$"
+
+Text_1834E6:: @ 81834E6
+    .string "Hey!\n"
+    .string "I saw you in VIRIDIAN FOREST!$"
+
+Text_183509:: @ 8183509
+    .string "You beat me again!$"
+
+Text_18351C:: @ 818351C
+    .string "There are other kinds of POKéMON\n"
+    .string "than the ones you find in forests.$"
+
+Text_183560:: @ 8183560
+    .string "Hi!\n"
+    .string "I like shorts!\p"
+    .string "They're delightfully comfy and\n"
+    .string "easy to wear!$"
+
+Text_1835A0:: @ 81835A0
+    .string "I don't believe it!$"
+
+Text_1835B4:: @ 81835B4
+    .string "Are you using a POKéMON CENTER's\n"
+    .string "PC for storing your POKéMON?\p"
+    .string "Each BOX can hold up to\n"
+    .string "30 POKéMON.$"
+
+Text_183616:: @ 8183616
+    .string "Excuse me!\n"
+    .string "You looked at me, didn't you?$"
+
+Text_18363F:: @ 818363F
+    .string "You're mean!$"
+
+Text_18364C:: @ 818364C
+    .string "You shouldn't be staring if you\n"
+    .string "don't want to battle!$"
+
+Text_183682:: @ 8183682
+    .string "Are you a TRAINER?\n"
+    .string "Let's get with it right away!$"
+
+Text_1836B3:: @ 81836B3
+    .string "If I had new POKéMON, I would've\n"
+    .string "won!$"
+
+Text_1836D9:: @ 81836D9
+    .string "If a POKéMON BOX on the PC gets\n"
+    .string "full, just switch to another BOX.$"
+
+Text_18371B:: @ 818371B
+    .string "That look you gave me…\n"
+    .string "It's so intriguing!$"
+
+Text_183746:: @ 8183746
+    .string "Be nice!$"
+
+Text_18374F:: @ 818374F
+    .string "You can avoid battles by not\n"
+    .string "letting TRAINERS see you.$"
+
+Text_183786:: @ 8183786
+    .string "Hey! You're not wearing shorts!\n"
+    .string "What's wrong with you?$"
+
+Text_1837BD:: @ 81837BD
+    .string "Lost!\n"
+    .string "Lost! Lost!$"
+
+Text_1837CF:: @ 81837CF
+    .string "I always wear shorts, even in\n"
+    .string "winter. That's my policy.$"
+
+Text_183807:: @ 8183807
+    .string "I'll battle you with the POKéMON\n"
+    .string "I just caught.$"
+
+Text_183837:: @ 8183837
+    .string "Done like dinner!$"
+
+Text_183849:: @ 8183849
+    .string "Trained POKéMON are stronger than\n"
+    .string "the wild ones.$"
+
+Text_18387A:: @ 818387A
+    .string "Eek!\n"
+    .string "Did you touch me?$"
+
+Text_183891:: @ 8183891
+    .string "That's it?$"
+
+Text_18389C:: @ 818389C
+    .string "ROUTE 4 is at the foot of\n"
+    .string "MT. MOON.$"
+
+gUnknown_81838C0:: @ 81838C0
+    .string "ROUTE 3\n"
+    .string "MT. MOON AHEAD$"
+
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
new file mode 100644
index 000000000..2afb866f2
--- /dev/null
+++ b/data/maps/Route4/map.json
@@ -0,0 +1,186 @@
+{
+  "id": "MAP_ROUTE4",
+  "name": "Route4",
+  "layout": "LAYOUT_ROUTE4",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_4",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE3",
+      "offset": -60,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_CERULEAN_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "23",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_EventScript_167F8C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 75,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route4_EventScript_1A95B9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 67,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_EventScript_1BE637",
+      "flag": "353"
+    },
+    {
+      "graphics_id": "19",
+      "x": 15,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_EventScript_1ACDEA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 47,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_EventScript_1C494E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 50,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_EventScript_1C49B6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65321",
+      "x": 109,
+      "y": 3,
+      "elevation": 12,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 3,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 19,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_MT_MOON_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 32,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_MT_MOON_B1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE4_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 18,
+      "y": 7,
+      "elevation": 0,
+      "script": "Route4_EventScript_167F95"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 34,
+      "y": 7,
+      "elevation": 0,
+      "script": "Route4_EventScript_167F9E"
+    },
+    {
+      "type": "hidden_item",
+      "x": 43,
+      "y": 2,
+      "elevation": 3,
+      "item": "POCKET_POKE_BALLS",
+      "flag": "50",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "item": "ITEM_PERSIM_BERRY",
+      "flag": "114",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 67,
+      "y": 17,
+      "elevation": 3,
+      "item": "ITEM_RAZZ_BERRY",
+      "flag": "156",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc
new file mode 100644
index 000000000..230c13d3b
--- /dev/null
+++ b/data/maps/Route4/scripts.inc
@@ -0,0 +1,17 @@
+Route4_MapScripts:: @ 8167F8A
+	.byte 0
+
+Route4_EventScript_167F8B:: @ 8167F8B
+	end
+
+Route4_EventScript_167F8C:: @ 8167F8C
+	msgbox gUnknown_81838D7, 2
+	end
+
+Route4_EventScript_167F95:: @ 8167F95
+	msgbox gUnknown_818399B, 3
+	end
+
+Route4_EventScript_167F9E:: @ 8167F9E
+	msgbox gUnknown_81839B4, 3
+	end
diff --git a/data/maps/Route4/text.inc b/data/maps/Route4/text.inc
new file mode 100644
index 000000000..49648cde0
--- /dev/null
+++ b/data/maps/Route4/text.inc
@@ -0,0 +1,24 @@
+gUnknown_81838D7:: @ 81838D7
+    .string "Ouch! I tripped over a rocky\n"
+    .string "POKéMON, GEODUDE!$"
+
+Text_183906:: @ 8183906
+    .string "I came to MT. MOON in search of\n"
+    .string "mushroom POKéMON.$"
+
+Text_183938:: @ 8183938
+    .string "After all I did to catch them!$"
+
+Text_183957:: @ 8183957
+    .string "There might not be any more\n"
+    .string "mushrooms here.\p"
+    .string "I think I got them all.$"
+
+gUnknown_818399B:: @ 818399B
+    .string "MT. MOON\n"
+    .string "Tunnel Entrance$"
+
+gUnknown_81839B4:: @ 81839B4
+    .string "ROUTE 4\n"
+    .string "MT. MOON - CERULEAN CITY$"
+
diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..066ee63c6
--- /dev/null
+++ b/data/maps/Route4_PokemonCenter_1F/map.json
@@ -0,0 +1,127 @@
+{
+  "id": "MAP_ROUTE4_POKEMON_CENTER_1F",
+  "name": "Route4_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_ROUTE_4",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_1F_EventScript_16F8BB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_1F_EventScript_16F75F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_1F_EventScript_16F754",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_1F_EventScript_16F74B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 14,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_1F_EventScript_16F8C4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "105",
+      "x": 12,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_1F_EventScript_16F8CD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE4",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE4",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE4",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_ROUTE4_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..6788cc0c8
--- /dev/null
+++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,169 @@
+Route4_PokemonCenter_1F_MapScripts:: @ 816F739
+	map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744
+	map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744
+	setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F
+	setrespawn SPAWN_ROUTE4
+	end
+
+Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B
+	msgbox gUnknown_819D9D4, 2
+	end
+
+Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754
+	lock
+	msgbox gUnknown_819DA3A
+	release
+	end
+
+Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F
+	lock
+	faceplayer
+	checkflag FLAG_0x249
+	goto_if_eq EventScript_16F8A2
+	showmoneybox 0, 0, 0
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16F786
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F794
+	end
+
+EventScript_16F786:: @ 816F786
+	msgbox gUnknown_819DA9A, MSGBOX_YESNO
+	goto EventScript_16F7A2
+	end
+
+EventScript_16F794:: @ 816F794
+	msgbox gUnknown_819DB34, MSGBOX_YESNO
+	goto EventScript_16F7A2
+	end
+
+EventScript_16F7A2:: @ 816F7A2
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16F888
+	checkmoney 500, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16F895
+	textcolor 3
+	setvar VAR_0x4001, 129
+	givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16F7F6
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F822
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_16F8AC
+	end
+
+EventScript_16F7F6:: @ 816F7F6
+	call EventScript_16F86F
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16F861
+	call EventScript_1A8C27
+	fadescreen 1
+	hidemoneybox
+	.byte 0
+	.byte 0
+	special ChangePokemonNickname
+	waitstate
+	goto EventScript_16F86A
+	end
+
+EventScript_16F822:: @ 816F822
+	call EventScript_16F86F
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16F84B
+	fadescreen 1
+	hidemoneybox
+	.byte 0
+	.byte 0
+	special ChangeBoxPokemonNickname
+	waitstate
+	lock
+	faceplayer
+	goto EventScript_16F856
+	end
+
+EventScript_16F84B:: @ 816F84B
+	call EventScript_1A8C3C
+	goto EventScript_16F861
+	end
+
+EventScript_16F856:: @ 816F856
+	call EventScript_1A8C3C
+	goto EventScript_16F86A
+	end
+
+EventScript_16F861:: @ 816F861
+	hidemoneybox
+	.byte 0
+	.byte 0
+	goto EventScript_16F86A
+	end
+
+EventScript_16F86A:: @ 816F86A
+	setflag FLAG_0x249
+	release
+	end
+
+EventScript_16F86F:: @ 816F86F
+	takemoney 500, 0
+	updatemoneybox 0, 0, 0
+	playfanfare MUS_FANFA1
+	message Text_19DBD3
+	waitmessage
+	waitfanfare
+	getspeciesname 0, SPECIES_MAGIKARP
+	return
+
+EventScript_16F888:: @ 816F888
+	msgbox gUnknown_819DC07
+	hidemoneybox
+	.byte 0
+	.byte 0
+	release
+	end
+
+EventScript_16F895:: @ 816F895
+	msgbox gUnknown_819DC78
+	hidemoneybox
+	.byte 0
+	.byte 0
+	release
+	end
+
+EventScript_16F8A2:: @ 816F8A2
+	msgbox gUnknown_819DC9A
+	release
+	end
+
+EventScript_16F8AC:: @ 816F8AC
+	textcolor 0
+	msgbox gUnknown_819DC3E
+	hidemoneybox
+	.byte 0
+	.byte 0
+	release
+	end
+
+Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4
+	msgbox gUnknown_819DCDB, 2
+	end
+
+Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD
+	lock
+	msgbox gUnknown_819DD54
+	release
+	end
diff --git a/data/maps/Route4_PokemonCenter_1F/text.inc b/data/maps/Route4_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..f357b7f76
--- /dev/null
+++ b/data/maps/Route4_PokemonCenter_1F/text.inc
@@ -0,0 +1,54 @@
+gUnknown_819D9D4:: @ 819D9D4
+    .string "Okay, set six POKé BALLS in my\n"
+    .string "belt…\p"
+    .string "Yeah, that'll do it. At most, you\n"
+    .string "can have six POKéMON with you.$"
+
+gUnknown_819DA3A:: @ 819DA3A
+    .string "TEAM ROCKET attacks CERULEAN\n"
+    .string "citizens…\p"
+    .string "Not a day goes by without TEAM\n"
+    .string "ROCKET being in the news.$"
+
+gUnknown_819DA9A:: @ 819DA9A
+    .string "MAN: Hello there, laddie!\n"
+    .string "Have I got a deal just for you!\p"
+    .string "I'll let you have a secret POKéMON\n"
+    .string "- a MAGIKARP - for just ¥500!\p"
+    .string "So, you'll buy it, am I right?$"
+
+gUnknown_819DB34:: @ 819DB34
+    .string "MAN: Hello there, sweetie pie!\n"
+    .string "Have I got a deal just for you!\p"
+    .string "I'll let you have a secret POKéMON\n"
+    .string "- a MAGIKARP - for just ¥500!\p"
+    .string "So, you'll buy it, am I right?$"
+
+Text_19DBD3:: @ 819DBD3
+    .string "{PLAYER} paid an outrageous ¥500\n"
+    .string "and bought the MAGIKARP…$"
+
+gUnknown_819DC07:: @ 819DC07
+    .string "No? You say no? I'm only doing this\n"
+    .string "as a favor to you!$"
+
+gUnknown_819DC3E:: @ 819DC3E
+    .string "There's no more room for any more\n"
+    .string "POKéMON, it looks like.$"
+
+gUnknown_819DC78:: @ 819DC78
+    .string "You'll need more money than that!$"
+
+gUnknown_819DC9A:: @ 819DC9A
+    .string "MAN: Well, I don't give refunds.\n"
+    .string "You knew what you were getting!$"
+
+gUnknown_819DCDB:: @ 819DCDB
+    .string "Sometimes, you'll have too many\n"
+    .string "POKéMON with you to add any more.\p"
+    .string "In that case, you should just\n"
+    .string "store some using any PC.$"
+
+gUnknown_819DD54:: @ 819DD54
+    .string "It's a newspaper.$"
+
diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..0852a5537
--- /dev/null
+++ b/data/maps/Route4_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_ROUTE4_POKEMON_CENTER_2F",
+  "name": "Route4_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_ROUTE_4",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_ROUTE4_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..bff6832da
--- /dev/null
+++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8
+	map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED
+	call EventScript_1BB4A3
+	end
+
+EventScript_16F8F3:: @ 816F8F3
+	call EventScript_1BB6AB
+	end
+
+EventScript_16F8F9:: @ 816F8F9
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json
new file mode 100644
index 000000000..0c79d7687
--- /dev/null
+++ b/data/maps/Route5/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_ROUTE5",
+  "name": "Route5",
+  "layout": "LAYOUT_ROUTE5",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_5",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_CERULEAN_CITY",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_SAFFRON_CITY",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 31,
+      "y": 31,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 23,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE5_POKEMON_DAY_CARE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 24,
+      "y": 32,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 25,
+      "y": 32,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 32,
+      "y": 32,
+      "elevation": 0,
+      "script": "Route5_EventScript_167FA8"
+    }
+  ]
+}
diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc
new file mode 100644
index 000000000..8356751b7
--- /dev/null
+++ b/data/maps/Route5/scripts.inc
@@ -0,0 +1,6 @@
+Route5_MapScripts:: @ 8167FA7
+	.byte 0
+
+Route5_EventScript_167FA8:: @ 8167FA8
+	msgbox gUnknown_8183DD4, 3
+	end
diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc
new file mode 100644
index 000000000..066d8cfa6
--- /dev/null
+++ b/data/maps/Route5/text.inc
@@ -0,0 +1,60 @@
+Text_1839D5:: @ 81839D5
+    .string "A punch of roaring ferocity!\p"
+    .string "Packed with destructive power!\p"
+    .string "When the chips are down,\n"
+    .string "MEGA PUNCH is the ultimate attack!\l"
+    .string "You agree, yes?\p"
+    .string "Now!\n"
+    .string "Let me teach it to your POKéMON!$"
+
+Text_183A83:: @ 8183A83
+    .string "You'll be back when you understand\n"
+    .string "the worth of MEGA PUNCH.$"
+
+Text_183ABF:: @ 8183ABF
+    .string "Fine!\n"
+    .string "Which POKéMON will learn it?$"
+
+Text_183AE2:: @ 8183AE2
+    .string "Now, we are comrades in the way of\n"
+    .string "punching!\p"
+    .string "You should go before you're seen\n"
+    .string "by the misguided fool who trains\l"
+    .string "only his silly kicking over there.$"
+
+Text_183B74:: @ 8183B74
+    .string "A kick of brutal ferocity!\p"
+    .string "Packed with destructive power!\p"
+    .string "When you get right down to it,\n"
+    .string "MEGA KICK is the ultimate attack!\l"
+    .string "Don't you agree?\p"
+    .string "Okay!\n"
+    .string "I'll teach it to your POKéMON!$"
+
+Text_183C25:: @ 8183C25
+    .string "You'll come crawling back when you\n"
+    .string "realize the value of MEGA KICK.$"
+
+Text_183C68:: @ 8183C68
+    .string "All right!\n"
+    .string "Which POKéMON wants to learn it?$"
+
+Text_183C94:: @ 8183C94
+    .string "Now, we are soul mates in the way\n"
+    .string "of kicking!\p"
+    .string "You should run before you're seen\n"
+    .string "by the deluded nitwit who trains\l"
+    .string "only simple punching over there.$"
+
+Text_183D26:: @ 8183D26
+    .string "Oh, wow, that's the BOULDERBADGE!\n"
+    .string "You got it from BROCK, didn't you?\p"
+    .string "BROCK is cool. He's not just tough.\n"
+    .string "People like and respect him.\p"
+    .string "I want to become a GYM LEADER\n"
+    .string "like him.$"
+
+gUnknown_8183DD4:: @ 8183DD4
+    .string "UNDERGROUND PATH\n"
+    .string "CERULEAN CITY - VERMILION CITY$"
+
diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json
new file mode 100644
index 000000000..18409b100
--- /dev/null
+++ b/data/maps/Route5_PokemonDayCare/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_ROUTE5_POKEMON_DAY_CARE",
+  "name": "Route5_PokemonDayCare",
+  "layout": "LAYOUT_ROUTE5_POKEMON_DAY_CARE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_5",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route5_PokemonDayCare_EventScript_1BF398",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE5",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE5",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE5",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/Route5_PokemonDayCare/scripts.inc b/data/maps/Route5_PokemonDayCare/scripts.inc
new file mode 100644
index 000000000..ebe6a8386
--- /dev/null
+++ b/data/maps/Route5_PokemonDayCare/scripts.inc
@@ -0,0 +1,2 @@
+Route5_PokemonDayCare_MapScripts:: @ 816F8FF
+	.byte 0
diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json
new file mode 100644
index 000000000..fe0565acb
--- /dev/null
+++ b/data/maps/Route5_SouthEntrance/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_ROUTE5_SOUTH_ENTRANCE",
+  "name": "Route5_SouthEntrance",
+  "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_5",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route5_SouthEntrance_EventScript_16F901",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE5",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE5",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route5_SouthEntrance_EventScript_16F90A"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route5_SouthEntrance_EventScript_16F916"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route5_SouthEntrance_EventScript_16F922"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc
new file mode 100644
index 000000000..1ac21c6b1
--- /dev/null
+++ b/data/maps/Route5_SouthEntrance/scripts.inc
@@ -0,0 +1,88 @@
+Route5_SouthEntrance_MapScripts:: @ 816F900
+	.byte 0
+
+Route5_SouthEntrance_EventScript_16F901:: @ 816F901
+	msgbox gUnknown_819E16D, 2
+	end
+
+Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16F92E
+	end
+
+Route5_SouthEntrance_EventScript_16F916:: @ 816F916
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16F92E
+	end
+
+Route5_SouthEntrance_EventScript_16F922:: @ 816F922
+	lockall
+	setvar VAR_0x4001, 2
+	goto EventScript_16F92E
+	end
+
+EventScript_16F92E:: @ 816F92E
+	textcolor 0
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	checkflag FLAG_0x2A6
+	goto_if_eq EventScript_16F958
+	msgbox gUnknown_819E04B
+	closemessage
+	applymovement 255, Movement_16F9C4
+	waitmovement 0
+	releaseall
+	end
+
+EventScript_16F958:: @ 816F958
+	removeitem ITEM_TEA, 1
+	goto EventScript_16F963
+	end
+
+EventScript_16F963:: @ 816F963
+	msgbox gUnknown_819E09B
+	closemessage
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16F99C
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16F9A7
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16F9B2
+	msgbox gUnknown_819E0C1
+	setvar VAR_0x4062, 1
+	releaseall
+	end
+
+EventScript_16F99C:: @ 816F99C
+	applymovement 255, Movement_16F9C2
+	waitmovement 0
+	return
+
+EventScript_16F9A7:: @ 816F9A7
+	applymovement 255, Movement_16F9BD
+	waitmovement 0
+	return
+
+EventScript_16F9B2:: @ 816F9B2
+	applymovement 255, Movement_16F9BF
+	waitmovement 0
+	return
+
+Movement_16F9BD:: @ 816F9BD
+	step_12
+	step_end
+
+Movement_16F9BF:: @ 816F9BF
+	step_12
+	step_12
+	step_end
+
+Movement_16F9C2:: @ 816F9C2
+	step_27
+	step_end
+
+Movement_16F9C4:: @ 816F9C4
+	step_11
+	step_end
diff --git a/data/maps/Route5_SouthEntrance/text.inc b/data/maps/Route5_SouthEntrance/text.inc
new file mode 100644
index 000000000..079423f34
--- /dev/null
+++ b/data/maps/Route5_SouthEntrance/text.inc
@@ -0,0 +1,95 @@
+Text_19DD66:: @ 819DD66
+    .string "I run the DAY-CARE service.\p"
+    .string "Would you like me to raise one of\n"
+    .string "your POKéMON?$"
+
+Text_19DDB2:: @ 819DDB2
+    .string "Come again.$"
+
+Text_19DDBE:: @ 819DDBE
+    .string "Which POKéMON should I raise?$"
+
+Text_19DDDC:: @ 819DDDC
+    .string "Fine.\n"
+    .string "Come anytime you like.$"
+
+Text_19DDF9:: @ 819DDF9
+    .string "Fine, I'll look after your\n"
+    .string "{STR_VAR_1} for a while.$"
+
+Text_19DE24:: @ 819DE24
+    .string "Come see me in a while.$"
+
+Text_19DE3C:: @ 819DE3C
+    .string "You're back already?\p"
+    .string "Your {STR_VAR_1} needs to spend\n"
+    .string "some more time with me.$"
+
+Text_19DE80:: @ 819DE80
+    .string "You owe me ¥{STR_VAR_2} for the return\n"
+    .string "of this POKéMON.$"
+
+Text_19DEAF:: @ 819DEAF
+    .string "Thank you!\n"
+    .string "Here's your POKéMON.$"
+
+Text_19DECF:: @ 819DECF
+    .string "{PLAYER} got {STR_VAR_1} back\n"
+    .string "from the DAY-CARE MAN.$"
+
+Text_19DEF5:: @ 819DEF5
+    .string "Oh? You only have one POKéMON\n"
+    .string "with you.$"
+
+Text_19DF1D:: @ 819DF1D
+    .string "If you leave me that POKéMON,\n"
+    .string "what will you battle with?$"
+
+Text_19DF56:: @ 819DF56
+    .string "Your {STR_VAR_1} has grown a lot.\n"
+    .string "Yes, quite a lot, I'd say.\p"
+    .string "Let me see…\n"
+    .string "By level, it's grown by {STR_VAR_2}.\p"
+    .string "Aren't I great?$"
+
+Text_19DFC2:: @ 819DFC2
+    .string "You can't take this POKéMON back\n"
+    .string "if you've got no room for it.$"
+
+Text_19E001:: @ 819E001
+    .string "You don't have enough money.$"
+
+Text_19E01E:: @ 819E01E
+    .string "きみの\n"
+    .string "みてみるかね？$"
+
+Text_19E02A:: @ 819E02A
+    .string "わるいけど　ひでんのわざを　もった\n"
+    .string "ポケモンは　あずかれないなぁ$"
+
+gUnknown_819E04B:: @ 819E04B
+    .string "I'm on guard duty.\n"
+    .string "Gee, I'm thirsty, though!\p"
+    .string "Oh, wait there, the road's closed.$"
+
+gUnknown_819E09B:: @ 819E09B
+    .string "Oh, that TEA…\n"
+    .string "It looks awfully tasty…$"
+
+gUnknown_819E0C1:: @ 819E0C1
+    .string "Huh? I can have this drink?\n"
+    .string "Gee, thanks!\l"
+    .string "… …\l"
+    .string "Glug, glug…\l"
+    .string "… …\l"
+    .string "Gulp…\l"
+    .string "If you want to go to SAFFRON\l"
+    .string "CITY…\l"
+    .string "… …\l"
+    .string "You can go on through.\p"
+    .string "I'll share this TEA with the other\n"
+    .string "guards!$"
+
+gUnknown_819E16D:: @ 819E16D
+    .string "Hi, how's it going?$"
+
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
new file mode 100644
index 000000000..7a1c9b9f1
--- /dev/null
+++ b/data/maps/Route6/map.json
@@ -0,0 +1,157 @@
+{
+  "id": "MAP_ROUTE6",
+  "name": "Route6",
+  "layout": "LAYOUT_ROUTE6",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_6",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SAFFRON_CITY",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_VERMILION_CITY",
+      "offset": -12,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "20",
+      "x": 3,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route6_EventScript_1A9999",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 12,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route6_EventScript_1A9A15",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 13,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route6_EventScript_1A9A91",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 20,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A99D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 13,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A9ACF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 13,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A9A53",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 19,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 15,
+      "elevation": 0,
+      "script": "Route6_EventScript_167FB2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_SITRUS_BERRY",
+      "flag": "118",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "119",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc
new file mode 100644
index 000000000..773e1c091
--- /dev/null
+++ b/data/maps/Route6/scripts.inc
@@ -0,0 +1,6 @@
+Route6_MapScripts:: @ 8167FB1
+	.byte 0
+
+Route6_EventScript_167FB2:: @ 8167FB2
+	msgbox gUnknown_8184067, 3
+	end
diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc
new file mode 100644
index 000000000..b8ae84e32
--- /dev/null
+++ b/data/maps/Route6/text.inc
@@ -0,0 +1,73 @@
+Text_183E04:: @ 8183E04
+    .string "Who's there?\n"
+    .string "Quit listening in on us!$"
+
+Text_183E2A:: @ 8183E2A
+    .string "I just can't win!$"
+
+Text_183E3C:: @ 8183E3C
+    .string "Whisper…\n"
+    .string "Whisper…$"
+
+Text_183E4E:: @ 8183E4E
+    .string "Excuse me!\n"
+    .string "This is a private conversation!$"
+
+Text_183E79:: @ 8183E79
+    .string "Ugh!\n"
+    .string "I hate losing.$"
+
+Text_183E8D:: @ 8183E8D
+    .string "Whisper…\n"
+    .string "Whisper…$"
+
+Text_183E9F:: @ 8183E9F
+    .string "There aren't many bugs out here.$"
+
+Text_183EC0:: @ 8183EC0
+    .string "No!\n"
+    .string "You're kidding!$"
+
+Text_183ED4:: @ 8183ED4
+    .string "I like bugs, so I'm going back to\n"
+    .string "VIRIDIAN FOREST.$"
+
+Text_183F07:: @ 8183F07
+    .string "Huh?\n"
+    .string "You want to talk to me?$"
+
+Text_183F24:: @ 8183F24
+    .string "This stinks…\n"
+    .string "I couldn't beat your challenge…$"
+
+Text_183F51:: @ 8183F51
+    .string "I should bring more POKéMON with\n"
+    .string "me. I'll feel safer that way.$"
+
+Text_183F90:: @ 8183F90
+    .string "Me?\n"
+    .string "Well, okay. I'll play!$"
+
+Text_183FAB:: @ 8183FAB
+    .string "Things just didn't work…$"
+
+Text_183FC4:: @ 8183FC4
+    .string "I want to get stronger.\n"
+    .string "What's your secret?$"
+
+Text_183FF0:: @ 8183FF0
+    .string "I've never seen you around.\n"
+    .string "Are you good?$"
+
+Text_18401A:: @ 818401A
+    .string "You're too good!$"
+
+Text_18402B:: @ 818402B
+    .string "Are my POKéMON weak?\n"
+    .string "Or, am I just bad?\l"
+    .string "Which do you think?$"
+
+gUnknown_8184067:: @ 8184067
+    .string "UNDERGROUND PATH\n"
+    .string "CERULEAN CITY - VERMILION CITY$"
+
diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json
new file mode 100644
index 000000000..e22d5be5d
--- /dev/null
+++ b/data/maps/Route6_NorthEntrance/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_ROUTE6_NORTH_ENTRANCE",
+  "name": "Route6_NorthEntrance",
+  "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_6",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route6_NorthEntrance_EventScript_16F9C7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route6_NorthEntrance_EventScript_16F9D0"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route6_NorthEntrance_EventScript_16F9DC"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route6_NorthEntrance_EventScript_16F9E8"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc
new file mode 100644
index 000000000..9537d2e82
--- /dev/null
+++ b/data/maps/Route6_NorthEntrance/scripts.inc
@@ -0,0 +1,88 @@
+Route6_NorthEntrance_MapScripts:: @ 816F9C6
+	.byte 0
+
+Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7
+	msgbox gUnknown_819E2A3, 2
+	end
+
+Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16F9F4
+	end
+
+Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16F9F4
+	end
+
+Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8
+	lockall
+	setvar VAR_0x4001, 2
+	goto EventScript_16F9F4
+	end
+
+EventScript_16F9F4:: @ 816F9F4
+	textcolor 0
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	checkflag FLAG_0x2A6
+	goto_if_eq EventScript_16FA1E
+	msgbox gUnknown_819E181
+	closemessage
+	applymovement 255, Movement_16FA8A
+	waitmovement 0
+	releaseall
+	end
+
+EventScript_16FA1E:: @ 816FA1E
+	removeitem ITEM_TEA, 1
+	goto EventScript_16FA29
+	end
+
+EventScript_16FA29:: @ 816FA29
+	msgbox gUnknown_819E1D1
+	closemessage
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16FA62
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16FA6D
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16FA78
+	msgbox gUnknown_819E1F7
+	setvar VAR_0x4062, 1
+	releaseall
+	end
+
+EventScript_16FA62:: @ 816FA62
+	applymovement 255, Movement_16FA83
+	waitmovement 0
+	return
+
+EventScript_16FA6D:: @ 816FA6D
+	applymovement 255, Movement_16FA86
+	waitmovement 0
+	return
+
+EventScript_16FA78:: @ 816FA78
+	applymovement 255, Movement_16FA88
+	waitmovement 0
+	return
+
+Movement_16FA83:: @ 816FA83
+	step_13
+	step_13
+	step_end
+
+Movement_16FA86:: @ 816FA86
+	step_13
+	step_end
+
+Movement_16FA88:: @ 816FA88
+	step_28
+	step_end
+
+Movement_16FA8A:: @ 816FA8A
+	step_10
+	step_end
diff --git a/data/maps/Route6_NorthEntrance/text.inc b/data/maps/Route6_NorthEntrance/text.inc
new file mode 100644
index 000000000..3d581e1fb
--- /dev/null
+++ b/data/maps/Route6_NorthEntrance/text.inc
@@ -0,0 +1,26 @@
+gUnknown_819E181:: @ 819E181
+    .string "I'm on guard duty.\n"
+    .string "Gee, I'm thirsty, though!\p"
+    .string "Oh, wait there, the road's closed.$"
+
+gUnknown_819E1D1:: @ 819E1D1
+    .string "Oh, that TEA…\n"
+    .string "It looks awfully tasty…$"
+
+gUnknown_819E1F7:: @ 819E1F7
+    .string "Huh? I can have this drink?\n"
+    .string "Gee, thanks!\l"
+    .string "… …\l"
+    .string "Glug, glug…\l"
+    .string "… …\l"
+    .string "Gulp…\l"
+    .string "If you want to go to SAFFRON\l"
+    .string "CITY…\l"
+    .string "… …\l"
+    .string "You can go on through.\p"
+    .string "I'll share this TEA with the other\n"
+    .string "guards!$"
+
+gUnknown_819E2A3:: @ 819E2A3
+    .string "Hi, how's it going?$"
+
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
new file mode 100644
index 000000000..8c889d5c2
--- /dev/null
+++ b/data/maps/Route7/map.json
@@ -0,0 +1,76 @@
+{
+  "id": "MAP_ROUTE7",
+  "name": "Route7",
+  "layout": "LAYOUT_ROUTE7",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_7",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_CELADON_CITY",
+      "offset": -10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_SAFFRON_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "65375",
+      "x": 65528,
+      "y": 12,
+      "elevation": 10,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 6,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE7_EAST_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 14,
+      "elevation": 0,
+      "script": "Route7_EventScript_167FBC"
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_WEPEAR_BERRY",
+      "flag": "152",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc
new file mode 100644
index 000000000..ec34892f4
--- /dev/null
+++ b/data/maps/Route7/scripts.inc
@@ -0,0 +1,6 @@
+Route7_MapScripts:: @ 8167FBB
+	.byte 0
+
+Route7_EventScript_167FBC:: @ 8167FBC
+	msgbox gUnknown_8184097, 3
+	end
diff --git a/data/maps/Route7/text.inc b/data/maps/Route7/text.inc
new file mode 100644
index 000000000..3f1cdda5b
--- /dev/null
+++ b/data/maps/Route7/text.inc
@@ -0,0 +1,4 @@
+gUnknown_8184097:: @ 8184097
+    .string "UNDERGROUND PATH\n"
+    .string "CELADON CITY - LAVENDER TOWN$"
+
diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json
new file mode 100644
index 000000000..a2c775f2c
--- /dev/null
+++ b/data/maps/Route7_EastEntrance/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_ROUTE7_EAST_ENTRANCE",
+  "name": "Route7_EastEntrance",
+  "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_7",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route7_EastEntrance_EventScript_16FA8E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE7",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE7",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route7_EastEntrance_EventScript_16FA97"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route7_EastEntrance_EventScript_16FAA3"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route7_EastEntrance_EventScript_16FAAF"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc
new file mode 100644
index 000000000..845eab835
--- /dev/null
+++ b/data/maps/Route7_EastEntrance/scripts.inc
@@ -0,0 +1,88 @@
+Route7_EastEntrance_MapScripts:: @ 816FA8D
+	.byte 0
+
+Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E
+	msgbox gUnknown_819E3D9, 2
+	end
+
+Route7_EastEntrance_EventScript_16FA97:: @ 816FA97
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16FABB
+	end
+
+Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16FABB
+	end
+
+Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF
+	lockall
+	setvar VAR_0x4001, 2
+	goto EventScript_16FABB
+	end
+
+EventScript_16FABB:: @ 816FABB
+	textcolor 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	checkflag FLAG_0x2A6
+	goto_if_eq EventScript_16FAE5
+	msgbox gUnknown_819E2B7
+	closemessage
+	applymovement 255, Movement_16FB51
+	waitmovement 0
+	releaseall
+	end
+
+EventScript_16FAE5:: @ 816FAE5
+	removeitem ITEM_TEA, 1
+	goto EventScript_16FAF0
+	end
+
+EventScript_16FAF0:: @ 816FAF0
+	msgbox gUnknown_819E307
+	closemessage
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16FB29
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16FB34
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16FB3F
+	msgbox gUnknown_819E32D
+	setvar VAR_0x4062, 1
+	releaseall
+	end
+
+EventScript_16FB29:: @ 816FB29
+	applymovement 255, Movement_16FB4F
+	waitmovement 0
+	return
+
+EventScript_16FB34:: @ 816FB34
+	applymovement 255, Movement_16FB4A
+	waitmovement 0
+	return
+
+EventScript_16FB3F:: @ 816FB3F
+	applymovement 255, Movement_16FB4C
+	waitmovement 0
+	return
+
+Movement_16FB4A:: @ 816FB4A
+	step_11
+	step_end
+
+Movement_16FB4C:: @ 816FB4C
+	step_11
+	step_11
+	step_end
+
+Movement_16FB4F:: @ 816FB4F
+	step_26
+	step_end
+
+Movement_16FB51:: @ 816FB51
+	step_12
+	step_end
diff --git a/data/maps/Route7_EastEntrance/text.inc b/data/maps/Route7_EastEntrance/text.inc
new file mode 100644
index 000000000..94db43e94
--- /dev/null
+++ b/data/maps/Route7_EastEntrance/text.inc
@@ -0,0 +1,26 @@
+gUnknown_819E2B7:: @ 819E2B7
+    .string "I'm on guard duty.\n"
+    .string "Gee, I'm thirsty, though!\p"
+    .string "Oh, wait there, the road's closed.$"
+
+gUnknown_819E307:: @ 819E307
+    .string "Oh, that TEA…\n"
+    .string "It looks awfully tasty…$"
+
+gUnknown_819E32D:: @ 819E32D
+    .string "Huh? I can have this drink?\n"
+    .string "Gee, thanks!\l"
+    .string "… …\l"
+    .string "Glug, glug…\l"
+    .string "… …\l"
+    .string "Gulp…\l"
+    .string "If you want to go to SAFFRON\l"
+    .string "CITY…\l"
+    .string "… …\l"
+    .string "You can go on through.\p"
+    .string "I'll share this TEA with the other\n"
+    .string "guards!$"
+
+gUnknown_819E3D9:: @ 819E3D9
+    .string "Hi, how's it going?$"
+
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
new file mode 100644
index 000000000..6a5534a2c
--- /dev/null
+++ b/data/maps/Route8/map.json
@@ -0,0 +1,276 @@
+{
+  "id": "MAP_ROUTE8",
+  "name": "Route8",
+  "layout": "LAYOUT_ROUTE8",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_8",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SAFFRON_CITY",
+      "offset": -10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_LAVENDER_TOWN",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 62,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 6,
+      "script": "Route8_EventScript_1AA1D5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 55,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route8_EventScript_1AA30B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 51,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route8_EventScript_1AA251",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 29,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route8_EventScript_1AA11B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 29,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 6,
+      "script": "Route8_EventScript_1AA28F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 29,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route8_EventScript_1AA159",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 29,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 6,
+      "script": "Route8_EventScript_1AA197",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 21,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route8_EventScript_1AA2CD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route8_EventScript_1AA213",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 33,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route8_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "95",
+      "x": 47,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route8_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "17",
+      "x": 40,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route8_EventScript_1AA349",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 41,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route8_EventScript_1AA38F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 14,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "52",
+      "movement_range_x": 5,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route8_EventScript_1AA3D5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 24,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "41",
+      "movement_range_x": 5,
+      "movement_range_y": 5,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route8_EventScript_1AA413",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE8_WEST_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 16,
+      "y": 5,
+      "elevation": 0,
+      "script": "Route8_EventScript_167FC6"
+    },
+    {
+      "type": "hidden_item",
+      "x": 42,
+      "y": 10,
+      "elevation": 3,
+      "item": "ITEM_RAWST_BERRY",
+      "flag": "127",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 38,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_LUM_BERRY",
+      "flag": "128",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 42,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_LEPPA_BERRY",
+      "flag": "129",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc
new file mode 100644
index 000000000..d2bc3749b
--- /dev/null
+++ b/data/maps/Route8/scripts.inc
@@ -0,0 +1,6 @@
+Route8_MapScripts:: @ 8167FC5
+	.byte 0
+
+Route8_EventScript_167FC6:: @ 8167FC6
+	msgbox gUnknown_8184576, 3
+	end
diff --git a/data/maps/Route8/text.inc b/data/maps/Route8/text.inc
new file mode 100644
index 000000000..83f725c6a
--- /dev/null
+++ b/data/maps/Route8/text.inc
@@ -0,0 +1,110 @@
+Text_1840C5:: @ 81840C5
+    .string "You look good at POKéMON, but how\n"
+    .string "is your chemistry grade?$"
+
+Text_184100:: @ 8184100
+    .string "Ow!\n"
+    .string "Meltdown!$"
+
+Text_18410E:: @ 818410E
+    .string "I am better at school than this!$"
+
+Text_18412F:: @ 818412F
+    .string "All right!\n"
+    .string "Let's play a game!$"
+
+Text_18414D:: @ 818414D
+    .string "Drat!\n"
+    .string "Came up short!$"
+
+Text_184162:: @ 8184162
+    .string "Things didn't work today.$"
+
+Text_18417C:: @ 818417C
+    .string "You should be informed.\n"
+    .string "You need strategy to win at this!$"
+
+Text_1841B6:: @ 81841B6
+    .string "It's not logical!$"
+
+Text_1841C8:: @ 81841C8
+    .string "Go with GRIMER first…and…\n"
+    .string "…and…then…$"
+
+Text_1841ED:: @ 81841ED
+    .string "I like NIDORAN, so I collect them!$"
+
+Text_184210:: @ 8184210
+    .string "Why?\n"
+    .string "Why??$"
+
+Text_18421B:: @ 818421B
+    .string "When POKéMON grow up, they get\n"
+    .string "ugly! They shouldn't evolve.$"
+
+Text_184257:: @ 8184257
+    .string "School is fun, but so are POKéMON.$"
+
+Text_18427A:: @ 818427A
+    .string "You made it clear to me that\n"
+    .string "I should stick with school.$"
+
+Text_1842B3:: @ 81842B3
+    .string "I was planning on getting some\n"
+    .string "fresh air for a change, but…\p"
+    .string "We're stuck here because of the\n"
+    .string "gates at SAFFRON.$"
+
+Text_184321:: @ 8184321
+    .string "MEOWTH is so cute, meow, meow,\n"
+    .string "meow!$"
+
+Text_184346:: @ 8184346
+    .string "Meeeeyow!$"
+
+Text_184350:: @ 8184350
+    .string "I think PIDGEY and RATTATA are\n"
+    .string "cute, too!$"
+
+Text_18437A:: @ 818437A
+    .string "We must look silly standing here\n"
+    .string "like this.$"
+
+Text_1843A6:: @ 81843A6
+    .string "Look what you did to my poor, cute\n"
+    .string "POKéMON!$"
+
+Text_1843D2:: @ 81843D2
+    .string "SAFFRON's gatekeeper won't let us\n"
+    .string "go through.\p"
+    .string "I know he's doing his job, but I\n"
+    .string "think he's mean.$"
+
+Text_184432:: @ 8184432
+    .string "I'm a rambling, gaming dude!$"
+
+Text_18444F:: @ 818444F
+    .string "Missed the big chance!$"
+
+Text_184466:: @ 8184466
+    .string "Playing games and POKéMON are like\n"
+    .string "eating peanuts! I just can't stop!$"
+
+Text_1844AC:: @ 81844AC
+    .string "What's a cute, round, and fluffy\n"
+    .string "POKéMON?$"
+
+Text_1844D6:: @ 81844D6
+    .string "Stop!\p"
+    .string "Don't be so mean to my CLEFAIRY!$"
+
+Text_1844FD:: @ 81844FD
+    .string "I read that CLEFAIRY evolves when\n"
+    .string "it's exposed to a MOON STONE.\p"
+    .string "I read that in a POKéMON JOURNAL.\n"
+    .string "I wonder if it's true?$"
+
+gUnknown_8184576:: @ 8184576
+    .string "UNDERGROUND PATH\n"
+    .string "CELADON CITY - LAVENDER TOWN$"
+
diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json
new file mode 100644
index 000000000..d9736b5eb
--- /dev/null
+++ b/data/maps/Route8_WestEntrance/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_ROUTE8_WEST_ENTRANCE",
+  "name": "Route8_WestEntrance",
+  "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_8",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "60",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route8_WestEntrance_EventScript_16FB54",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE8",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE8",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route8_WestEntrance_EventScript_16FB5D"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route8_WestEntrance_EventScript_16FB69"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4062",
+      "var_value": 0,
+      "script": "Route8_WestEntrance_EventScript_16FB75"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc
new file mode 100644
index 000000000..1d347d2d0
--- /dev/null
+++ b/data/maps/Route8_WestEntrance/scripts.inc
@@ -0,0 +1,98 @@
+Route8_WestEntrance_MapScripts:: @ 816FB53
+	.byte 0
+
+Route8_WestEntrance_EventScript_16FB54:: @ 816FB54
+	msgbox gUnknown_819E50F, 2
+	end
+
+Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_16FB81
+	end
+
+Route8_WestEntrance_EventScript_16FB69:: @ 816FB69
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_16FB81
+	end
+
+Route8_WestEntrance_EventScript_16FB75:: @ 816FB75
+	lockall
+	setvar VAR_0x4001, 2
+	goto EventScript_16FB81
+	end
+
+EventScript_16FB81:: @ 816FB81
+	textcolor 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	checkflag FLAG_0x2A6
+	goto_if_eq EventScript_16FBAB
+	msgbox gUnknown_819E3ED
+	closemessage
+	applymovement 255, Movement_16FC2D
+	waitmovement 0
+	releaseall
+	end
+
+EventScript_16FBAB:: @ 816FBAB
+	removeitem ITEM_TEA, 1
+	goto EventScript_16FBCC
+	end
+
+EventScript_16FBB6:: @ 816FBB6
+	removeitem ITEM_SODA_POP, 1
+	goto EventScript_16FBCC
+	end
+
+EventScript_16FBC1:: @ 816FBC1
+	removeitem ITEM_LEMONADE, 1
+	goto EventScript_16FBCC
+	end
+
+EventScript_16FBCC:: @ 816FBCC
+	msgbox gUnknown_819E43D
+	closemessage
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_16FC05
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_16FC10
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16FC1B
+	msgbox gUnknown_819E463
+	setvar VAR_0x4062, 1
+	releaseall
+	end
+
+EventScript_16FC05:: @ 816FC05
+	applymovement 255, Movement_16FC2B
+	waitmovement 0
+	return
+
+EventScript_16FC10:: @ 816FC10
+	applymovement 255, Movement_16FC26
+	waitmovement 0
+	return
+
+EventScript_16FC1B:: @ 816FC1B
+	applymovement 255, Movement_16FC28
+	waitmovement 0
+	return
+
+Movement_16FC26:: @ 816FC26
+	step_11
+	step_end
+
+Movement_16FC28:: @ 816FC28
+	step_11
+	step_11
+	step_end
+
+Movement_16FC2B:: @ 816FC2B
+	step_26
+	step_end
+
+Movement_16FC2D:: @ 816FC2D
+	step_13
+	step_end
diff --git a/data/maps/Route8_WestEntrance/text.inc b/data/maps/Route8_WestEntrance/text.inc
new file mode 100644
index 000000000..58e2ee8ef
--- /dev/null
+++ b/data/maps/Route8_WestEntrance/text.inc
@@ -0,0 +1,26 @@
+gUnknown_819E3ED:: @ 819E3ED
+    .string "I'm on guard duty.\n"
+    .string "Gee, I'm thirsty, though!\p"
+    .string "Oh, wait there, the road's closed.$"
+
+gUnknown_819E43D:: @ 819E43D
+    .string "Oh, that TEA…\n"
+    .string "It looks awfully tasty…$"
+
+gUnknown_819E463:: @ 819E463
+    .string "Huh? I can have this drink?\n"
+    .string "Gee, thanks!\l"
+    .string "… …\l"
+    .string "Glug, glug…\l"
+    .string "… …\l"
+    .string "Gulp…\l"
+    .string "If you want to go to SAFFRON\l"
+    .string "CITY…\l"
+    .string "… …\l"
+    .string "You can go on through.\p"
+    .string "I'll share this TEA with the other\n"
+    .string "guards!$"
+
+gUnknown_819E50F:: @ 819E50F
+    .string "Hi, how's it going?$"
+
diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json
new file mode 100644
index 000000000..ec21a527b
--- /dev/null
+++ b/data/maps/Route9/map.json
@@ -0,0 +1,222 @@
+{
+  "id": "MAP_ROUTE9",
+  "name": "Route9",
+  "layout": "LAYOUT_ROUTE9",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_9",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_CERULEAN_CITY",
+      "offset": -10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE10",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "40",
+      "x": 14,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route9_EventScript_1A9E71",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 20,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "15",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route9_EventScript_1A9F69",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 61,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route9_EventScript_1A9EED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 26,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route9_EventScript_1A9DF5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 26,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route9_EventScript_1A9D79",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 49,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route9_EventScript_1A9DB7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 53,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route9_EventScript_1A9F2B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 60,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route9_EventScript_1A9EAF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 36,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route9_EventScript_1A9E33",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route9_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route9_EventScript_1BE6B9",
+      "flag": "363"
+    },
+    {
+      "graphics_id": "92",
+      "x": 65,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route9_EventScript_1BEAFD",
+      "flag": "450"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 7,
+      "elevation": 0,
+      "script": "Route9_EventScript_167FD0"
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 7,
+      "elevation": 0,
+      "item": "ITEM_ETHER",
+      "flag": "6",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 63,
+      "y": 2,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "123",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 48,
+      "y": 2,
+      "elevation": 3,
+      "item": "ITEM_CHESTO_BERRY",
+      "flag": "150",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc
new file mode 100644
index 000000000..6c3b7927b
--- /dev/null
+++ b/data/maps/Route9/scripts.inc
@@ -0,0 +1,6 @@
+Route9_MapScripts:: @ 8167FCF
+	.byte 0
+
+Route9_EventScript_167FD0:: @ 8167FD0
+	msgbox gUnknown_8184B66, 3
+	end
diff --git a/data/maps/Route9/text.inc b/data/maps/Route9/text.inc
new file mode 100644
index 000000000..3a4506533
--- /dev/null
+++ b/data/maps/Route9/text.inc
@@ -0,0 +1,159 @@
+Text_1845A4:: @ 81845A4
+    .string "ELI: Twin power is fantastic.\n"
+    .string "Did you know?$"
+
+Text_1845D0:: @ 81845D0
+    .string "ELI: But…\n"
+    .string "We used our twin power…$"
+
+Text_1845F2:: @ 81845F2
+    .string "ELI: I caught my POKéMON with\n"
+    .string "ANNE!$"
+
+Text_184616:: @ 8184616
+    .string "ELI: We can't battle if you don't\n"
+    .string "have two POKéMON.$"
+
+Text_18464A:: @ 818464A
+    .string "ANNE: We'll shock you with our twin\n"
+    .string "power!$"
+
+Text_184675:: @ 8184675
+    .string "ANNE: Our twin power…$"
+
+Text_18468B:: @ 818468B
+    .string "ANNE: I'm raising POKéMON with\n"
+    .string "ELI.$"
+
+Text_1846AF:: @ 81846AF
+    .string "ANNE: Hi, hi! Let's battle!\n"
+    .string "But bring two POKéMON.$"
+
+Text_1846E2:: @ 81846E2
+    .string "My bike's acting up, man.$"
+
+Text_1846FC:: @ 81846FC
+    .string "Aww, man.\n"
+    .string "I'm not into this.$"
+
+Text_184719:: @ 8184719
+    .string "I got grass caught up in my\n"
+    .string "spokes, man.$"
+
+Text_184742:: @ 8184742
+    .string "Clear the way, or I'll run you\n"
+    .string "down!$"
+
+Text_184767:: @ 8184767
+    .string "You for real, kid?$"
+
+Text_18477A:: @ 818477A
+    .string "Don't think you're all special and\n"
+    .string "all just because of this.$"
+
+Text_1847B7:: @ 81847B7
+    .string "You have POKéMON with you!\n"
+    .string "You're mine!$"
+
+Text_1847DF:: @ 81847DF
+    .string "You deceived me…$"
+
+Text_1847F0:: @ 81847F0
+    .string "The tunnel coming up is pitch-black\n"
+    .string "inside.\p"
+    .string "You'll need FLASH to get through\n"
+    .string "there.$"
+
+Text_184844:: @ 8184844
+    .string "Who's that walking there with those\n"
+    .string "good-looking POKéMON?$"
+
+Text_18487E:: @ 818487E
+    .string "Out like a light!$"
+
+Text_184890:: @ 8184890
+    .string "Keep walking!$"
+
+Text_18489E:: @ 818489E
+    .string "I'm taking the ROCK TUNNEL to\n"
+    .string "go to LAVENDER…$"
+
+Text_1848CC:: @ 81848CC
+    .string "Can't measure up…$"
+
+Text_1848DE:: @ 81848DE
+    .string "Are you off to ROCK TUNNEL, too?$"
+
+Text_1848FF:: @ 81848FF
+    .string "Don't you dare patronize me!$"
+
+Text_18491C:: @ 818491C
+    .string "No!\n"
+    .string "You're too much.$"
+
+Text_184931:: @ 8184931
+    .string "You're obviously talented.\n"
+    .string "Good luck to you!$"
+
+Text_18495E:: @ 818495E
+    .string "Bwahaha!\n"
+    .string "Great! I was bored, eh!$"
+
+Text_18497F:: @ 818497F
+    .string "Keep it coming, eh!\p"
+    .string "Oh wait.\n"
+    .string "I'm out of POKéMON!$"
+
+Text_1849B0:: @ 81849B0
+    .string "You sure had guts standing up to\n"
+    .string "me there, eh?$"
+
+Text_1849DF:: @ 81849DF
+    .string "Hahaha!\n"
+    .string "Aren't you a little toughie!$"
+
+Text_184A04:: @ 8184A04
+    .string "What's that?$"
+
+Text_184A11:: @ 8184A11
+    .string "Hahaha!\n"
+    .string "Kids should be tough!$"
+
+Text_184A2F:: @ 8184A2F
+    .string "I got up early every day to raise\n"
+    .string "my POKéMON from cocoons!$"
+
+Text_184A6A:: @ 8184A6A
+    .string "WHAT?\p"
+    .string "What a total waste of time!$"
+
+Text_184A8C:: @ 8184A8C
+    .string "I have to collect more than bugs\n"
+    .string "to get stronger…$"
+
+Text_184ABE:: @ 8184ABE
+    .string "Hahahaha!\n"
+    .string "Bring it on!$"
+
+Text_184AD5:: @ 8184AD5
+    .string "Hahahaha!\n"
+    .string "You beat me fair!$"
+
+Text_184AF1:: @ 8184AF1
+    .string "Hahahaha!\n"
+    .string "Us hearty guys always laugh!$"
+
+Text_184B18:: @ 8184B18
+    .string "Go, my super BUG POKéMON!$"
+
+Text_184B32:: @ 8184B32
+    .string "My bugs…$"
+
+Text_184B3B:: @ 8184B3B
+    .string "If you don't like BUG POKéMON,\n"
+    .string "you bug me!$"
+
+gUnknown_8184B66:: @ 8184B66
+    .string "ROUTE 9\n"
+    .string "CERULEAN CITY - ROCK TUNNEL$"
+
diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json
new file mode 100644
index 000000000..4ba7c113d
--- /dev/null
+++ b/data/maps/SSAnne_1F_Corridor/map.json
@@ -0,0 +1,138 @@
+{
+  "id": "MAP_SSANNE_1F_CORRIDOR",
+  "name": "SSAnne_1F_Corridor",
+  "layout": "LAYOUT_SSANNE_1F_CORRIDOR",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "62",
+      "x": 18,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Corridor_EventScript_1608D5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Corridor_EventScript_1608CC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_KITCHEN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_EXTERIOR",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 20,
+      "y": 0,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_EXTERIOR",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 3,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_KITCHEN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 28,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_B1F_CORRIDOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_ROOM1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_ROOM2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_ROOM3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_ROOM4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_ROOM5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 23,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_ROOM7",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 20,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_ROOM6",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc
new file mode 100644
index 000000000..d9bd8c051
--- /dev/null
+++ b/data/maps/SSAnne_1F_Corridor/scripts.inc
@@ -0,0 +1,10 @@
+SSAnne_1F_Corridor_MapScripts:: @ 81608CB
+	.byte 0
+
+SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC
+	msgbox gUnknown_8172EE7, 2
+	end
+
+SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5
+	msgbox gUnknown_8172F60, 2
+	end
diff --git a/data/maps/SSAnne_1F_Corridor/text.inc b/data/maps/SSAnne_1F_Corridor/text.inc
new file mode 100644
index 000000000..dff534c9a
--- /dev/null
+++ b/data/maps/SSAnne_1F_Corridor/text.inc
@@ -0,0 +1,14 @@
+gUnknown_8172EE7:: @ 8172EE7
+    .string "Bonjour!\n"
+    .string "I am le waiter on this ship!\p"
+    .string "I will be happy to serve you\n"
+    .string "anything you please!\p"
+    .string "… … …\n"
+    .string "Ah! Le strong silent type!$"
+
+gUnknown_8172F60:: @ 8172F60
+    .string "The passengers are restless from\n"
+    .string "this long voyage.\p"
+    .string "You might be challenged by the\n"
+    .string "more bored ones!$"
+
diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json
new file mode 100644
index 000000000..c54bbc8de
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room1/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SSANNE_1F_ROOM1",
+  "name": "SSAnne_1F_Room1",
+  "layout": "LAYOUT_SSANNE_ROOM1",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Room1_EventScript_160BDC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc
new file mode 100644
index 000000000..ca75fd46d
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room1/scripts.inc
@@ -0,0 +1,6 @@
+SSAnne_1F_Room1_MapScripts:: @ 8160BDB
+	.byte 0
+
+SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC
+	msgbox gUnknown_817393B, 2
+	end
diff --git a/data/maps/SSAnne_1F_Room1/text.inc b/data/maps/SSAnne_1F_Room1/text.inc
new file mode 100644
index 000000000..252ab2283
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room1/text.inc
@@ -0,0 +1,6 @@
+gUnknown_817393B:: @ 817393B
+    .string "Ssh…!\n"
+    .string "I'm a GLOBAL POLICE agent.\p"
+    .string "I'm on the trail of TEAM ROCKET.\n"
+    .string "They're up to nothing good!$"
+
diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json
new file mode 100644
index 000000000..81fcf337b
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room2/map.json
@@ -0,0 +1,80 @@
+{
+  "id": "MAP_SSANNE_1F_ROOM2",
+  "name": "SSAnne_1F_Room2",
+  "layout": "LAYOUT_SSANNE_ROOM1",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "22",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SSAnne_1F_Room2_EventScript_160BEF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SSAnne_1F_Room2_EventScript_160C06",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SSAnne_1F_Room2_EventScript_160BE6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Room2_EventScript_1BE65E",
+      "flag": "356"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc
new file mode 100644
index 000000000..4f1ef996b
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room2/scripts.inc
@@ -0,0 +1,16 @@
+SSAnne_1F_Room2_MapScripts:: @ 8160BE5
+	.byte 0
+
+SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6
+	msgbox gUnknown_8173AC5, 2
+	end
+
+SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF
+	trainerbattle 0, 126, 0, Text_173A1A, Text_173A4F
+	msgbox gUnknown_8173A7A, 6
+	end
+
+SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06
+	trainerbattle 0, 96, 0, Text_173999, Text_1739B1
+	msgbox gUnknown_81739C5, 6
+	end
diff --git a/data/maps/SSAnne_1F_Room2/text.inc b/data/maps/SSAnne_1F_Room2/text.inc
new file mode 100644
index 000000000..92dc9a93c
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room2/text.inc
@@ -0,0 +1,31 @@
+Text_173999:: @ 8173999
+    .string "I love POKéMON!\n"
+    .string "Do you?$"
+
+Text_1739B1:: @ 81739B1
+    .string "Wow! \n"
+    .string "You're great!$"
+
+gUnknown_81739C5:: @ 81739C5
+    .string "Listen, listen!\n"
+    .string "Let me be your friend, okay?\p"
+    .string "Then we can trade POKéMON and\n"
+    .string "do stuff.$"
+
+Text_173A1A:: @ 8173A1A
+    .string "I collected these POKéMON\n"
+    .string "from all around the world!$"
+
+Text_173A4F:: @ 8173A4F
+    .string "Oh, no!\n"
+    .string "I went around the world for these!$"
+
+gUnknown_8173A7A:: @ 8173A7A
+    .string "You hurt my poor POKéMON!\p"
+    .string "I demand that you heal them at a\n"
+    .string "POKéMON CENTER!$"
+
+gUnknown_8173AC5:: @ 8173AC5
+    .string "We are cruising around the world,\n"
+    .string "my children and I.$"
+
diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json
new file mode 100644
index 000000000..1e8b1f145
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room3/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_SSANNE_1F_ROOM3",
+  "name": "SSAnne_1F_Room3",
+  "layout": "LAYOUT_SSANNE_ROOM1",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "17",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "52",
+      "movement_range_x": 2,
+      "movement_range_y": 3,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Room3_EventScript_160C1E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "131",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Room3_EventScript_160C30",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Room3_EventScript_160C27",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc
new file mode 100644
index 000000000..bdfe2cc07
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room3/scripts.inc
@@ -0,0 +1,20 @@
+SSAnne_1F_Room3_MapScripts:: @ 8160C1D
+	.byte 0
+
+SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E
+	msgbox gUnknown_8173B21, 2
+	end
+
+SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27
+	msgbox gUnknown_8173AFA, 2
+	end
+
+SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WIGGLYTUFF, 0
+	msgbox gUnknown_8173B61
+	waitmoncry
+	release
+	end
diff --git a/data/maps/SSAnne_1F_Room3/text.inc b/data/maps/SSAnne_1F_Room3/text.inc
new file mode 100644
index 000000000..32709c631
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room3/text.inc
@@ -0,0 +1,11 @@
+gUnknown_8173AFA:: @ 8173AFA
+    .string "A world cruise is so elegant yet\n"
+    .string "cozy!$"
+
+gUnknown_8173B21:: @ 8173B21
+    .string "I always travel with WIGGLYTUFF.\n"
+    .string "I never leave home without it.$"
+
+gUnknown_8173B61:: @ 8173B61
+    .string "WIGGLYTUFF: Puup pupuu!$"
+
diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json
new file mode 100644
index 000000000..56d910b4b
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room4/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SSANNE_1F_ROOM4",
+  "name": "SSAnne_1F_Room4",
+  "layout": "LAYOUT_SSANNE_ROOM1",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "23",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Room4_EventScript_160C44",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc
new file mode 100644
index 000000000..aa243949e
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room4/scripts.inc
@@ -0,0 +1,17 @@
+SSAnne_1F_Room4_MapScripts:: @ 8160C43
+	.byte 0
+
+SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44
+	lock
+	faceplayer
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_160C5C
+	msgbox gUnknown_8173BA4
+	release
+	end
+
+EventScript_160C5C:: @ 8160C5C
+	msgbox gUnknown_8173B79
+	release
+	end
diff --git a/data/maps/SSAnne_1F_Room4/text.inc b/data/maps/SSAnne_1F_Room4/text.inc
new file mode 100644
index 000000000..8b3f4c775
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room4/text.inc
@@ -0,0 +1,8 @@
+gUnknown_8173B79:: @ 8173B79
+    .string "Waiter, I would like a cherry pie,\n"
+    .string "please!$"
+
+gUnknown_8173BA4:: @ 8173BA4
+    .string "Waitress, I would like a cherry\n"
+    .string "pie, please!$"
+
diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json
new file mode 100644
index 000000000..c32c962d9
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room5/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SSANNE_1F_ROOM5",
+  "name": "SSAnne_1F_Room5",
+  "layout": "LAYOUT_SSANNE_ROOM1",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SSAnne_1F_Room5_EventScript_160C67",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 10
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc
new file mode 100644
index 000000000..553a72b52
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room5/scripts.inc
@@ -0,0 +1,7 @@
+SSAnne_1F_Room5_MapScripts:: @ 8160C66
+	.byte 0
+
+SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67
+	trainerbattle 0, 422, 0, Text_173BD1, Text_173BFA
+	msgbox gUnknown_8173C30, 6
+	end
diff --git a/data/maps/SSAnne_1F_Room5/text.inc b/data/maps/SSAnne_1F_Room5/text.inc
new file mode 100644
index 000000000..09d582707
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room5/text.inc
@@ -0,0 +1,12 @@
+Text_173BD1:: @ 8173BD1
+    .string "You insolent pup!\n"
+    .string "How dare you barge in!$"
+
+Text_173BFA:: @ 8173BFA
+    .string "Humph! You rude child!\n"
+    .string "You have no sense of courtesy!$"
+
+gUnknown_8173C30:: @ 8173C30
+    .string "I wish to be left alone!\n"
+    .string "Get out!$"
+
diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json
new file mode 100644
index 000000000..8dbbe1e1b
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room6/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SSANNE_1F_ROOM6",
+  "name": "SSAnne_1F_Room6",
+  "layout": "LAYOUT_SSANNE_ROOM1",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_1F_Room6_EventScript_160DF3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 12
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc
new file mode 100644
index 000000000..1c6c0004c
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room6/scripts.inc
@@ -0,0 +1,27 @@
+SSAnne_1F_Room6_MapScripts:: @ 8160DF2
+	.byte 0
+
+SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3
+	lock
+	faceplayer
+	msgbox gUnknown_817445B, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_160E18
+	closemessage
+	call EventScript_1A6C26
+	msgbox gUnknown_8174490
+	release
+	end
+
+EventScript_160E18:: @ 8160E18
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_160E2E
+	msgbox gUnknown_8174515
+	release
+	end
+
+EventScript_160E2E:: @ 8160E2E
+	msgbox gUnknown_81744D0
+	release
+	end
diff --git a/data/maps/SSAnne_1F_Room6/text.inc b/data/maps/SSAnne_1F_Room6/text.inc
new file mode 100644
index 000000000..442992f02
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room6/text.inc
@@ -0,0 +1,16 @@
+gUnknown_817445B:: @ 817445B
+    .string "You look tired. Would you like to\n"
+    .string "take a short rest?$"
+
+gUnknown_8174490:: @ 8174490
+    .string "I'm glad to see that everyone is\n"
+    .string "looking refreshed and chipper.$"
+
+gUnknown_81744D0:: @ 81744D0
+    .string "Oh, I'm sorry for fussing over you.\n"
+    .string "You look like my little brother…$"
+
+gUnknown_8174515:: @ 8174515
+    .string "Oh, I'm sorry for fussing over you.\n"
+    .string "You look like my little sister…$"
+
diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json
new file mode 100644
index 000000000..323374027
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room7/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SSANNE_1F_ROOM7",
+  "name": "SSAnne_1F_Room7",
+  "layout": "LAYOUT_SSANNE_ROOM1",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SSAnne_1F_Room7_EventScript_160C7F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 11
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc
new file mode 100644
index 000000000..bc6e0cd88
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room7/scripts.inc
@@ -0,0 +1,7 @@
+SSAnne_1F_Room7_MapScripts:: @ 8160C7E
+	.byte 0
+
+SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F
+	trainerbattle 0, 421, 0, Text_173C52, Text_173CB4
+	msgbox gUnknown_8173CC4, 6
+	end
diff --git a/data/maps/SSAnne_1F_Room7/text.inc b/data/maps/SSAnne_1F_Room7/text.inc
new file mode 100644
index 000000000..d4fed83fb
--- /dev/null
+++ b/data/maps/SSAnne_1F_Room7/text.inc
@@ -0,0 +1,11 @@
+Text_173C52:: @ 8173C52
+    .string "I am but a solitary traveler…\p"
+    .string "My sole companions and friends are\n"
+    .string "POKéMON I caught on my journeys…$"
+
+Text_173CB4:: @ 8173CB4
+    .string "My, my friends…$"
+
+gUnknown_8173CC4:: @ 8173CC4
+    .string "You should be nice to friends!$"
+
diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json
new file mode 100644
index 000000000..6dcb6a7ee
--- /dev/null
+++ b/data/maps/SSAnne_2F_Corridor/map.json
@@ -0,0 +1,138 @@
+{
+  "id": "MAP_SSANNE_2F_CORRIDOR",
+  "name": "SSAnne_2F_Corridor",
+  "layout": "LAYOUT_SSANNE_2F_CORRIDOR",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "72",
+      "x": 30,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "61"
+    },
+    {
+      "graphics_id": "62",
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Corridor_EventScript_160A54",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_3F_CORRIDOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 30,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_CAPTAINS_OFFICE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_2F_ROOM1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_2F_ROOM2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_2F_ROOM3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_2F_ROOM4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 22,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_2F_ROOM5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 26,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_2F_ROOM6",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x405B",
+      "var_value": 0,
+      "script": "SSAnne_2F_Corridor_EventScript_1608DF"
+    },
+    {
+      "type": "trigger",
+      "x": 31,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x405B",
+      "var_value": 0,
+      "script": "SSAnne_2F_Corridor_EventScript_1608EB"
+    },
+    {
+      "type": "trigger",
+      "x": 32,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x405B",
+      "var_value": 0,
+      "script": "SSAnne_2F_Corridor_EventScript_1608F7"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc
new file mode 100644
index 000000000..68ead6a96
--- /dev/null
+++ b/data/maps/SSAnne_2F_Corridor/scripts.inc
@@ -0,0 +1,184 @@
+SSAnne_2F_Corridor_MapScripts:: @ 81608DE
+	.byte 0
+
+SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_160903
+
+EventScript_1608EA:: @ 81608EA
+	end
+
+SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_160903
+
+EventScript_1608F6:: @ 81608F6
+	end
+
+SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7
+	lockall
+	setvar VAR_0x4001, 2
+	goto EventScript_160903
+
+EventScript_160902:: @ 8160902
+	end
+
+EventScript_160903:: @ 8160903
+	textcolor 0
+	playse SE_KAIDAN
+	delay 5
+	playbgm BGM_FRLG_RIVAL, 0
+	addobject 1
+	delay 10
+	applymovement 1, Movement_1A75ED
+	waitmovement 0
+	delay 20
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_1609AD
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_1609B8
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_1609CA
+	msgbox gUnknown_8173035
+	setvar VAR_LAST_TALKED, 1
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_1609DC
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_1609E7
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_1609F2
+	msgbox gUnknown_8173164
+	closemessage
+	delay 10
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_1609FD
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_160A08
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_160A13
+	fadedefaultbgm
+	removeobject 1
+	setvar VAR_0x405B, 1
+	releaseall
+	end
+
+EventScript_1609AD:: @ 81609AD
+	applymovement 1, Movement_160A2A
+	waitmovement 0
+	return
+
+EventScript_1609B8:: @ 81609B8
+	applymovement 1, Movement_160A2E
+	applymovement 255, Movement_160A24
+	waitmovement 0
+	return
+
+EventScript_1609CA:: @ 81609CA
+	applymovement 255, Movement_160A1E
+	applymovement 1, Movement_160A34
+	waitmovement 0
+	return
+
+EventScript_1609DC:: @ 81609DC
+	trainerbattle 3, 426, 0, Text_173110
+	return
+
+EventScript_1609E7:: @ 81609E7
+	trainerbattle 3, 427, 0, Text_173110
+	return
+
+EventScript_1609F2:: @ 81609F2
+	trainerbattle 3, 428, 0, Text_173110
+	return
+
+EventScript_1609FD:: @ 81609FD
+	applymovement 1, Movement_160A3B
+	waitmovement 0
+	return
+
+EventScript_160A08:: @ 8160A08
+	applymovement 1, Movement_160A44
+	waitmovement 0
+	return
+
+EventScript_160A13:: @ 8160A13
+	applymovement 1, Movement_160A4C
+	waitmovement 0
+	return
+
+Movement_160A1E:: @ 8160A1E
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_2f
+	step_end
+
+Movement_160A24:: @ 8160A24
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_2f
+	step_end
+
+Movement_160A2A:: @ 8160A2A
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_160A2E:: @ 8160A2E
+	step_10
+	step_10
+	step_10
+	step_10
+	step_30
+	step_end
+
+Movement_160A34:: @ 8160A34
+	step_10
+	step_10
+	step_10
+	step_10
+	step_13
+	step_1a
+	step_end
+
+Movement_160A3B:: @ 8160A3B
+	step_13
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_160A44:: @ 8160A44
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_160A4C:: @ 8160A4C
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
+
+SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54
+	msgbox gUnknown_8172FC3, 2
+	end
diff --git a/data/maps/SSAnne_2F_Corridor/text.inc b/data/maps/SSAnne_2F_Corridor/text.inc
new file mode 100644
index 000000000..fde6846f2
--- /dev/null
+++ b/data/maps/SSAnne_2F_Corridor/text.inc
@@ -0,0 +1,37 @@
+gUnknown_8172FC3:: @ 8172FC3
+    .string "This ship, she is a luxury liner for\n"
+    .string "TRAINERS of the world!\p"
+    .string "At every port, we hold parties with\n"
+    .string "invited TRAINERS.$"
+
+gUnknown_8173035:: @ 8173035
+    .string "{RIVAL}: Bonjour!\n"
+    .string "{PLAYER}!\p"
+    .string "Imagine seeing you here!\n"
+    .string "{PLAYER}, were you really invited?\p"
+    .string "So how's your POKéDEX coming?\p"
+    .string "I already caught 40 kinds, pal.\n"
+    .string "Different kinds are everywhere.\p"
+    .string "Crawl around in grassy areas, and\n"
+    .string "look hard for them.$"
+
+Text_173110:: @ 8173110
+    .string "Humph!\p"
+    .string "At least you're raising your\n"
+    .string "POKéMON!$"
+
+Text_17313D:: @ 817313D
+    .string "{PLAYER}‥！\n"
+    .string "ふなよい　してるのか！\p"
+    .string "もっと　からだ\n"
+    .string "きたえた　ほうが　いいぜ！$"
+
+gUnknown_8173164:: @ 8173164
+    .string "{RIVAL}: I heard there was a CUT\n"
+    .string "master on board.\p"
+    .string "But he was just a seasick old man!\p"
+    .string "CUT itself is really useful.\n"
+    .string "Yup, it'll be handy.\p"
+    .string "You should go see him, too.\n"
+    .string "Smell ya!$"
+
diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json
new file mode 100644
index 000000000..10f3c8604
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room1/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SSANNE_2F_ROOM1",
+  "name": "SSAnne_2F_Room1",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room1_EventScript_160C97",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc
new file mode 100644
index 000000000..f3dc1f136
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room1/scripts.inc
@@ -0,0 +1,15 @@
+SSAnne_2F_Room1_MapScripts:: @ 8160C96
+	.byte 0
+
+SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97
+	lock
+	faceplayer
+	message Text_173CE3
+	waitmessage
+	setvar VAR_0x8004, SPECIES_SNORLAX
+	special sub_80CBDCC
+	drawmonpic SPECIES_SNORLAX, 10, 3
+	waitbuttonpress
+	erasemonpic
+	release
+	end
diff --git a/data/maps/SSAnne_2F_Room1/text.inc b/data/maps/SSAnne_2F_Room1/text.inc
new file mode 100644
index 000000000..5a18af424
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room1/text.inc
@@ -0,0 +1,6 @@
+Text_173CE3:: @ 8173CE3
+    .string "I've journeyed far and wide, but in\n"
+    .string "all my travels I've never seen\l"
+    .string "any POKéMON sleep like this one!\p"
+    .string "It was something like this!$"
+
diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json
new file mode 100644
index 000000000..5fe5c9ff2
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room2/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_SSANNE_2F_ROOM2",
+  "name": "SSAnne_2F_Room2",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SSAnne_2F_Room2_EventScript_160CB1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SSAnne_2F_Room2_EventScript_160CC8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 3,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room2_EventScript_1BE66B",
+      "flag": "357"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc
new file mode 100644
index 000000000..cb18a010a
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room2/scripts.inc
@@ -0,0 +1,12 @@
+SSAnne_2F_Room2_MapScripts:: @ 8160CB0
+	.byte 0
+
+SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1
+	trainerbattle 0, 223, 0, Text_173DDB, Text_173DF7
+	msgbox gUnknown_8173E04, 6
+	end
+
+SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8
+	trainerbattle 0, 482, 0, Text_173D63, Text_173D92
+	msgbox gUnknown_8173DB6, 6
+	end
diff --git a/data/maps/SSAnne_2F_Room2/text.inc b/data/maps/SSAnne_2F_Room2/text.inc
new file mode 100644
index 000000000..a931a8e47
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room2/text.inc
@@ -0,0 +1,23 @@
+Text_173D63:: @ 8173D63
+    .string "Competing against the young keeps\n"
+    .string "me youthful.$"
+
+Text_173D92:: @ 8173D92
+    .string "Good match!\n"
+    .string "Ah, I feel young again!$"
+
+gUnknown_8173DB6:: @ 8173DB6
+    .string "Fifteen years ago, I would\n"
+    .string "have won!$"
+
+Text_173DDB:: @ 8173DDB
+    .string "Check out what I fished up!$"
+
+Text_173DF7:: @ 8173DF7
+    .string "I'm all out!$"
+
+gUnknown_8173E04:: @ 8173E04
+    .string "Party?\p"
+    .string "The cruise ship's party should be\n"
+    .string "over by now.$"
+
diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json
new file mode 100644
index 000000000..7241e3d01
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room3/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SSANNE_2F_ROOM3",
+  "name": "SSAnne_2F_Room3",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room3_EventScript_160CE0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room3_EventScript_160CE9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc
new file mode 100644
index 000000000..577503151
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room3/scripts.inc
@@ -0,0 +1,10 @@
+SSAnne_2F_Room3_MapScripts:: @ 8160CDF
+	.byte 0
+
+SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0
+	msgbox gUnknown_8173E3A, 2
+	end
+
+SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9
+	msgbox gUnknown_8173E7B, 2
+	end
diff --git a/data/maps/SSAnne_2F_Room3/text.inc b/data/maps/SSAnne_2F_Room3/text.inc
new file mode 100644
index 000000000..c87c96ae0
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room3/text.inc
@@ -0,0 +1,12 @@
+gUnknown_8173E3A:: @ 8173E3A
+    .string "Ah, yes, I have seen some POKéMON\n"
+    .string "ferry people across the water!$"
+
+gUnknown_8173E7B:: @ 8173E7B
+    .string "Small trees can be chopped down\n"
+    .string "using the move CUT.\p"
+    .string "But remember this!\n"
+    .string "CUT is an HM technique.\p"
+    .string "Once learned, it is not so easily\n"
+    .string "discarded.$"
+
diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json
new file mode 100644
index 000000000..54ed72c44
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room4/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_SSANNE_2F_ROOM4",
+  "name": "SSAnne_2F_Room4",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SSAnne_2F_Room4_EventScript_160CF3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SSAnne_2F_Room4_EventScript_160D0A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room4_EventScript_1BE678",
+      "flag": "358"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc
new file mode 100644
index 000000000..26efb8bd5
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room4/scripts.inc
@@ -0,0 +1,12 @@
+SSAnne_2F_Room4_MapScripts:: @ 8160CF2
+	.byte 0
+
+SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3
+	trainerbattle 0, 483, 0, Text_173F07, Text_173F42
+	msgbox gUnknown_8173F55, 6
+	end
+
+SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A
+	trainerbattle 0, 127, 0, Text_173F83, Text_173FAB
+	msgbox gUnknown_8173FB9, 6
+	end
diff --git a/data/maps/SSAnne_2F_Room4/text.inc b/data/maps/SSAnne_2F_Room4/text.inc
new file mode 100644
index 000000000..69e7a7b0d
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room4/text.inc
@@ -0,0 +1,22 @@
+Text_173F07:: @ 8173F07
+    .string "Which do you find more worthy,\n"
+    .string "a strong or a rare POKéMON?$"
+
+Text_173F42:: @ 8173F42
+    .string "I must salute you!$"
+
+gUnknown_8173F55:: @ 8173F55
+    .string "Personally, I prefer strong and\n"
+    .string "rare POKéMON.$"
+
+Text_173F83:: @ 8173F83
+    .string "I don't believe I saw you at the\n"
+    .string "party?$"
+
+Text_173FAB:: @ 8173FAB
+    .string "Take it easy!$"
+
+gUnknown_8173FB9:: @ 8173FB9
+    .string "Oh, I adore your strong POKéMON!\n"
+    .string "Oh, how I envy you for them!$"
+
diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json
new file mode 100644
index 000000000..3512aa723
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room5/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SSANNE_2F_ROOM5",
+  "name": "SSAnne_2F_Room5",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room5_EventScript_160D22",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room5_EventScript_160D2B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc
new file mode 100644
index 000000000..fb835d315
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room5/scripts.inc
@@ -0,0 +1,10 @@
+SSAnne_2F_Room5_MapScripts:: @ 8160D21
+	.byte 0
+
+SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22
+	msgbox gUnknown_8173FF7, 2
+	end
+
+SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B
+	msgbox gUnknown_817404F, 2
+	end
diff --git a/data/maps/SSAnne_2F_Room5/text.inc b/data/maps/SSAnne_2F_Room5/text.inc
new file mode 100644
index 000000000..75d44d3a5
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room5/text.inc
@@ -0,0 +1,11 @@
+gUnknown_8173FF7:: @ 8173FF7
+    .string "Have you gone to the SAFARI ZONE\n"
+    .string "in FUCHSIA CITY?\p"
+    .string "There are many kinds of rare\n"
+    .string "POKéMON.$"
+
+gUnknown_817404F:: @ 817404F
+    .string "Me and my daddy think the SAFARI\n"
+    .string "ZONE is awesome!\l"
+    .string "I wish we could go there again.$"
+
diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json
new file mode 100644
index 000000000..7b2d2666e
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room6/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SSANNE_2F_ROOM6",
+  "name": "SSAnne_2F_Room6",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "31",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room6_EventScript_160D3E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room6_EventScript_160D35",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc
new file mode 100644
index 000000000..2fb6544da
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room6/scripts.inc
@@ -0,0 +1,10 @@
+SSAnne_2F_Room6_MapScripts:: @ 8160D34
+	.byte 0
+
+SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35
+	msgbox gUnknown_81740A1, 2
+	end
+
+SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E
+	msgbox gUnknown_81740D6, 2
+	end
diff --git a/data/maps/SSAnne_2F_Room6/text.inc b/data/maps/SSAnne_2F_Room6/text.inc
new file mode 100644
index 000000000..6f5b0abff
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room6/text.inc
@@ -0,0 +1,7 @@
+gUnknown_81740A1:: @ 81740A1
+    .string "The CAPTAIN said he's awfully sick.\n"
+    .string "He was all pale.$"
+
+gUnknown_81740D6:: @ 81740D6
+    .string "I hear many people get seasick.$"
+
diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json
new file mode 100644
index 000000000..c34977686
--- /dev/null
+++ b/data/maps/SSAnne_3F_Corridor/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_SSANNE_3F_CORRIDOR",
+  "name": "SSAnne_3F_Corridor",
+  "layout": "LAYOUT_SSANNE_3F_CORRIDOR",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "62",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_3F_Corridor_EventScript_160A5E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_DECK",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 0,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_DECK",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc
new file mode 100644
index 000000000..b4f61fe75
--- /dev/null
+++ b/data/maps/SSAnne_3F_Corridor/scripts.inc
@@ -0,0 +1,6 @@
+SSAnne_3F_Corridor_MapScripts:: @ 8160A5D
+	.byte 0
+
+SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E
+	msgbox gUnknown_817320C, 2
+	end
diff --git a/data/maps/SSAnne_3F_Corridor/text.inc b/data/maps/SSAnne_3F_Corridor/text.inc
new file mode 100644
index 000000000..7d4a71bb4
--- /dev/null
+++ b/data/maps/SSAnne_3F_Corridor/text.inc
@@ -0,0 +1,6 @@
+gUnknown_817320C:: @ 817320C
+    .string "Our CAPTAIN is a sword master.\n"
+    .string "He's awesome at using CUT.\p"
+    .string "They say he even teaches CUT\n"
+    .string "to POKéMON!$"
+
diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json
new file mode 100644
index 000000000..9accdb250
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Corridor/map.json
@@ -0,0 +1,72 @@
+{
+  "id": "MAP_SSANNE_B1F_CORRIDOR",
+  "name": "SSAnne_B1F_Corridor",
+  "layout": "LAYOUT_SSANNE_B1F_CORRIDOR",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 19,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_B1F_ROOM1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_B1F_ROOM2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_B1F_ROOM3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_B1F_ROOM4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_B1F_ROOM5",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 21,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_HYPER_POTION",
+      "flag": "8",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SSAnne_B1F_Corridor/scripts.inc b/data/maps/SSAnne_B1F_Corridor/scripts.inc
new file mode 100644
index 000000000..be04386e6
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Corridor/scripts.inc
@@ -0,0 +1,2 @@
+SSAnne_B1F_Corridor_MapScripts:: @ 8160A67
+	.byte 0
diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json
new file mode 100644
index 000000000..87ea2dc4c
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room1/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SSANNE_B1F_ROOM1",
+  "name": "SSAnne_B1F_Room1",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SSAnne_B1F_Room1_EventScript_160D48",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SSAnne_B1F_Room1_EventScript_160D5F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_B1F_CORRIDOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc
new file mode 100644
index 000000000..ec931102e
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room1/scripts.inc
@@ -0,0 +1,12 @@
+SSAnne_B1F_Room1_MapScripts:: @ 8160D47
+	.byte 0
+
+SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48
+	trainerbattle 0, 224, 0, Text_174177, Text_1741EF
+	msgbox gUnknown_817420E, 6
+	end
+
+SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F
+	trainerbattle 0, 140, 0, Text_1740F6, Text_174123
+	msgbox gUnknown_817413A, 6
+	end
diff --git a/data/maps/SSAnne_B1F_Room1/text.inc b/data/maps/SSAnne_B1F_Room1/text.inc
new file mode 100644
index 000000000..2802e4a84
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room1/text.inc
@@ -0,0 +1,26 @@
+Text_1740F6:: @ 81740F6
+    .string "Matey, you're walking the plank if\n"
+    .string "you lose!$"
+
+Text_174123:: @ 8174123
+    .string "Argh!\n"
+    .string "Beaten by a kid!$"
+
+gUnknown_817413A:: @ 817413A
+    .string "When we're out at sea, jellyfish\n"
+    .string "POKéMON sometimes drift by.$"
+
+Text_174177:: @ 8174177
+    .string "Hello, stranger!\p"
+    .string "I can't tell if you're from the seas\n"
+    .string "or mountains, but stop and chat.\p"
+    .string "All my POKéMON are from the sea.$"
+
+Text_1741EF:: @ 81741EF
+    .string "Darn!\n"
+    .string "I let that one get away!$"
+
+gUnknown_817420E:: @ 817420E
+    .string "I was going to make you my\n"
+    .string "assistant, too!$"
+
diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json
new file mode 100644
index 000000000..0f1d75d5f
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room2/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SSANNE_B1F_ROOM2",
+  "name": "SSAnne_B1F_Room2",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "62",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SSAnne_B1F_Room2_EventScript_160D77",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_B1F_Room2_EventScript_1BE685",
+      "flag": "359"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_B1F_CORRIDOR",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc
new file mode 100644
index 000000000..71acf74be
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room2/scripts.inc
@@ -0,0 +1,7 @@
+SSAnne_B1F_Room2_MapScripts:: @ 8160D76
+	.byte 0
+
+SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77
+	trainerbattle 0, 138, 0, Text_174239, Text_17425C
+	msgbox gUnknown_8174272, 6
+	end
diff --git a/data/maps/SSAnne_B1F_Room2/text.inc b/data/maps/SSAnne_B1F_Room2/text.inc
new file mode 100644
index 000000000..df94d6351
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room2/text.inc
@@ -0,0 +1,10 @@
+Text_174239:: @ 8174239
+    .string "Even us sailors have POKéMON, too!$"
+
+Text_17425C:: @ 817425C
+    .string "Okay, you're not bad.$"
+
+gUnknown_8174272:: @ 8174272
+    .string "We caught all our POKéMON while\n"
+    .string "we were out at sea.$"
+
diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json
new file mode 100644
index 000000000..bb99ece2f
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room3/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SSANNE_B1F_ROOM3",
+  "name": "SSAnne_B1F_Room3",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "62",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SSAnne_B1F_Room3_EventScript_160D8F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_B1F_Room3_EventScript_1BE692",
+      "flag": "360"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_B1F_CORRIDOR",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc
new file mode 100644
index 000000000..3a1ff97c6
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room3/scripts.inc
@@ -0,0 +1,7 @@
+SSAnne_B1F_Room3_MapScripts:: @ 8160D8E
+	.byte 0
+
+SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F
+	trainerbattle 0, 139, 0, Text_1742A6, Text_1742C3
+	msgbox gUnknown_81742D2, 6
+	end
diff --git a/data/maps/SSAnne_B1F_Room3/text.inc b/data/maps/SSAnne_B1F_Room3/text.inc
new file mode 100644
index 000000000..f74b96052
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room3/text.inc
@@ -0,0 +1,11 @@
+Text_1742A6:: @ 81742A6
+    .string "I like feisty kids like you!$"
+
+Text_1742C3:: @ 81742C3
+    .string "Argh!\n"
+    .string "Lost it!$"
+
+gUnknown_81742D2:: @ 81742D2
+    .string "Sea POKéMON live in deep water.\n"
+    .string "You'll need a ROD to fish them up!$"
+
diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json
new file mode 100644
index 000000000..a587f56b3
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room4/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SSANNE_B1F_ROOM4",
+  "name": "SSAnne_B1F_Room4",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "62",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SSAnne_B1F_Room4_EventScript_160DBE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SSAnne_B1F_Room4_EventScript_160DA7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_B1F_CORRIDOR",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc
new file mode 100644
index 000000000..02860ab54
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room4/scripts.inc
@@ -0,0 +1,12 @@
+SSAnne_B1F_Room4_MapScripts:: @ 8160DA6
+	.byte 0
+
+SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7
+	trainerbattle 0, 136, 0, Text_174315, Text_174348
+	msgbox gUnknown_8174362, 6
+	end
+
+SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE
+	trainerbattle 0, 137, 0, Text_174385, Text_1743B3
+	msgbox gUnknown_81743C8, 6
+	end
diff --git a/data/maps/SSAnne_B1F_Room4/text.inc b/data/maps/SSAnne_B1F_Room4/text.inc
new file mode 100644
index 000000000..d2f19f49f
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room4/text.inc
@@ -0,0 +1,23 @@
+Text_174315:: @ 8174315
+    .string "You know what they say about\n"
+    .string "sailors and battling!$"
+
+Text_174348:: @ 8174348
+    .string "Right!\n"
+    .string "Good battle, mate!$"
+
+gUnknown_8174362:: @ 8174362
+    .string "Hahaha!\n"
+    .string "Want to be a sailor, mate?$"
+
+Text_174385:: @ 8174385
+    .string "Come on, then!\n"
+    .string "My sailor's pride is at stake!$"
+
+Text_1743B3:: @ 81743B3
+    .string "Your spirit sank me!$"
+
+gUnknown_81743C8:: @ 81743C8
+    .string "Did you see the FISHING GURU in\n"
+    .string "VERMILION CITY?$"
+
diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json
new file mode 100644
index 000000000..0ea2a8747
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room5/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_SSANNE_B1F_ROOM5",
+  "name": "SSAnne_B1F_Room5",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "19",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_B1F_Room5_EventScript_160DD6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "134",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_B1F_Room5_EventScript_160DDF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_B1F_Room5_EventScript_1BE69F",
+      "flag": "361"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_B1F_CORRIDOR",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc
new file mode 100644
index 000000000..c449d1164
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room5/scripts.inc
@@ -0,0 +1,16 @@
+SSAnne_B1F_Room5_MapScripts:: @ 8160DD5
+	.byte 0
+
+SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6
+	msgbox gUnknown_81743F8, 2
+	end
+
+SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_MACHOKE, 0
+	msgbox gUnknown_8174444
+	waitmoncry
+	release
+	end
diff --git a/data/maps/SSAnne_B1F_Room5/text.inc b/data/maps/SSAnne_B1F_Room5/text.inc
new file mode 100644
index 000000000..ac30dbe95
--- /dev/null
+++ b/data/maps/SSAnne_B1F_Room5/text.inc
@@ -0,0 +1,8 @@
+gUnknown_81743F8:: @ 81743F8
+    .string "My buddy MACHOKE is super strong!\p"
+    .string "He has enough STRENGTH to move\n"
+    .string "big rocks!$"
+
+gUnknown_8174444:: @ 8174444
+    .string "MACHOKE: Gwoh! Goggoh!$"
+
diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json
new file mode 100644
index 000000000..9870b5f09
--- /dev/null
+++ b/data/maps/SSAnne_CaptainsOffice/map.json
@@ -0,0 +1,63 @@
+{
+  "id": "MAP_SSANNE_CAPTAINS_OFFICE",
+  "name": "SSAnne_CaptainsOffice",
+  "layout": "LAYOUT_SSANNE_CAPTAINS_OFFICE",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "63",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_CaptainsOffice_EventScript_160B3A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "script": "SSAnne_CaptainsOffice_EventScript_160BD2"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 3,
+      "elevation": 0,
+      "script": "SSAnne_CaptainsOffice_EventScript_160BC9"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "script": "SSAnne_CaptainsOffice_EventScript_160BD2"
+    }
+  ]
+}
diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc
new file mode 100644
index 000000000..32ab8b95c
--- /dev/null
+++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc
@@ -0,0 +1,48 @@
+SSAnne_CaptainsOffice_MapScripts:: @ 8160B39
+	.byte 0
+
+SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
+	lock
+	checkflag FLAG_0x237
+	goto_if_eq EventScript_160BB5
+	msgbox gUnknown_8173646
+	textcolor 3
+	message Text_173676
+	waitmessage
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	call EventScript_1A6675
+	delay 50
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81736A6
+	additem ITEM_HM01, 1
+	giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, BGM_FRLG_ME_KEYITEM
+	msgbox gUnknown_81737D2
+	setflag FLAG_0x237
+	setvar VAR_MAP_SCENE_VERMILION_CITY, 1
+	release
+	end
+
+EventScript_160BA0:: @ 8160BA0
+	msgbox gUnknown_81738C3
+	closemessage
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_160BB5:: @ 8160BB5
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_8173831
+	release
+	end
+
+SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9
+	msgbox gUnknown_81738E6, 3
+	end
+
+SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2
+	msgbox gUnknown_8173903, 3
+	end
diff --git a/data/maps/SSAnne_CaptainsOffice/text.inc b/data/maps/SSAnne_CaptainsOffice/text.inc
new file mode 100644
index 000000000..eab68b9bd
--- /dev/null
+++ b/data/maps/SSAnne_CaptainsOffice/text.inc
@@ -0,0 +1,53 @@
+gUnknown_8173646:: @ 8173646
+    .string "CAPTAIN: Ooargh…\n"
+    .string "I feel hideous…\l"
+    .string "Urrp! Seasick…$"
+
+Text_173676:: @ 8173676
+    .string "{PLAYER} rubbed the CAPTAIN's\n"
+    .string "back!\p"
+    .string "Rub-rub…\n"
+    .string "Rub-rub…$"
+
+gUnknown_81736A6:: @ 81736A6
+    .string "CAPTAIN: Whew! Thank you!\n"
+    .string "I'm feeling much better now.\p"
+    .string "You want to see my hidden CUT\n"
+    .string "technique?\p"
+    .string "I could show you my prized CUT\n"
+    .string "technique if I weren't so ill…\p"
+    .string "I know! You can have this!\n"
+    .string "This HIDDEN MACHINE!\p"
+    .string "Teach CUT to your POKéMON, and\n"
+    .string "you can see it CUT anytime!$"
+
+gUnknown_81737AF:: @ 81737AF
+    .string "{PLAYER} obtained HM01\n"
+    .string "from the CAPTAIN!$"
+
+gUnknown_81737D2:: @ 81737D2
+    .string "Using CUT, you can chop down\n"
+    .string "small trees.\p"
+    .string "Why not try it with the trees\n"
+    .string "around VERMILION CITY?$"
+
+gUnknown_8173831:: @ 8173831
+    .string "CAPTAIN: …Whew!\p"
+    .string "Now that I'm not sick anymore,\n"
+    .string "I guess it's time.\p"
+    .string "The S.S. ANNE will set sail soon!\p"
+    .string "Farewell, until our return to\n"
+    .string "VERMILION CITY!$"
+
+gUnknown_81738C3:: @ 81738C3
+    .string "Oh, no!\n"
+    .string "You have no room for this!$"
+
+gUnknown_81738E6:: @ 81738E6
+    .string "Yuck!\n"
+    .string "Shouldn't have looked!$"
+
+gUnknown_8173903:: @ 8173903
+    .string "How to Conquer Seasickness…\n"
+    .string "The CAPTAIN's reading this!$"
+
diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json
new file mode 100644
index 000000000..d4bf928af
--- /dev/null
+++ b/data/maps/SSAnne_Deck/map.json
@@ -0,0 +1,100 @@
+{
+  "id": "MAP_SSANNE_DECK",
+  "name": "SSAnne_Deck",
+  "layout": "LAYOUT_SSANNE_DECK",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "62",
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SSAnne_Deck_EventScript_160A9B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Deck_EventScript_160A72",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 13,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "27",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Deck_EventScript_160A7B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SSAnne_Deck_EventScript_160A84",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Deck_EventScript_160A69",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_3F_CORRIDOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_3F_CORRIDOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc
new file mode 100644
index 000000000..3f835e568
--- /dev/null
+++ b/data/maps/SSAnne_Deck/scripts.inc
@@ -0,0 +1,24 @@
+SSAnne_Deck_MapScripts:: @ 8160A68
+	.byte 0
+
+SSAnne_Deck_EventScript_160A69:: @ 8160A69
+	msgbox gUnknown_817326F, 2
+	end
+
+SSAnne_Deck_EventScript_160A72:: @ 8160A72
+	msgbox gUnknown_81732C6, 2
+	end
+
+SSAnne_Deck_EventScript_160A7B:: @ 8160A7B
+	msgbox gUnknown_81732A2, 2
+	end
+
+SSAnne_Deck_EventScript_160A84:: @ 8160A84
+	trainerbattle 0, 134, 0, Text_173308, Text_17332B
+	msgbox gUnknown_817333E, 6
+	end
+
+SSAnne_Deck_EventScript_160A9B:: @ 8160A9B
+	trainerbattle 0, 135, 0, Text_173382, Text_1733A0
+	msgbox gUnknown_81733B5, 6
+	end
diff --git a/data/maps/SSAnne_Deck/text.inc b/data/maps/SSAnne_Deck/text.inc
new file mode 100644
index 000000000..08be9fc7d
--- /dev/null
+++ b/data/maps/SSAnne_Deck/text.inc
@@ -0,0 +1,35 @@
+gUnknown_817326F:: @ 817326F
+    .string "The party's over.\n"
+    .string "The ship will be departing soon.$"
+
+gUnknown_81732A2:: @ 81732A2
+    .string "Whew!\n"
+    .string "Scrubbing decks is hard work!$"
+
+gUnknown_81732C6:: @ 81732C6
+    .string "Urf… I feel ill…\p"
+    .string "I got seasick, so I stepped out to\n"
+    .string "get some air…$"
+
+Text_173308:: @ 8173308
+    .string "Hey, matey!\p"
+    .string "Let's do a little jig!$"
+
+Text_17332B:: @ 817332B
+    .string "You're impressive!$"
+
+gUnknown_817333E:: @ 817333E
+    .string "How many kinds of POKéMON do you\n"
+    .string "think there are in this big world?$"
+
+Text_173382:: @ 8173382
+    .string "Ahoy, there!\n"
+    .string "Are you seasick?$"
+
+Text_1733A0:: @ 81733A0
+    .string "I was just careless!$"
+
+gUnknown_81733B5:: @ 81733B5
+    .string "My pa said there are 100 kinds of\n"
+    .string "POKéMON. I think there are more.$"
+
diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json
new file mode 100644
index 000000000..4694c1520
--- /dev/null
+++ b/data/maps/SSAnne_Exterior/map.json
@@ -0,0 +1,79 @@
+{
+  "id": "MAP_SSANNE_EXTERIOR",
+  "name": "SSAnne_Exterior",
+  "layout": "LAYOUT_SSANNE_EXTERIOR",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "151",
+      "x": 30,
+      "y": 16,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "135"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 31,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 32,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 32,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 33,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 33,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 58,
+      "y": 28,
+      "elevation": 3,
+      "item": "ITEM_LAVA_COOKIE",
+      "flag": "190",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc
new file mode 100644
index 000000000..b0112c459
--- /dev/null
+++ b/data/maps/SSAnne_Exterior/scripts.inc
@@ -0,0 +1,67 @@
+SSAnne_Exterior_MapScripts:: @ 8160840
+	map_script 3, SSAnne_Exterior_MapScript1_16084B
+	map_script 2, SSAnne_Exterior_MapScript2_16084F
+	.byte 0
+
+SSAnne_Exterior_MapScript1_16084B:: @ 816084B
+	setworldmapflag FLAG_WORLD_MAP_SSANNE_EXTERIOR
+	end
+
+SSAnne_Exterior_MapScript2_16084F:: @ 816084F
+	map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859
+	.2byte 0
+
+SSAnne_Exterior_160859:: @ 8160859
+	lockall
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare_var_to_value VAR_0x8005, 6
+	call_if 3, EventScript_1608A1
+	compare_var_to_value VAR_0x8005, 7
+	call_if 4, EventScript_1608AC
+	fadenewbgm BGM_FRLG_SURF
+	delay 50
+	special Special_SSAnneDepartureCutscene
+	waitstate
+	removeobject 1
+	applymovement 255, Movement_1608B7
+	waitmovement 0
+	setvar VAR_MAP_SCENE_VERMILION_CITY, 2
+	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
+	warp MAP_VERMILION_CITY, 255, 23, 34
+	waitstate
+	releaseall
+	end
+
+EventScript_1608A1:: @ 81608A1
+	applymovement 255, Movement_1608C1
+	waitmovement 0
+	return
+
+EventScript_1608AC:: @ 81608AC
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	return
+
+Movement_1608B7:: @ 81608B7
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_11
+	step_end
+
+Movement_1608C1:: @ 81608C1
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_10
+	step_end
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
new file mode 100644
index 000000000..968c8c15c
--- /dev/null
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -0,0 +1,160 @@
+{
+  "id": "MAP_SSANNE_KITCHEN",
+  "name": "SSAnne_Kitchen",
+  "layout": "LAYOUT_SSANNE_KITCHEN",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "59",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160AB3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160ABC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160AC5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160ACE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B1E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B27",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B30",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_1BE6AC",
+      "flag": "362"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 8,
+      "elevation": 0,
+      "item": "ITEM_CHESTO_BERRY",
+      "flag": "122",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 4,
+      "elevation": 0,
+      "item": "ITEM_PECHA_BERRY",
+      "flag": "120",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 6,
+      "elevation": 0,
+      "item": "ITEM_CHERI_BERRY",
+      "flag": "121",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc
new file mode 100644
index 000000000..b1b60056d
--- /dev/null
+++ b/data/maps/SSAnne_Kitchen/scripts.inc
@@ -0,0 +1,53 @@
+SSAnne_Kitchen_MapScripts:: @ 8160AB2
+	.byte 0
+
+SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3
+	msgbox gUnknown_81733F8, 2
+	end
+
+SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC
+	msgbox gUnknown_8173429, 2
+	end
+
+SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5
+	msgbox gUnknown_8173462, 2
+	end
+
+SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE
+	lock
+	faceplayer
+	msgbox gUnknown_8173570
+	random 3
+	copyvar VAR_0x8008, VAR_RESULT
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, EventScript_160B03
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_160B0C
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, EventScript_160B15
+	release
+	end
+
+EventScript_160B03:: @ 8160B03
+	msgbox gUnknown_817359F
+	return
+
+EventScript_160B0C:: @ 8160B0C
+	msgbox gUnknown_81735DF
+	return
+
+EventScript_160B15:: @ 8160B15
+	msgbox gUnknown_8173611
+	return
+
+SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E
+	msgbox gUnknown_81734A0, 2
+	end
+
+SSAnne_Kitchen_EventScript_160B27:: @ 8160B27
+	msgbox gUnknown_81734D3, 2
+	end
+
+SSAnne_Kitchen_EventScript_160B30:: @ 8160B30
+	msgbox gUnknown_817353E, 2
+	end
diff --git a/data/maps/SSAnne_Kitchen/text.inc b/data/maps/SSAnne_Kitchen/text.inc
new file mode 100644
index 000000000..edd115076
--- /dev/null
+++ b/data/maps/SSAnne_Kitchen/text.inc
@@ -0,0 +1,48 @@
+gUnknown_81733F8:: @ 81733F8
+    .string "You, mon petit!\n"
+    .string "We're busy here!\l"
+    .string "Out of the way!$"
+
+gUnknown_8173429:: @ 8173429
+    .string "I saw an odd BERRY in the trash.\n"
+    .string "I wonder what that was?$"
+
+gUnknown_8173462:: @ 8173462
+    .string "I'm so busy I'm getting dizzy!\n"
+    .string "You have to give me room here!$"
+
+gUnknown_81734A0:: @ 81734A0
+    .string "Hum-de-hum-de-ho…\p"
+    .string "I peel spuds every day!\n"
+    .string "Hum-hum…$"
+
+gUnknown_81734D3:: @ 81734D3
+    .string "Did you hear about SNORLAX?\n"
+    .string "It's a glutton.\p"
+    .string "No other POKéMON eats and sleeps\n"
+    .string "the way SNORLAX can and does!$"
+
+gUnknown_817353E:: @ 817353E
+    .string "Snivel… Sniff…\p"
+    .string "I only get to peel onions…\n"
+    .string "Snivel…$"
+
+gUnknown_8173570:: @ 8173570
+    .string "Er-hem!\n"
+    .string "Indeed I am le CHEF!\p"
+    .string "Le main course is$"
+
+gUnknown_817359F:: @ 817359F
+    .string "Salmon du Salad!\p"
+    .string "Les guests may gripe it's fish\n"
+    .string "again, however!$"
+
+gUnknown_81735DF:: @ 81735DF
+    .string "Eels au Barbecue!\p"
+    .string "Les guests will mutiny, I fear.$"
+
+gUnknown_8173611:: @ 8173611
+    .string "Prime Beefsteak!\p"
+    .string "But, have I enough fillets du\n"
+    .string "beef?$"
+
diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json
new file mode 100644
index 000000000..93f66a692
--- /dev/null
+++ b/data/maps/SafariZone_Building1/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_SAFARI_ZONE_BUILDING1",
+  "name": "SafariZone_Building1",
+  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building1_EventScript_1623F5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building1_EventScript_1623EC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 12
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SafariZone_Building1/scripts.inc b/data/maps/SafariZone_Building1/scripts.inc
new file mode 100644
index 000000000..668e92250
--- /dev/null
+++ b/data/maps/SafariZone_Building1/scripts.inc
@@ -0,0 +1,10 @@
+SafariZone_Building1_MapScripts:: @ 81623EB
+	.byte 0
+
+SafariZone_Building1_EventScript_1623EC:: @ 81623EC
+	msgbox gUnknown_8177A5A, 2
+	end
+
+SafariZone_Building1_EventScript_1623F5:: @ 81623F5
+	msgbox gUnknown_8177A82, 2
+	end
diff --git a/data/maps/SafariZone_Building1/text.inc b/data/maps/SafariZone_Building1/text.inc
new file mode 100644
index 000000000..a071cffeb
--- /dev/null
+++ b/data/maps/SafariZone_Building1/text.inc
@@ -0,0 +1,8 @@
+gUnknown_8177A5A:: @ 8177A5A
+    .string "SARA: Where did my boyfriend,\n"
+    .string "ERIK, go?$"
+
+gUnknown_8177A82:: @ 8177A82
+    .string "I'm catching POKéMON to take home\n"
+    .string "as gifts.$"
+
diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json
new file mode 100644
index 000000000..178ecdc06
--- /dev/null
+++ b/data/maps/SafariZone_Building2/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_SAFARI_ZONE_BUILDING2",
+  "name": "SafariZone_Building2",
+  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building2_EventScript_162408",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building2_EventScript_1623FF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building2_EventScript_162411",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SafariZone_Building2/scripts.inc b/data/maps/SafariZone_Building2/scripts.inc
new file mode 100644
index 000000000..717ccf36b
--- /dev/null
+++ b/data/maps/SafariZone_Building2/scripts.inc
@@ -0,0 +1,14 @@
+SafariZone_Building2_MapScripts:: @ 81623FE
+	.byte 0
+
+SafariZone_Building2_EventScript_1623FF:: @ 81623FF
+	msgbox gUnknown_8177AE2, 2
+	end
+
+SafariZone_Building2_EventScript_162408:: @ 8162408
+	msgbox gUnknown_8177AAE, 2
+	end
+
+SafariZone_Building2_EventScript_162411:: @ 8162411
+	msgbox gUnknown_8177B16, 2
+	end
diff --git a/data/maps/SafariZone_Building2/text.inc b/data/maps/SafariZone_Building2/text.inc
new file mode 100644
index 000000000..b25194a31
--- /dev/null
+++ b/data/maps/SafariZone_Building2/text.inc
@@ -0,0 +1,12 @@
+gUnknown_8177AAE:: @ 8177AAE
+    .string "How many did you catch?\n"
+    .string "I'm bushed from the effort!$"
+
+gUnknown_8177AE2:: @ 8177AE2
+    .string "I caught a CHANSEY!\p"
+    .string "That makes this all worthwhile.$"
+
+gUnknown_8177B16:: @ 8177B16
+    .string "Whew!\n"
+    .string "I'm tired from all the fun!$"
+
diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json
new file mode 100644
index 000000000..768e83b94
--- /dev/null
+++ b/data/maps/SafariZone_Building3/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_SAFARI_ZONE_BUILDING3",
+  "name": "SafariZone_Building3",
+  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building3_EventScript_16242D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building3_EventScript_162424",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building3_EventScript_16241B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building3_EventScript_1ACED3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 12
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SafariZone_Building3/scripts.inc b/data/maps/SafariZone_Building3/scripts.inc
new file mode 100644
index 000000000..a4dc55062
--- /dev/null
+++ b/data/maps/SafariZone_Building3/scripts.inc
@@ -0,0 +1,14 @@
+SafariZone_Building3_MapScripts:: @ 816241A
+	.byte 0
+
+SafariZone_Building3_EventScript_16241B:: @ 816241B
+	msgbox gUnknown_8177BAB, 2
+	end
+
+SafariZone_Building3_EventScript_162424:: @ 8162424
+	msgbox gUnknown_8177B38, 2
+	end
+
+SafariZone_Building3_EventScript_16242D:: @ 816242D
+	msgbox gUnknown_8177BEC, 2
+	end
diff --git a/data/maps/SafariZone_Building3/text.inc b/data/maps/SafariZone_Building3/text.inc
new file mode 100644
index 000000000..d7956d083
--- /dev/null
+++ b/data/maps/SafariZone_Building3/text.inc
@@ -0,0 +1,15 @@
+gUnknown_8177B38:: @ 8177B38
+    .string "You can keep any item you find in\n"
+    .string "the SAFARI ZONE.\p"
+    .string "But, you'll run out of time if you\n"
+    .string "try for all of them at once.$"
+
+gUnknown_8177BAB:: @ 8177BAB
+    .string "Go to the deepest part of the\n"
+    .string "SAFARI ZONE. You will win a prize!$"
+
+gUnknown_8177BEC:: @ 8177BEC
+    .string "My EEVEE evolved into FLAREON.\p"
+    .string "But, a friend's EEVEE turned into a\n"
+    .string "VAPOREON. I wonder why?$"
+
diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json
new file mode 100644
index 000000000..0769bd7a2
--- /dev/null
+++ b/data/maps/SafariZone_Building4/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_SAFARI_ZONE_BUILDING4",
+  "name": "SafariZone_Building4",
+  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building4_EventScript_162440",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 2,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building4_EventScript_162437",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building4_EventScript_162449",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 10
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SafariZone_Building4/scripts.inc b/data/maps/SafariZone_Building4/scripts.inc
new file mode 100644
index 000000000..8f589cd8f
--- /dev/null
+++ b/data/maps/SafariZone_Building4/scripts.inc
@@ -0,0 +1,14 @@
+SafariZone_Building4_MapScripts:: @ 8162436
+	.byte 0
+
+SafariZone_Building4_EventScript_162437:: @ 8162437
+	msgbox gUnknown_8177D39, 2
+	end
+
+SafariZone_Building4_EventScript_162440:: @ 8162440
+	msgbox gUnknown_8177CEB, 2
+	end
+
+SafariZone_Building4_EventScript_162449:: @ 8162449
+	msgbox gUnknown_8177D8B, 2
+	end
diff --git a/data/maps/SafariZone_Building4/text.inc b/data/maps/SafariZone_Building4/text.inc
new file mode 100644
index 000000000..66bf06ba2
--- /dev/null
+++ b/data/maps/SafariZone_Building4/text.inc
@@ -0,0 +1,22 @@
+Text_177C47:: @ 8177C47
+    .string "The SAFARI ZONE's huge, wouldn't\n"
+    .string "you say?\p"
+    .string "FUCHSIA's GYM LEADER, KOGA, \n"
+    .string "patrols the grounds every so often.\p"
+    .string "Thanks to him, we can play here\n"
+    .string "knowing that we're safe.$"
+
+gUnknown_8177CEB:: @ 8177CEB
+    .string "Tossing ROCKS at POKéMON might\n"
+    .string "make them run, but they'll be\l"
+    .string "easier to catch.$"
+
+gUnknown_8177D39:: @ 8177D39
+    .string "Using BAIT will make POKéMON more\n"
+    .string "likely to stick around if they get\l"
+    .string "busy eating.$"
+
+gUnknown_8177D8B:: @ 8177D8B
+    .string "I hiked a lot, but I didn't see any\n"
+    .string "POKéMON I wanted.$"
+
diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json
new file mode 100644
index 000000000..2eec6d8da
--- /dev/null
+++ b/data/maps/SafariZone_Center/map.json
@@ -0,0 +1,156 @@
+{
+  "id": "MAP_SAFARI_ZONE_CENTER",
+  "name": "SafariZone_Center",
+  "layout": "LAYOUT_SAFARI_ZONE_CENTER",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 24,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Center_EventScript_1BE7D7",
+      "flag": "385"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 25,
+      "y": 30,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 26,
+      "y": 30,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 27,
+      "y": 30,
+      "elevation": 3,
+      "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 25,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 26,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 27,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 8,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 8,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 8,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 43,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 43,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 43,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 29,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_BUILDING1",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 30,
+      "y": 26,
+      "elevation": 0,
+      "script": "SafariZone_Center_EventScript_162361"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 25,
+      "y": 27,
+      "elevation": 0,
+      "script": "SafariZone_Center_EventScript_16236A"
+    },
+    {
+      "type": "hidden_item",
+      "x": 27,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_LEAF_STONE",
+      "flag": "22",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 33,
+      "y": 20,
+      "elevation": 0,
+      "script": "SafariZone_Center_EventScript_162373"
+    }
+  ]
+}
diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc
new file mode 100644
index 000000000..9f887910a
--- /dev/null
+++ b/data/maps/SafariZone_Center/scripts.inc
@@ -0,0 +1,19 @@
+SafariZone_Center_MapScripts:: @ 8162357
+	map_script 3, SafariZone_Center_MapScript1_16235D
+	.byte 0
+
+SafariZone_Center_MapScript1_16235D:: @ 816235D
+	setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER
+	end
+
+SafariZone_Center_EventScript_162361:: @ 8162361
+	msgbox gUnknown_81777F2, 3
+	end
+
+SafariZone_Center_EventScript_16236A:: @ 816236A
+	msgbox gUnknown_81777FD, 3
+	end
+
+SafariZone_Center_EventScript_162373:: @ 8162373
+	msgbox gUnknown_817782F, 3
+	end
diff --git a/data/maps/SafariZone_Center/text.inc b/data/maps/SafariZone_Center/text.inc
new file mode 100644
index 000000000..7116a230a
--- /dev/null
+++ b/data/maps/SafariZone_Center/text.inc
@@ -0,0 +1,11 @@
+gUnknown_81777F2:: @ 81777F2
+    .string "REST HOUSE$"
+
+gUnknown_81777FD:: @ 81777FD
+    .string "TRAINER TIPS\p"
+    .string "Press START to check\n"
+    .string "remaining time.$"
+
+gUnknown_817782F:: @ 817782F
+    .string "CENTER AREA$"
+
diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json
new file mode 100644
index 000000000..23a6d3596
--- /dev/null
+++ b/data/maps/SafariZone_East/map.json
@@ -0,0 +1,144 @@
+{
+  "id": "MAP_SAFARI_ZONE_EAST",
+  "name": "SafariZone_East",
+  "layout": "LAYOUT_SAFARI_ZONE_EAST",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 13,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_East_EventScript_1BE7E4",
+      "flag": "386"
+    },
+    {
+      "graphics_id": "92",
+      "x": 37,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_East_EventScript_1BE7F1",
+      "flag": "387"
+    },
+    {
+      "graphics_id": "92",
+      "x": 31,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_East_EventScript_1BE7FE",
+      "flag": "388"
+    },
+    {
+      "graphics_id": "92",
+      "x": 36,
+      "y": 17,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_East_EventScript_1BE80B",
+      "flag": "389"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 8,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 8,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 8,
+      "y": 27,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 8,
+      "y": 28,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 40,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_BUILDING2",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 18,
+      "y": 27,
+      "elevation": 0,
+      "script": "SafariZone_East_EventScript_16238F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 43,
+      "y": 15,
+      "elevation": 0,
+      "script": "SafariZone_East_EventScript_16237D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 17,
+      "y": 8,
+      "elevation": 0,
+      "script": "SafariZone_East_EventScript_162386"
+    }
+  ]
+}
diff --git a/data/maps/SafariZone_East/scripts.inc b/data/maps/SafariZone_East/scripts.inc
new file mode 100644
index 000000000..b38039b36
--- /dev/null
+++ b/data/maps/SafariZone_East/scripts.inc
@@ -0,0 +1,14 @@
+SafariZone_East_MapScripts:: @ 816237C
+	.byte 0
+
+SafariZone_East_EventScript_16237D:: @ 816237D
+	msgbox gUnknown_817783B, 3
+	end
+
+SafariZone_East_EventScript_162386:: @ 8162386
+	msgbox gUnknown_8177846, 3
+	end
+
+SafariZone_East_EventScript_16238F:: @ 816238F
+	msgbox gUnknown_8177884, 3
+	end
diff --git a/data/maps/SafariZone_East/text.inc b/data/maps/SafariZone_East/text.inc
new file mode 100644
index 000000000..785cc3a5e
--- /dev/null
+++ b/data/maps/SafariZone_East/text.inc
@@ -0,0 +1,12 @@
+gUnknown_817783B:: @ 817783B
+    .string "REST HOUSE$"
+
+gUnknown_8177846:: @ 8177846
+    .string "TRAINER TIPS\p"
+    .string "The remaining time declines only\n"
+    .string "while you walk.$"
+
+gUnknown_8177884:: @ 8177884
+    .string "AREA 1\n"
+    .string "WEST: CENTER AREA$"
+
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
new file mode 100644
index 000000000..f69e86fd5
--- /dev/null
+++ b/data/maps/SafariZone_North/map.json
@@ -0,0 +1,187 @@
+{
+  "id": "MAP_SAFARI_ZONE_NORTH",
+  "name": "SafariZone_North",
+  "layout": "LAYOUT_SAFARI_ZONE_NORTH",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_North_EventScript_1BE818",
+      "flag": "390"
+    },
+    {
+      "graphics_id": "92",
+      "x": 28,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_North_EventScript_1BE825",
+      "flag": "391"
+    },
+    {
+      "graphics_id": "92",
+      "x": 29,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_North_EventScript_1BEBDA",
+      "flag": "467"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 34,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 20,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 21,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 22,
+      "y": 34,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 48,
+      "y": 31,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 48,
+      "y": 32,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 48,
+      "y": 33,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 30,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 31,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 32,
+      "y": 34,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 43,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_BUILDING3",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 27,
+      "elevation": 0,
+      "script": "SafariZone_North_EventScript_1623A2"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 23,
+      "y": 31,
+      "elevation": 0,
+      "script": "SafariZone_North_EventScript_1623AB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 32,
+      "elevation": 0,
+      "script": "SafariZone_North_EventScript_1623B4"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 34,
+      "y": 28,
+      "elevation": 0,
+      "script": "SafariZone_North_EventScript_1623BD"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 44,
+      "y": 9,
+      "elevation": 0,
+      "script": "SafariZone_North_EventScript_162399"
+    }
+  ]
+}
diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc
new file mode 100644
index 000000000..f45988629
--- /dev/null
+++ b/data/maps/SafariZone_North/scripts.inc
@@ -0,0 +1,22 @@
+SafariZone_North_MapScripts:: @ 8162398
+	.byte 0
+
+SafariZone_North_EventScript_162399:: @ 8162399
+	msgbox gUnknown_817789D, 3
+	end
+
+SafariZone_North_EventScript_1623A2:: @ 81623A2
+	msgbox gUnknown_81778A8, 3
+	end
+
+SafariZone_North_EventScript_1623AB:: @ 81623AB
+	msgbox gUnknown_81778D6, 3
+	end
+
+SafariZone_North_EventScript_1623B4:: @ 81623B4
+	msgbox gUnknown_81778DD, 3
+	end
+
+SafariZone_North_EventScript_1623BD:: @ 81623BD
+	msgbox gUnknown_8177935, 3
+	end
diff --git a/data/maps/SafariZone_North/text.inc b/data/maps/SafariZone_North/text.inc
new file mode 100644
index 000000000..a7978dcfe
--- /dev/null
+++ b/data/maps/SafariZone_North/text.inc
@@ -0,0 +1,21 @@
+gUnknown_817789D:: @ 817789D
+    .string "REST HOUSE$"
+
+gUnknown_81778A8:: @ 81778A8
+    .string "TRAINER TIPS\p"
+    .string "The SECRET HOUSE is still ahead.$"
+
+gUnknown_81778D6:: @ 81778D6
+    .string "AREA 2$"
+
+gUnknown_81778DD:: @ 81778DD
+    .string "TRAINER TIPS\p"
+    .string "POKéMON hide in tall grass.\p"
+    .string "Zigzag through grassy areas to\n"
+    .string "flush them out.$"
+
+gUnknown_8177935:: @ 8177935
+    .string "TRAINER TIPS\p"
+    .string "Win a free HM for finding the\n"
+    .string "SECRET HOUSE.$"
+
diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json
new file mode 100644
index 000000000..0616c4782
--- /dev/null
+++ b/data/maps/SafariZone_SecretHouse/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_SAFARI_ZONE_SECRET_HOUSE",
+  "name": "SafariZone_SecretHouse",
+  "layout": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "47",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_SecretHouse_EventScript_162453",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_WEST",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc
new file mode 100644
index 000000000..67987618d
--- /dev/null
+++ b/data/maps/SafariZone_SecretHouse/scripts.inc
@@ -0,0 +1,28 @@
+SafariZone_SecretHouse_MapScripts:: @ 8162452
+	.byte 0
+
+SafariZone_SecretHouse_EventScript_162453:: @ 8162453
+	lock
+	faceplayer
+	checkflag FLAG_0x239
+	goto_if_eq EventScript_1624A9
+	msgbox gUnknown_8177DC1
+	checkitemspace ITEM_HM03, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16249F
+	additem ITEM_HM03, 1
+	giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03
+	msgbox gUnknown_8177EB7
+	setflag FLAG_0x239
+	release
+	end
+
+EventScript_16249F:: @ 816249F
+	msgbox gUnknown_8177F72
+	release
+	end
+
+EventScript_1624A9:: @ 81624A9
+	msgbox gUnknown_8177EB7
+	release
+	end
diff --git a/data/maps/SafariZone_SecretHouse/text.inc b/data/maps/SafariZone_SecretHouse/text.inc
new file mode 100644
index 000000000..04ea02125
--- /dev/null
+++ b/data/maps/SafariZone_SecretHouse/text.inc
@@ -0,0 +1,28 @@
+gUnknown_8177DC1:: @ 8177DC1
+    .string "Ah! Finally!\p"
+    .string "You're the first person to reach\n"
+    .string "the SECRET HOUSE!\p"
+    .string "Although I made a campaign\n"
+    .string "for our grand opening,\p"
+    .string "I was getting worried that no one\n"
+    .string "would win our campaign prize.\p"
+    .string "Congratulations!\n"
+    .string "You have won!$"
+
+gUnknown_8177E92:: @ 8177E92
+    .string "{PLAYER} received HM03\n"
+    .string "from the attendant!$"
+
+gUnknown_8177EB7:: @ 8177EB7
+    .string "HM03 is SURF.\p"
+    .string "POKéMON will be able to ferry you\n"
+    .string "across water using it.\p"
+    .string "And, this HM isn't disposable, so\n"
+    .string "you can use it over and over.\p"
+    .string "You're super lucky for winning this\n"
+    .string "fabulous prize!$"
+
+gUnknown_8177F72:: @ 8177F72
+    .string "You don't have room for this\n"
+    .string "fabulous prize!$"
+
diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json
new file mode 100644
index 000000000..e91ecd175
--- /dev/null
+++ b/data/maps/SafariZone_West/map.json
@@ -0,0 +1,188 @@
+{
+  "id": "MAP_SAFARI_ZONE_WEST",
+  "name": "SafariZone_West",
+  "layout": "LAYOUT_SAFARI_ZONE_WEST",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "92",
+      "x": 28,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_West_EventScript_1BE83F",
+      "flag": "393"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_West_EventScript_1BE832",
+      "flag": "392"
+    },
+    {
+      "graphics_id": "92",
+      "x": 16,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_West_EventScript_1BE84C",
+      "flag": "394"
+    },
+    {
+      "graphics_id": "92",
+      "x": 27,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_West_EventScript_1BE859",
+      "flag": "395"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 30,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 32,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 37,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 38,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 39,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_NORTH",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 40,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 40,
+      "y": 27,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 40,
+      "y": 28,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_CENTER",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 12,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_SECRET_HOUSE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 19,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_BUILDING4",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 27,
+      "y": 9,
+      "elevation": 0,
+      "script": "SafariZone_West_EventScript_1623D0"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 36,
+      "y": 10,
+      "elevation": 0,
+      "script": "SafariZone_West_EventScript_1623D9"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 35,
+      "y": 26,
+      "elevation": 0,
+      "script": "SafariZone_West_EventScript_1623E2"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 22,
+      "y": 19,
+      "elevation": 0,
+      "script": "SafariZone_West_EventScript_1623C7"
+    },
+    {
+      "type": "hidden_item",
+      "x": 13,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_REVIVE",
+      "flag": "23",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SafariZone_West/scripts.inc b/data/maps/SafariZone_West/scripts.inc
new file mode 100644
index 000000000..2b8357334
--- /dev/null
+++ b/data/maps/SafariZone_West/scripts.inc
@@ -0,0 +1,18 @@
+SafariZone_West_MapScripts:: @ 81623C6
+	.byte 0
+
+SafariZone_West_EventScript_1623C7:: @ 81623C7
+	msgbox gUnknown_817796E, 3
+	end
+
+SafariZone_West_EventScript_1623D0:: @ 81623D0
+	msgbox gUnknown_8177979, 3
+	end
+
+SafariZone_West_EventScript_1623D9:: @ 81623D9
+	msgbox gUnknown_81779F8, 3
+	end
+
+SafariZone_West_EventScript_1623E2:: @ 81623E2
+	msgbox gUnknown_8177A41, 3
+	end
diff --git a/data/maps/SafariZone_West/text.inc b/data/maps/SafariZone_West/text.inc
new file mode 100644
index 000000000..14a097ada
--- /dev/null
+++ b/data/maps/SafariZone_West/text.inc
@@ -0,0 +1,20 @@
+gUnknown_817796E:: @ 817796E
+    .string "REST HOUSE$"
+
+gUnknown_8177979:: @ 8177979
+    .string "REQUEST NOTICE\p"
+    .string "Please find the SAFARI WARDEN's\n"
+    .string "lost GOLD TEETH.\l"
+    .string "They're around here somewhere.\p"
+    .string "Reward offered!\n"
+    .string "Contact: WARDEN$"
+
+gUnknown_81779F8:: @ 81779F8
+    .string "TRAINER TIPS\p"
+    .string "Zone Exploration Campaign!\n"
+    .string "The Search for the SECRET HOUSE!$"
+
+gUnknown_8177A41:: @ 8177A41
+    .string "AREA 3\n"
+    .string "EAST: CENTER AREA$"
+
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
new file mode 100644
index 000000000..f86012a9a
--- /dev/null
+++ b/data/maps/SaffronCity/map.json
@@ -0,0 +1,40 @@
+{
+  "id": "MAP_SAFFRON_CITY",
+  "name": "SaffronCity",
+  "layout": "LAYOUT_SAFFRON_CITY",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE5",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE6",
+      "offset": 12,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE7",
+      "offset": 10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE8",
+      "offset": 10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc
new file mode 100644
index 000000000..0b3469775
--- /dev/null
+++ b/data/maps/SaffronCity/scripts.inc
@@ -0,0 +1,2 @@
+SaffronCity_MapScripts:: @ 8167483
+	.byte 0
diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json
new file mode 100644
index 000000000..a8d80bb8e
--- /dev/null
+++ b/data/maps/SaffronCity_Dojo/map.json
@@ -0,0 +1,181 @@
+{
+  "id": "MAP_SAFFRON_CITY_DOJO",
+  "name": "SaffronCity_Dojo",
+  "layout": "LAYOUT_SAFFRON_CITY_DOJO",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "54",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 7,
+      "script": "SaffronCity_Dojo_EventScript_16ED46",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 7,
+      "script": "SaffronCity_Dojo_EventScript_16ED5D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 7,
+      "script": "SaffronCity_Dojo_EventScript_16ED74",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 7,
+      "script": "SaffronCity_Dojo_EventScript_16ED8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SaffronCity_Dojo_EventScript_16EDA2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Dojo_EventScript_16EC00",
+      "flag": "96"
+    },
+    {
+      "graphics_id": "92",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Dojo_EventScript_16EC46",
+      "flag": "97"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4081",
+      "var_value": 0,
+      "script": "SaffronCity_Dojo_EventScript_16EBDC"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4081",
+      "var_value": 0,
+      "script": "SaffronCity_Dojo_EventScript_16EBEE"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 13,
+      "elevation": 0,
+      "script": "SaffronCity_Dojo_EventScript_16ED2B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 13,
+      "elevation": 0,
+      "script": "SaffronCity_Dojo_EventScript_16ED2B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "script": "SaffronCity_Dojo_EventScript_16ED34"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "script": "SaffronCity_Dojo_EventScript_16ED3D"
+    }
+  ]
+}
diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc
new file mode 100644
index 000000000..8be7e27a6
--- /dev/null
+++ b/data/maps/SaffronCity_Dojo/scripts.inc
@@ -0,0 +1,160 @@
+SaffronCity_Dojo_MapScripts:: @ 816EBDB
+	.byte 0
+
+SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC
+	lockall
+	setvar VAR_0x4081, 1
+	applymovement 5, Movement_1A75E7
+	waitmovement 0
+	releaseall
+	end
+
+SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE
+	lockall
+	setvar VAR_0x4081, 1
+	applymovement 5, Movement_1A75EB
+	waitmovement 0
+	releaseall
+	end
+
+SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
+	lock
+	faceplayer
+	checkflag FLAG_0x278
+	goto_if_eq EventScript_16EC3C
+	drawmonpic SPECIES_HITMONLEE, 10, 3
+	setvar VAR_0x4001, SPECIES_HITMONLEE
+	applymovement 5, Movement_1A75E9
+	waitmovement 0
+	textcolor 0
+	msgbox gUnknown_819B44E, MSGBOX_YESNO
+	call EventScript_1A6675
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16EC82
+	erasemonpic
+	release
+	end
+
+EventScript_16EC3C:: @ 816EC3C
+	msgbox gUnknown_819B4E1
+	release
+	end
+
+SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
+	lock
+	faceplayer
+	checkflag FLAG_0x278
+	goto_if_eq EventScript_16EC3C
+	drawmonpic SPECIES_HITMONCHAN, 10, 3
+	setvar VAR_0x4001, SPECIES_HITMONCHAN
+	applymovement 5, Movement_1A75E9
+	waitmovement 0
+	textcolor 0
+	msgbox gUnknown_819B49E, MSGBOX_YESNO
+	call EventScript_1A6675
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16EC82
+	erasemonpic
+	release
+	end
+
+EventScript_16EC82:: @ 816EC82
+	erasemonpic
+	givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16ECB5
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16ECEC
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A927C
+	release
+	end
+
+EventScript_16ECB5:: @ 816ECB5
+	removeobject VAR_LAST_TALKED
+	getspeciesname 0, VAR_0x4001
+	playfanfare MUS_FANFA1
+	message Text_19B473
+	waitmessage
+	waitfanfare
+	setflag FLAG_0x278
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16ED29
+	call EventScript_1A8C27
+	call EventScript_1A74EB
+	goto EventScript_16ED29
+	end
+
+EventScript_16ECEC:: @ 816ECEC
+	removeobject VAR_LAST_TALKED
+	getspeciesname 0, VAR_0x4001
+	playfanfare MUS_FANFA1
+	message Text_19B473
+	waitmessage
+	waitfanfare
+	setflag FLAG_0x278
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16ED1E
+	call EventScript_1A8C33
+	goto EventScript_16ED1E
+	end
+
+EventScript_16ED1E:: @ 816ED1E
+	call EventScript_1A8C3C
+	goto EventScript_16ED29
+	end
+
+EventScript_16ED29:: @ 816ED29
+	release
+	end
+
+SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B
+	msgbox gUnknown_819B52E, 3
+	end
+
+SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34
+	msgbox gUnknown_819B4F8, 3
+	end
+
+SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D
+	msgbox gUnknown_819B50F, 3
+	end
+
+SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46
+	trainerbattle 0, 321, 0, Text_19B3DF, Text_19B40F
+	msgbox gUnknown_819B41F, 6
+	end
+
+SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D
+	trainerbattle 0, 319, 0, Text_19B2E0, Text_19B2FD
+	msgbox gUnknown_819B30F, 6
+	end
+
+SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74
+	trainerbattle 0, 320, 0, Text_19B341, Text_19B396
+	msgbox gUnknown_819B3AC, 6
+	end
+
+SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B
+	trainerbattle 0, 318, 0, Text_19B275, Text_19B292
+	msgbox gUnknown_819B29D, 6
+	end
+
+SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2
+	trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0
+	checkflag FLAG_0x278
+	goto_if_eq EventScript_16EDC6
+	msgbox gUnknown_819B1A7, 6
+	end
+
+EventScript_16EDC6:: @ 816EDC6
+	msgbox gUnknown_819B24C
+	release
+	end
+
+EventScript_16EDD0:: @ 816EDD0
+	setvar VAR_0x4081, 1
+	release
+	end
diff --git a/data/maps/SaffronCity_Dojo/text.inc b/data/maps/SaffronCity_Dojo/text.inc
new file mode 100644
index 000000000..d85b5a843
--- /dev/null
+++ b/data/maps/SaffronCity_Dojo/text.inc
@@ -0,0 +1,105 @@
+Text_19B123:: @ 819B123
+    .string "？　みえないぞ‥$"
+
+Text_19B12C:: @ 819B12C
+    .string "Grunt!\p"
+    .string "I am the KARATE MASTER!\n"
+    .string "I am the LEADER here!\p"
+    .string "You wish to challenge us?\n"
+    .string "Expect no mercy!\p"
+    .string "Fwaaa!$"
+
+Text_19B193:: @ 819B193
+    .string "Hwa!\n"
+    .string "Arrgh! Beaten!$"
+
+gUnknown_819B1A7:: @ 819B1A7
+    .string "Indeed, I have lost!\p"
+    .string "But, I beseech you, do not take\n"
+    .string "our emblem as your trophy!\p"
+    .string "In return, I will give you a prized\n"
+    .string "FIGHTING POKéMON!\p"
+    .string "Choose whichever one you like!$"
+
+gUnknown_819B24C:: @ 819B24C
+    .string "Grunt!\n"
+    .string "Stay and train at karate with us!$"
+
+Text_19B275:: @ 819B275
+    .string "Hoargh!\n"
+    .string "Take your shoes off!$"
+
+Text_19B292:: @ 819B292
+    .string "I give up!$"
+
+gUnknown_819B29D:: @ 819B29D
+    .string "You wait 'til you see our MASTER!\n"
+    .string "I'm a small fry compared to him!$"
+
+Text_19B2E0:: @ 819B2E0
+    .string "I hear you're good!\n"
+    .string "Show me!$"
+
+Text_19B2FD:: @ 819B2FD
+    .string "Judge!\n"
+    .string "One point!$"
+
+gUnknown_819B30F:: @ 819B30F
+    .string "Our MASTER is a pro fighter.\n"
+    .string "Be prepared to lose!$"
+
+Text_19B341:: @ 819B341
+    .string "Hiyah!\n"
+    .string "I have no fear for anything tough!\p"
+    .string "I shatter boulders for training\n"
+    .string "every day!$"
+
+Text_19B396:: @ 819B396
+    .string "Yow!\n"
+    .string "Stubbed fingers!$"
+
+gUnknown_819B3AC:: @ 819B3AC
+    .string "The only thing that frightens us is\n"
+    .string "psychic power!$"
+
+Text_19B3DF:: @ 819B3DF
+    .string "Hwaah!\p"
+    .string "You're trespassing in our\n"
+    .string "FIGHTING DOJO!$"
+
+Text_19B40F:: @ 819B40F
+    .string "Oof!\n"
+    .string "I give up!$"
+
+gUnknown_819B41F:: @ 819B41F
+    .string "The prime fighters across the land\n"
+    .string "train here.$"
+
+gUnknown_819B44E:: @ 819B44E
+    .string "You want the hard-kicking\n"
+    .string "HITMONLEE?$"
+
+Text_19B473:: @ 819B473
+    .string "{PLAYER} received the {STR_VAR_1}\n"
+    .string "from the KARATE MASTER.$"
+
+gUnknown_819B49E:: @ 819B49E
+    .string "You want the piston-punching\n"
+    .string "HITMONCHAN?$"
+
+Text_19B4C7:: @ 819B4C7
+    .string "{PLAYER}は　カラテ　だいおう　から\n"
+    .string "{STR_VAR_1}を　もらった！$"
+
+gUnknown_819B4E1:: @ 819B4E1
+    .string "Better not get greedy…$"
+
+gUnknown_819B4F8:: @ 819B4F8
+    .string "Enemies on every side!$"
+
+gUnknown_819B50F:: @ 819B50F
+    .string "What goes around comes around.$"
+
+gUnknown_819B52E:: @ 819B52E
+    .string "FIGHTING DOJO$"
+
diff --git a/data/maps/SaffronCity_Duplicate/map.json b/data/maps/SaffronCity_Duplicate/map.json
new file mode 100644
index 000000000..06bcbfd01
--- /dev/null
+++ b/data/maps/SaffronCity_Duplicate/map.json
@@ -0,0 +1,407 @@
+{
+  "id": "MAP_SAFFRON_CITY_DUPLICATE",
+  "name": "SaffronCity_Duplicate",
+  "layout": "LAYOUT_SAFFRON_CITY_DUPLICATE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE5",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE6",
+      "offset": 12,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE7",
+      "offset": 10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE8",
+      "offset": 10,
+      "direction": "right"
+    }
+  ],
+  "connections_no_include": true,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 22,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_16737A",
+      "flag": "62"
+    },
+    {
+      "graphics_id": "49",
+      "x": 26,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_167383",
+      "flag": "62"
+    },
+    {
+      "graphics_id": "49",
+      "x": 46,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_16738C",
+      "flag": "62"
+    },
+    {
+      "graphics_id": "49",
+      "x": 27,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_167395",
+      "flag": "62"
+    },
+    {
+      "graphics_id": "49",
+      "x": 25,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 7,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_16739E",
+      "flag": "62"
+    },
+    {
+      "graphics_id": "49",
+      "x": 34,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_1673B9",
+      "flag": "62"
+    },
+    {
+      "graphics_id": "49",
+      "x": 30,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 5,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_1673B0",
+      "flag": "62"
+    },
+    {
+      "graphics_id": "49",
+      "x": 48,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_1673A7",
+      "flag": "62"
+    },
+    {
+      "graphics_id": "18",
+      "x": 37,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_1673EC",
+      "flag": "63"
+    },
+    {
+      "graphics_id": "47",
+      "x": 21,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_1673E3",
+      "flag": "63"
+    },
+    {
+      "graphics_id": "25",
+      "x": 39,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_16741A",
+      "flag": "63"
+    },
+    {
+      "graphics_id": "19",
+      "x": 44,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_1673FE",
+      "flag": "63"
+    },
+    {
+      "graphics_id": "114",
+      "x": 45,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_167407",
+      "flag": "63"
+    },
+    {
+      "graphics_id": "22",
+      "x": 32,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 5,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_1673F5",
+      "flag": "63"
+    },
+    {
+      "graphics_id": "24",
+      "x": 47,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Duplicate_EventScript_1AD03A",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 33,
+      "y": 30,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 22,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 40,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_DOJO",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 46,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 27,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_HOUSE2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 40,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_MART",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 24,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 43,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_HOUSE3",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 27,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE7_EAST_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 34,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 58,
+      "y": 27,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE8_WEST_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 34,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 35,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 35,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 47,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 14,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_167423"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 42,
+      "y": 14,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_16742C"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 25,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_167471"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 18,
+      "y": 30,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_167456"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 31,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_16745F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 54,
+      "y": 25,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_16744D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 50,
+      "y": 14,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_167435"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 40,
+      "y": 38,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_167468"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 49,
+      "y": 22,
+      "elevation": 0,
+      "script": "SaffronCity_Duplicate_EventScript_16747A"
+    }
+  ]
+}
diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc
new file mode 100644
index 000000000..b19502c90
--- /dev/null
+++ b/data/maps/SaffronCity_Duplicate/scripts.inc
@@ -0,0 +1,128 @@
+SaffronCity_Duplicate_MapScripts:: @ 816735F
+	map_script 3, SaffronCity_Duplicate_MapScript1_167365
+	.byte 0
+
+SaffronCity_Duplicate_MapScript1_167365:: @ 8167365
+	setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE
+	checkflag FLAG_0x23C
+	call_if 0, EventScript_167372
+	end
+
+EventScript_167372:: @ 8167372
+	setobjectxyperm 6, 33, 31
+	return
+
+SaffronCity_Duplicate_EventScript_16737A:: @ 816737A
+	msgbox gUnknown_8181003, 2
+	end
+
+SaffronCity_Duplicate_EventScript_167383:: @ 8167383
+	msgbox gUnknown_818101F, 2
+	end
+
+SaffronCity_Duplicate_EventScript_16738C:: @ 816738C
+	msgbox gUnknown_818105A, 2
+	end
+
+SaffronCity_Duplicate_EventScript_167395:: @ 8167395
+	msgbox gUnknown_8181087, 2
+	end
+
+SaffronCity_Duplicate_EventScript_16739E:: @ 816739E
+	msgbox gUnknown_81810A7, 2
+	end
+
+SaffronCity_Duplicate_EventScript_1673A7:: @ 81673A7
+	msgbox gUnknown_81810D5, 2
+	end
+
+SaffronCity_Duplicate_EventScript_1673B0:: @ 81673B0
+	msgbox gUnknown_81810F5, 2
+	end
+
+SaffronCity_Duplicate_EventScript_1673B9:: @ 81673B9
+	lock
+	checkflag FLAG_0x23C
+	goto_if_eq EventScript_1673D7
+	applymovement 6, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81812CA
+	release
+	end
+
+EventScript_1673D7:: @ 81673D7
+	textcolor 3
+	msgbox gUnknown_8181302
+	release
+	end
+
+SaffronCity_Duplicate_EventScript_1673E3:: @ 81673E3
+	msgbox gUnknown_8181159, 2
+	end
+
+SaffronCity_Duplicate_EventScript_1673EC:: @ 81673EC
+	msgbox gUnknown_8181189, 2
+	end
+
+SaffronCity_Duplicate_EventScript_1673F5:: @ 81673F5
+	msgbox gUnknown_81811BF, 2
+	end
+
+SaffronCity_Duplicate_EventScript_1673FE:: @ 81673FE
+	msgbox gUnknown_8181225, 2
+	end
+
+SaffronCity_Duplicate_EventScript_167407:: @ 8167407
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_PIDGEOT, 0
+	msgbox gUnknown_8181286
+	waitmoncry
+	release
+	end
+
+SaffronCity_Duplicate_EventScript_16741A:: @ 816741A
+	msgbox gUnknown_8181299, 2
+	end
+
+SaffronCity_Duplicate_EventScript_167423:: @ 8167423
+	msgbox gUnknown_8181326, 3
+	end
+
+SaffronCity_Duplicate_EventScript_16742C:: @ 816742C
+	msgbox gUnknown_8181354, 3
+	end
+
+SaffronCity_Duplicate_EventScript_167435:: @ 8167435
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8181362
+	releaseall
+	end
+
+SaffronCity_Duplicate_EventScript_16744D:: @ 816744D
+	msgbox gUnknown_81813AA, 3
+	end
+
+SaffronCity_Duplicate_EventScript_167456:: @ 8167456
+	msgbox gUnknown_8181452, 3
+	end
+
+SaffronCity_Duplicate_EventScript_16745F:: @ 816745F
+	msgbox gUnknown_81814B9, 3
+	end
+
+SaffronCity_Duplicate_EventScript_167468:: @ 8167468
+	msgbox gUnknown_81814D3, 3
+	end
+
+SaffronCity_Duplicate_EventScript_167471:: @ 8167471
+	msgbox gUnknown_81814E7, 3
+	end
+
+SaffronCity_Duplicate_EventScript_16747A:: @ 816747A
+	msgbox gUnknown_8181519, 3
+	end
diff --git a/data/maps/SaffronCity_Duplicate/text.inc b/data/maps/SaffronCity_Duplicate/text.inc
new file mode 100644
index 000000000..aaa009647
--- /dev/null
+++ b/data/maps/SaffronCity_Duplicate/text.inc
@@ -0,0 +1,106 @@
+gUnknown_8181003:: @ 8181003
+    .string "What do you want?\n"
+    .string "Get lost!$"
+
+gUnknown_818101F:: @ 818101F
+    .string "BOSS said he'll take this town\n"
+    .string "in the name of TEAM ROCKET!$"
+
+gUnknown_818105A:: @ 818105A
+    .string "Don't get defiant!\n"
+    .string "Or I'll have to hurt you!$"
+
+gUnknown_8181087:: @ 8181087
+    .string "SAFFRON belongs to TEAM ROCKET!$"
+
+gUnknown_81810A7:: @ 81810A7
+    .string "My life as a criminal makes me feel\n"
+    .string "so alive!$"
+
+gUnknown_81810D5:: @ 81810D5
+    .string "Ow!\n"
+    .string "Watch where you're walking!$"
+
+gUnknown_81810F5:: @ 81810F5
+    .string "With SILPH under control, we can\n"
+    .string "exploit POKéMON around the world!\p"
+    .string "We'll get stinking rich, yeahah!$"
+
+gUnknown_8181159:: @ 8181159
+    .string "You beat TEAM ROCKET all alone?\n"
+    .string "That's amazing!$"
+
+gUnknown_8181189:: @ 8181189
+    .string "Yeah! TEAM ROCKET is gone!\n"
+    .string "It's safe to go out again!$"
+
+gUnknown_81811BF:: @ 81811BF
+    .string "People fled from here in droves\n"
+    .string "when those ROCKETS came.\p"
+    .string "They should be flocking back to\n"
+    .string "SAFFRON now.$"
+
+gUnknown_8181225:: @ 8181225
+    .string "I flew here on my PIDGEOT when\n"
+    .string "I read about SILPH.\p"
+    .string "It's already over?\n"
+    .string "I missed the media action…$"
+
+gUnknown_8181286:: @ 8181286
+    .string "PIDGEOT: Bi bibii!$"
+
+gUnknown_8181299:: @ 8181299
+    .string "I saw the ROCKET BOSS escaping\n"
+    .string "SILPH's building.$"
+
+gUnknown_81812CA:: @ 81812CA
+    .string "I'm a security guard.\p"
+    .string "Suspicious kids I don't allow in!$"
+
+gUnknown_8181302:: @ 8181302
+    .string "…\n"
+    .string "Snore…\p"
+    .string "Hah! He's taking a snooze!$"
+
+gUnknown_8181326:: @ 8181326
+    .string "SAFFRON CITY\n"
+    .string "Shining, Golden Land of Commerce$"
+
+gUnknown_8181354:: @ 8181354
+    .string "FIGHTING DOJO$"
+
+gUnknown_8181362:: @ 8181362
+    .string "SAFFRON CITY POKéMON GYM\n"
+    .string "LEADER: SABRINA\l"
+    .string "The Master of PSYCHIC POKéMON!$"
+
+gUnknown_81813AA:: @ 81813AA
+    .string "TRAINER TIPS\p"
+    .string "FULL HEAL cures all ailments like\n"
+    .string "burns, paralysis, poisoning,\l"
+    .string "freezing, and sleep.\p"
+    .string "It costs a bit more, but it's more\n"
+    .string "convenient than buying other items.$"
+
+gUnknown_8181452:: @ 8181452
+    .string "TRAINER TIPS\p"
+    .string "The new GREAT BALL offers improved\n"
+    .string "catching rates.\p"
+    .string "Try it on those hard-to-catch\n"
+    .string "POKéMON.$"
+
+gUnknown_81814B9:: @ 81814B9
+    .string "SILPH CO. OFFICE BUILDING$"
+
+gUnknown_81814D3:: @ 81814D3
+    .string "MR. PSYCHIC'S HOUSE$"
+
+gUnknown_81814E7:: @ 81814E7
+    .string "SILPH's latest product!\n"
+    .string "Release to be determined…$"
+
+gUnknown_8181519:: @ 8181519
+    .string "POKéMON TRAINER FAN CLUB\p"
+    .string "Many TRAINERS have scribbled their\n"
+    .string "names on this sign.$"
+
diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json
new file mode 100644
index 000000000..8b27fea95
--- /dev/null
+++ b/data/maps/SaffronCity_Gym/map.json
@@ -0,0 +1,384 @@
+{
+  "id": "MAP_SAFFRON_CITY_GYM",
+  "name": "SaffronCity_Gym",
+  "layout": "LAYOUT_SAFFRON_CITY_GYM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 1,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "41",
+      "x": 24,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SaffronCity_Gym_EventScript_16EEC3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 24,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SaffronCity_Gym_EventScript_16EE88",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SaffronCity_Gym_EventScript_16EEDA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SaffronCity_Gym_EventScript_16EEF1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SaffronCity_Gym_EventScript_16EF08",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "58",
+      "x": 4,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SaffronCity_Gym_EventScript_16EF1F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "85",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Gym_EventScript_16EDD8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 24,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SaffronCity_Gym_EventScript_16EE9F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 15,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Gym_EventScript_16EF36",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 14,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 15,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 18,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 32
+    },
+    {
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 22
+    },
+    {
+      "x": 0,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 20
+    },
+    {
+      "x": 0,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 30
+    },
+    {
+      "x": 0,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 0,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 28
+    },
+    {
+      "x": 0,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 19
+    },
+    {
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 18
+    },
+    {
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 17
+    },
+    {
+      "x": 8,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 15
+    },
+    {
+      "x": 8,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 26
+    },
+    {
+      "x": 8,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 13
+    },
+    {
+      "x": 12,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 24
+    },
+    {
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 16,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 16,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 18,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 20,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 23
+    },
+    {
+      "x": 20,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 20,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 21
+    },
+    {
+      "x": 20,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 16
+    },
+    {
+      "x": 20,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 27
+    },
+    {
+      "x": 20,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 14
+    },
+    {
+      "x": 28,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 25
+    },
+    {
+      "x": 28,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 28,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 31
+    },
+    {
+      "x": 28,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 28,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 29
+    },
+    {
+      "x": 28,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_GYM",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 20,
+      "elevation": 0,
+      "script": "SaffronCity_Gym_EventScript_16EF55"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 16,
+      "y": 20,
+      "elevation": 0,
+      "script": "SaffronCity_Gym_EventScript_16EF55"
+    }
+  ]
+}
diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc
new file mode 100644
index 000000000..cbd8b2d02
--- /dev/null
+++ b/data/maps/SaffronCity_Gym/scripts.inc
@@ -0,0 +1,110 @@
+SaffronCity_Gym_MapScripts:: @ 816EDD7
+	.byte 0
+
+SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, 420, 0, Text_19B53C, Text_19B602, EventScript_16EE0A
+	checkflag FLAG_0x29A
+	goto_if 0, EventScript_16EE3D
+	msgbox gUnknown_819B7F2
+	release
+	end
+
+EventScript_16EE0A:: @ 816EE0A
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 3
+	special SetFlavorTextFlagFromSpecialVars
+	clearflag FLAG_0x0AE
+	setflag FLAG_0x4B5
+	setflag FLAG_0x825
+	setvar VAR_0x8008, 6
+	call EventScript_1A6B18
+	goto EventScript_16EE3D
+	end
+
+EventScript_16EE3D:: @ 816EE3D
+	msgbox gUnknown_819B6FA
+	checkitemspace ITEM_TM04, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16EE7E
+	additem ITEM_TM04, 1
+	giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04
+	setflag FLAG_0x29A
+	msgbox gUnknown_819B685
+	release
+	end
+
+EventScript_16EE7E:: @ 816EE7E
+	msgbox gUnknown_819B849
+	release
+	end
+
+SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
+	trainerbattle 0, 280, 0, Text_19B936, Text_19B957
+	msgbox gUnknown_819B96D, 6
+	end
+
+SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
+	trainerbattle 0, 281, 0, Text_19BA45, Text_19BA9E
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 5
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_819BAB4, 6
+	end
+
+SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3
+	trainerbattle 0, 282, 0, Text_19BB49, Text_19BBA1
+	msgbox gUnknown_819BBB3, 6
+	end
+
+SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA
+	trainerbattle 0, 283, 0, Text_19BC57, Text_19BCBC
+	msgbox gUnknown_819BCC4, 6
+	end
+
+SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1
+	trainerbattle 0, 462, 0, Text_19B86A, Text_19B8A8
+	msgbox gUnknown_819B8B9, 6
+	end
+
+SaffronCity_Gym_EventScript_16EF08:: @ 816EF08
+	trainerbattle 0, 463, 0, Text_19B998, Text_19B9EC
+	msgbox gUnknown_819B9F7, 6
+	end
+
+SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
+	trainerbattle 0, 464, 0, Text_19BAE8, Text_19BB0D
+	msgbox gUnknown_819BB1F, 6
+	end
+
+SaffronCity_Gym_EventScript_16EF36:: @ 816EF36
+	lock
+	faceplayer
+	checkflag FLAG_0x4B5
+	goto_if_eq EventScript_16EF4B
+	msgbox gUnknown_819BCF6
+	release
+	end
+
+EventScript_16EF4B:: @ 816EF4B
+	msgbox gUnknown_819BDBB
+	release
+	end
+
+SaffronCity_Gym_EventScript_16EF55:: @ 816EF55
+	lockall
+	checkflag FLAG_0x825
+	goto_if_eq EventScript_16EF69
+	msgbox gUnknown_819BDFE
+	releaseall
+	end
+
+EventScript_16EF69:: @ 816EF69
+	msgbox gUnknown_819BE37
+	releaseall
+	end
diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc
new file mode 100644
index 000000000..2d2f1ad1a
--- /dev/null
+++ b/data/maps/SaffronCity_Gym/text.inc
@@ -0,0 +1,160 @@
+Text_19B53C:: @ 819B53C
+    .string "I had a vision of your arrival.\p"
+    .string "I have had psychic powers since\n"
+    .string "I was a child.\p"
+    .string "It started when a spoon I\n"
+    .string "carelessly tossed, bent.\p"
+    .string "I dislike battling, but if you wish,\n"
+    .string "I will show you my powers!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+Text_19B602:: @ 819B602
+    .string "This loss shocks me!\n"
+    .string "But, a loss is a loss.\p"
+    .string "I admit, I didn't work hard enough\n"
+    .string "to win.\p"
+    .string "Your victory has earned you the\n"
+    .string "MARSHBADGE.$"
+
+gUnknown_819B685:: @ 819B685
+    .string "Psychic power isn't something that\n"
+    .string "only a few people have.\p"
+    .string "Everyone has psychic power.\n"
+    .string "People just don't realize it.$"
+
+gUnknown_819B6FA:: @ 819B6FA
+    .string "The MARSHBADGE makes POKéMON up\n"
+    .string "to Lv. 70 obey you.\p"
+    .string "Stronger POKéMON will become wild,\n"
+    .string "ignoring your orders in battle.\p"
+    .string "Just don't raise your POKéMON too\n"
+    .string "much to avoid that problem.\p"
+    .string "Wait, please take this TM with you.$"
+
+gUnknown_819B7D3:: @ 819B7D3
+    .string "{PLAYER} received TM04 from\n"
+    .string "SABRINA.$"
+
+gUnknown_819B7F2:: @ 819B7F2
+    .string "TM04 is CALM MIND.\p"
+    .string "It makes the POKéMON concentrate\n"
+    .string "to raise both SP. ATK and SP. DEF.$"
+
+gUnknown_819B849:: @ 819B849
+    .string "Your BAG is full of other items.$"
+
+Text_19B86A:: @ 819B86A
+    .string "SABRINA is far younger than I,\n"
+    .string "but she has earned my respect.$"
+
+Text_19B8A8:: @ 819B8A8
+    .string "Not good enough!$"
+
+gUnknown_819B8B9:: @ 819B8B9
+    .string "In a battle of equals, the one\n"
+    .string "with the stronger will wins.\p"
+    .string "If you wish to beat SABRINA, focus\n"
+    .string "and will yourself to victory.$"
+
+Text_19B936:: @ 819B936
+    .string "Does our unseen power scare you?$"
+
+Text_19B957:: @ 819B957
+    .string "I never foresaw this!$"
+
+gUnknown_819B96D:: @ 819B96D
+    .string "PSYCHIC POKéMON fear only ghosts\n"
+    .string "and bugs!$"
+
+Text_19B998:: @ 819B998
+    .string "POKéMON take on the appearance of\n"
+    .string "their TRAINERS.\p"
+    .string "Your POKéMON must be tough, then!$"
+
+Text_19B9EC:: @ 819B9EC
+    .string "I knew it!$"
+
+gUnknown_819B9F7:: @ 819B9F7
+    .string "I have much to learn still…\p"
+    .string "I must master PSYCHIC and teach it\n"
+    .string "to my POKéMON…$"
+
+Text_19BA45:: @ 819BA45
+    .string "You understand, don't you?\p"
+    .string "That power alone isn't enough to\n"
+    .string "win in the world of POKéMON?$"
+
+Text_19BA9E:: @ 819BA9E
+    .string "I don't believe this!$"
+
+gUnknown_819BAB4:: @ 819BAB4
+    .string "SABRINA just wiped out the KARATE\n"
+    .string "MASTER next door.$"
+
+Text_19BAE8:: @ 819BAE8
+    .string "You and I, our POKéMON shall\n"
+    .string "battle!$"
+
+Text_19BB0D:: @ 819BB0D
+    .string "I lost after all!$"
+
+gUnknown_819BB1F:: @ 819BB1F
+    .string "I knew that this was going to take\n"
+    .string "place.$"
+
+Text_19BB49:: @ 819BB49
+    .string "SABRINA is young, but she's also\n"
+    .string "our highly skilled LEADER.\p"
+    .string "You won't reach her easily!$"
+
+Text_19BBA1:: @ 819BBA1
+    .string "Ow!\n"
+    .string "Down and out!$"
+
+gUnknown_819BBB3:: @ 819BBB3
+    .string "There used to be two POKéMON GYMS\n"
+    .string "in SAFFRON.\p"
+    .string "The FIGHTING DOJO next door lost\n"
+    .string "its GYM status, though.\p"
+    .string "We simply creamed them when we\n"
+    .string "decided to have just one GYM.$"
+
+Text_19BC57:: @ 819BC57
+    .string "SAFFRON POKéMON GYM is famous for\n"
+    .string "training psychics.\p"
+    .string "You want to see SABRINA, don't\n"
+    .string "you? I can tell!$"
+
+Text_19BCBC:: @ 819BCBC
+    .string "Arrrgh!$"
+
+gUnknown_819BCC4:: @ 819BCC4
+    .string "That's right! I used telepathy to\n"
+    .string "read your mind!$"
+
+gUnknown_819BCF6:: @ 819BCF6
+    .string "Yo!\n"
+    .string "Champ in the making!\p"
+    .string "SABRINA's POKéMON use psychic\n"
+    .string "power instead of force.\p"
+    .string "FIGHTING POKéMON are especially\n"
+    .string "weak against PSYCHIC POKéMON.\p"
+    .string "They'll get destroyed before they\n"
+    .string "can even aim a punch!$"
+
+gUnknown_819BDBB:: @ 819BDBB
+    .string "Psychic power, huh?\p"
+    .string "If I had that, I'd make a bundle\n"
+    .string "at the slots!$"
+
+gUnknown_819BDFE:: @ 819BDFE
+    .string "SAFFRON POKéMON GYM\n"
+    .string "LEADER: SABRINA\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}$"
+
+gUnknown_819BE37:: @ 819BE37
+    .string "SAFFRON POKéMON GYM\n"
+    .string "LEADER: SABRINA\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}, {PLAYER}$"
+
diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json
new file mode 100644
index 000000000..20fca424a
--- /dev/null
+++ b/data/maps/SaffronCity_House1_1F/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_SAFFRON_CITY_HOUSE1_1F",
+  "name": "SaffronCity_House1_1F",
+  "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House1_1F_EventScript_16EB40",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "31",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House1_1F_EventScript_16EB37",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "117",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House1_1F_EventScript_16EB49",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc
new file mode 100644
index 000000000..eb0bcd429
--- /dev/null
+++ b/data/maps/SaffronCity_House1_1F/scripts.inc
@@ -0,0 +1,20 @@
+SaffronCity_House1_1F_MapScripts:: @ 816EB36
+	.byte 0
+
+SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37
+	msgbox gUnknown_819AB9B, 2
+	end
+
+SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40
+	msgbox gUnknown_819ABD7, 2
+	end
+
+SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_CHANSEY, 0
+	msgbox gUnknown_819AC4B
+	waitmoncry
+	release
+	end
diff --git a/data/maps/SaffronCity_House1_1F/text.inc b/data/maps/SaffronCity_House1_1F/text.inc
new file mode 100644
index 000000000..04bedb057
--- /dev/null
+++ b/data/maps/SaffronCity_House1_1F/text.inc
@@ -0,0 +1,32 @@
+Text_19A9E7:: @ 819A9E7
+    .string "AGATHA's GHOST-type POKéMON are\n"
+    .string "horrifically terrifying in toughness.\p"
+    .string "I took my FIGHTING-type POKéMON\n"
+    .string "and raised them to the max.\p"
+    .string "I went at AGATHA feeling pretty\n"
+    .string "confident, but she whupped us.\p"
+    .string "That old lady's also got a really\n"
+    .string "short fuse, too.\p"
+    .string "It doesn't take anything to get\n"
+    .string "that scary lady hollering.$"
+
+Text_19AB16:: @ 819AB16
+    .string "Maybe becoming an ELITE FOUR\n"
+    .string "member is in the blood.\p"
+    .string "From what I've heard, LANCE has\n"
+    .string "a cousin who's a GYM LEADER\l"
+    .string "somewhere far away.$"
+
+gUnknown_819AB9B:: @ 819AB9B
+    .string "My daughter is so self-centered.\n"
+    .string "She has but a few friends.$"
+
+gUnknown_819ABD7:: @ 819ABD7
+    .string "My daughter likes to mimic people.\n"
+    .string "It's rather vexing.\p"
+    .string "Her mimicry has earned her the\n"
+    .string "nickname COPYCAT around here.$"
+
+gUnknown_819AC4B:: @ 819AC4B
+    .string "CHANSEY: Chaan! Sii!$"
+
diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json
new file mode 100644
index 000000000..3a1d497f9
--- /dev/null
+++ b/data/maps/SaffronCity_House1_2F/map.json
@@ -0,0 +1,104 @@
+{
+  "id": "MAP_SAFFRON_CITY_HOUSE1_2F",
+  "name": "SaffronCity_House1_2F",
+  "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "132",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House1_2F_EventScript_16EB5D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "120",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House1_2F_EventScript_16EB70",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "115",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House1_2F_EventScript_16EB70",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House1_2F_EventScript_16EB7B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "script": "SaffronCity_House1_2F_EventScript_16EBC9"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "script": "SaffronCity_House1_2F_EventScript_16EBD2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "item": "ITEM_NUGGET",
+      "flag": "26",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc
new file mode 100644
index 000000000..8a6227b38
--- /dev/null
+++ b/data/maps/SaffronCity_House1_2F/scripts.inc
@@ -0,0 +1,52 @@
+SaffronCity_House1_2F_MapScripts:: @ 816EB5C
+	.byte 0
+
+SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_DODUO, 0
+	msgbox gUnknown_819B030
+	waitmoncry
+	release
+	end
+
+SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70
+	lock
+	msgbox gUnknown_819B071
+	release
+	end
+
+SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	checkitem ITEM_POKE_DOLL, 1
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1C4CF6
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16EBB7
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_16EBC0
+	release
+	end
+
+EventScript_16EBB7:: @ 816EBB7
+	msgbox gUnknown_819AC60
+	return
+
+EventScript_16EBC0:: @ 816EBC0
+	msgbox gUnknown_819ACF1
+	return
+
+SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9
+	msgbox gUnknown_819B0D0, 3
+	end
+
+SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2
+	msgbox gUnknown_819B0A0, 3
+	end
diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_House1_2F/text.inc
new file mode 100644
index 000000000..d9fc46f7c
--- /dev/null
+++ b/data/maps/SaffronCity_House1_2F/text.inc
@@ -0,0 +1,100 @@
+gUnknown_819AC60:: @ 819AC60
+    .string "{PLAYER}: Hi!\n"
+    .string "Do you like POKéMON?\p"
+    .string "{PLAYER}: Uh, no, I just asked you.\p"
+    .string "{PLAYER}: Huh?\n"
+    .string "You're strange!\p"
+    .string "COPYCAT: Hmm? Quit mimicking?\n"
+    .string "But, that's my favorite hobby!$"
+
+gUnknown_819ACF1:: @ 819ACF1
+    .string "{PLAYER}: Hi.\n"
+    .string "You must like POKéMON.\p"
+    .string "{PLAYER}: No, not me.\n"
+    .string "I asked you.\p"
+    .string "{PLAYER}: Pardon?\n"
+    .string "You're weird!\l"
+    .string " \l"
+    .string "COPYCAT: Hmm? Quit mimicking?\l"
+    .string "But that's my favorite hobby!$"
+
+Text_19AD85:: @ 819AD85
+    .string "Oh wow!\n"
+    .string "A POKé DOLL!\p"
+    .string "For me?\n"
+    .string "Thank you!\p"
+    .string "You know what?\n"
+    .string "I can teach the move MIMIC.$"
+
+Text_19ADD8:: @ 819ADD8
+    .string "Don't you like MIMIC?$"
+
+Text_19ADEE:: @ 819ADEE
+    .string "I really love MIMIC!\n"
+    .string "Who's going to learn it?$"
+
+Text_19AE1C:: @ 819AE1C
+    .string "{PLAYER}: Hi!\n"
+    .string "Thanks for earlier!\p"
+    .string "{PLAYER}: Pardon?\p"
+    .string "{PLAYER}: Is it that fun to mimic my\n"
+    .string "every move?\p"
+    .string "COPYCAT: You bet!\n"
+    .string "It's a scream!$"
+
+Text_19AE90:: @ 819AE90
+    .string "{PLAYER}: Hi!\n"
+    .string "Thanks for what you did for us.\p"
+    .string "{PLAYER}: Pardon?\p"
+    .string "{PLAYER}: Is it really that fun to\n"
+    .string "copy what I say and do?\p"
+    .string "COPYCAT: You bet!\n"
+    .string "It's a scream!$"
+
+Text_19AF1A:: @ 819AF1A
+    .string "にもつが　いっぱいね！$"
+
+Text_19AF26:: @ 819AF26
+    .string "{PLAYER}“やあ！　こんにちは！\n"
+    .string "きみ　ポケモン　すきかい？\p"
+    .string "{PLAYER}“ぼく　じゃなくって\n"
+    .string "きみに　きいてるんだ　けど\p"
+    .string "{PLAYER}“‥‥　えー　なんだよ！\n"
+    .string "ヘンな　やつ　だなあ！\p"
+    .string "モノマネむすめ“‥‥　なに？\n"
+    .string "ひとの　マネ　すんなって？\p"
+    .string "だって　あたし　\n"
+    .string "ものまね　しゅみ　なんだ　もん！”$"
+
+Text_19AFB0:: @ 819AFB0
+    .string "{PLAYER}“こんにちは！\n"
+    .string "ポケモン　すきなのね？\p"
+    .string "{PLAYER}“わたし　じゃなくって\n"
+    .string "あなたに　きいてるんだ　けど\p"
+    .string "{PLAYER}“‥　えー　なんなの！\n"
+    .string "おかしなこ　ねー！\p"
+    .string "モノマネむすめ“‥　なに？\n"
+    .string "ひとの　マネ　すんなって？\p"
+    .string "だって　あたし\n"
+    .string "ものまね　しゅみ　なんだ　もん！$"
+
+gUnknown_819B030:: @ 819B030
+    .string "DODUO: Giiih!\p"
+    .string "PRETTY MIRROR LOOK AT ME,\n"
+    .string "SEE HOW PRETTY I CAN BE?$"
+
+gUnknown_819B071:: @ 819B071
+    .string "This is a rare POKéMON!\n"
+    .string "Huh? It's only a doll!$"
+
+gUnknown_819B0A0:: @ 819B0A0
+    .string "A game with MARIO wearing a bucket\n"
+    .string "on his head!$"
+
+gUnknown_819B0D0:: @ 819B0D0
+    .string "…\p"
+    .string "My Secrets!\p"
+    .string "Skill: Mimicry!\n"
+    .string "Hobby: Collecting dolls!\l"
+    .string "Favorite POKéMON: CLEFAIRY!$"
+
diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json
new file mode 100644
index 000000000..81cbaddb9
--- /dev/null
+++ b/data/maps/SaffronCity_House2/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_SAFFRON_CITY_HOUSE2",
+  "name": "SaffronCity_House2",
+  "layout": "LAYOUT_HOUSE5",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "116",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House2_EventScript_16EF86",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House2_EventScript_16EF74",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House2_EventScript_16EF7D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "105",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "script": "SaffronCity_House2_EventScript_16EF99"
+    }
+  ]
+}
diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc
new file mode 100644
index 000000000..9cc63072c
--- /dev/null
+++ b/data/maps/SaffronCity_House2/scripts.inc
@@ -0,0 +1,24 @@
+SaffronCity_House2_MapScripts:: @ 816EF73
+	.byte 0
+
+SaffronCity_House2_EventScript_16EF74:: @ 816EF74
+	msgbox gUnknown_819BE74, 2
+	end
+
+SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D
+	msgbox gUnknown_819BED5, 2
+	end
+
+SaffronCity_House2_EventScript_16EF86:: @ 816EF86
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_PIDGEY, 0
+	msgbox gUnknown_819BEC3
+	waitmoncry
+	release
+	end
+
+SaffronCity_House2_EventScript_16EF99:: @ 816EF99
+	msgbox gUnknown_819BF07, 3
+	end
diff --git a/data/maps/SaffronCity_House2/text.inc b/data/maps/SaffronCity_House2/text.inc
new file mode 100644
index 000000000..9558880b7
--- /dev/null
+++ b/data/maps/SaffronCity_House2/text.inc
@@ -0,0 +1,20 @@
+gUnknown_819BE74:: @ 819BE74
+    .string "…Thank you for writing.\n"
+    .string "I hope to see you soon!\p"
+    .string "…Hey!\n"
+    .string "Don't look at my letter!$"
+
+gUnknown_819BEC3:: @ 819BEC3
+    .string "PIDGEY: Kurukkoo!$"
+
+gUnknown_819BED5:: @ 819BED5
+    .string "The COPYCAT is cute!\n"
+    .string "I'm getting her a POKé DOLL.$"
+
+gUnknown_819BF07:: @ 819BF07
+    .string "I was given a PP UP as a gift.\p"
+    .string "It's used to increase the PP of\n"
+    .string "a POKéMON's move.\p"
+    .string "I should use it on a powerful move\n"
+    .string "with only a few PP.$"
+
diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json
new file mode 100644
index 000000000..be9412971
--- /dev/null
+++ b/data/maps/SaffronCity_House3/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_SAFFRON_CITY_HOUSE3",
+  "name": "SaffronCity_House3",
+  "layout": "LAYOUT_HOUSE5",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_House3_EventScript_16F05F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc
new file mode 100644
index 000000000..89a44eecd
--- /dev/null
+++ b/data/maps/SaffronCity_House3/scripts.inc
@@ -0,0 +1,28 @@
+SaffronCity_House3_MapScripts:: @ 816F05E
+	.byte 0
+
+SaffronCity_House3_EventScript_16F05F:: @ 816F05F
+	lock
+	faceplayer
+	checkflag FLAG_0x245
+	goto_if_eq EventScript_16F0B5
+	msgbox gUnknown_819C142
+	checkitemspace ITEM_TM29, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16F0AB
+	additem ITEM_TM29, 1
+	giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29
+	msgbox gUnknown_819C18F
+	setflag FLAG_0x245
+	release
+	end
+
+EventScript_16F0AB:: @ 816F0AB
+	msgbox gUnknown_819C1FC
+	release
+	end
+
+EventScript_16F0B5:: @ 816F0B5
+	msgbox gUnknown_819C18F
+	release
+	end
diff --git a/data/maps/SaffronCity_House3/text.inc b/data/maps/SaffronCity_House3/text.inc
new file mode 100644
index 000000000..42699924f
--- /dev/null
+++ b/data/maps/SaffronCity_House3/text.inc
@@ -0,0 +1,18 @@
+gUnknown_819C142:: @ 819C142
+    .string "…Wait! Don't say a word!\p"
+    .string "You wanted this!$"
+
+gUnknown_819C16C:: @ 819C16C
+    .string "{PLAYER} received TM29\n"
+    .string "from MR. PSYCHIC.$"
+
+gUnknown_819C18F:: @ 819C18F
+    .string "You already know, don't you?\n"
+    .string "TM29 is PSYCHIC.\p"
+    .string "It's an attack that may also lower\n"
+    .string "the target's special stats.$"
+
+gUnknown_819C1FC:: @ 819C1FC
+    .string "Where do you plan to put this?\n"
+    .string "You've no room.$"
+
diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json
new file mode 100644
index 000000000..b2882fff3
--- /dev/null
+++ b/data/maps/SaffronCity_Mart/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_SAFFRON_CITY_MART",
+  "name": "SaffronCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Mart_EventScript_16EFB5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Mart_EventScript_16EFAC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_Mart_EventScript_16EFA3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc
new file mode 100644
index 000000000..509fd37b6
--- /dev/null
+++ b/data/maps/SaffronCity_Mart/scripts.inc
@@ -0,0 +1,35 @@
+SaffronCity_Mart_MapScripts:: @ 816EFA2
+	.byte 0
+
+SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3
+	msgbox gUnknown_819BFF1, 2
+	end
+
+SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC
+	msgbox gUnknown_819BF8F, 2
+	end
+
+SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16EFDC
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16EFDC:: @ 816EFDC
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/SaffronCity_Mart/text.inc b/data/maps/SaffronCity_Mart/text.inc
new file mode 100644
index 000000000..5acbdbd9c
--- /dev/null
+++ b/data/maps/SaffronCity_Mart/text.inc
@@ -0,0 +1,10 @@
+gUnknown_819BF8F:: @ 819BF8F
+    .string "MAX REPEL keeps weaker POKéMON\n"
+    .string "from appearing.\p"
+    .string "MAX REPEL stays effective longer\n"
+    .string "than SUPER REPEL.$"
+
+gUnknown_819BFF1:: @ 819BFF1
+    .string "REVIVE is costly, but it revives\n"
+    .string "fainted POKéMON!$"
+
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..2e26f7368
--- /dev/null
+++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json
@@ -0,0 +1,127 @@
+{
+  "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F",
+  "name": "SaffronCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F004",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "31",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F00D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F016",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
+      "flag": "174"
+    },
+    {
+      "graphics_id": "0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
+      "flag": "174"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..65c37eaf3
--- /dev/null
+++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,37 @@
+SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC
+	map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7
+	map_script 5, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7
+	setrespawn SPAWN_SAFFRON_CITY
+	end
+
+SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004
+	msgbox gUnknown_819C058, 2
+	end
+
+SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D
+	msgbox gUnknown_819C023, 2
+	end
+
+SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if_eq EventScript_16F02D
+	msgbox gUnknown_819C0B4
+	release
+	end
+
+EventScript_16F02D:: @ 816F02D
+	msgbox gUnknown_819C102
+	release
+	end
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/text.inc b/data/maps/SaffronCity_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..8a3e43a10
--- /dev/null
+++ b/data/maps/SaffronCity_PokemonCenter_1F/text.inc
@@ -0,0 +1,20 @@
+gUnknown_819C023:: @ 819C023
+    .string "POKéMON growth rates differ from\n"
+    .string "species to species.$"
+
+gUnknown_819C058:: @ 819C058
+    .string "SILPH CO. is widely known to all.\p"
+    .string "It's a victim of its own fame - it\n"
+    .string "attracted TEAM ROCKET.$"
+
+gUnknown_819C0B4:: @ 819C0B4
+    .string "Sigh…\n"
+    .string "Wouldn't this be great?\p"
+    .string "If the ELITE FOUR came and\n"
+    .string "stomped TEAM ROCKET?$"
+
+gUnknown_819C102:: @ 819C102
+    .string "TEAM ROCKET took off!\n"
+    .string "We can go out safely again!\l"
+    .string "That's great!$"
+
diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..303a60ce7
--- /dev/null
+++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F",
+  "name": "SaffronCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..7ebc68fb5
--- /dev/null
+++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037
+	map_script 2, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, SaffronCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C
+	call EventScript_1BB4A3
+	end
+
+EventScript_16F052:: @ 816F052
+	call EventScript_1BB6AB
+	end
+
+EventScript_16F058:: @ 816F058
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
new file mode 100644
index 000000000..875585c68
--- /dev/null
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
@@ -0,0 +1,158 @@
+{
+  "id": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB",
+  "name": "SaffronCity_PokemonTrainerFanClub",
+  "layout": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "24",
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 3,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 3,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "31",
+      "x": 9,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D",
+      "flag": "110"
+    },
+    {
+      "graphics_id": "26",
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF",
+      "flag": "109"
+    },
+    {
+      "graphics_id": "29",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521",
+      "flag": "111"
+    },
+    {
+      "graphics_id": "54",
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583",
+      "flag": "108"
+    },
+    {
+      "graphics_id": "0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 14
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
new file mode 100644
index 000000000..dce3faa1b
--- /dev/null
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
@@ -0,0 +1,454 @@
+SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF
+	map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA
+	map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144
+	.byte 0
+
+SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA
+	map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4
+	.2byte 0
+
+EventScript_16F0D4:: @ 816F0D4
+	lockall
+	textcolor 1
+	applymovement 1, Movement_1A75ED
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Movement_1A75DB
+	waitmovement 0
+	applymovement 1, Movement_1A75DD
+	waitmovement 0
+	msgbox gUnknown_819C22B
+	closemessage
+	applymovement 1, Movement_16F124
+	waitmovement 0
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	msgbox gUnknown_819C235
+	setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
+	releaseall
+	end
+
+Movement_16F124:: @ 816F124
+	step_1c
+	step_1b
+	step_10
+	step_1c
+	step_10
+	step_1b
+	step_12
+	step_end
+
+Movement_16F12C:: @ 816F12C
+	step_1b
+	step_2d
+	step_10
+	step_10
+	step_10
+	step_12
+	step_12
+	step_end
+
+Movement_16F134:: @ 816F134
+	step_1f
+	step_1f
+	step_1d
+	step_1d
+	step_1f
+	step_1d
+	step_end
+
+Movement_16F13B:: @ 816F13B
+	step_10
+	step_30
+	step_end
+
+Movement_16F13E:: @ 816F13E
+	step_55
+	step_1e
+	step_1e
+	step_20
+	step_2d
+	step_end
+
+SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144
+	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1
+	goto_if_eq EventScript_16F267
+	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
+	goto_if_eq EventScript_16F15B
+	end
+
+EventScript_16F15B:: @ 816F15B
+	special sub_81132CC
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16F207
+	setvar VAR_0x8004, 1
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16F213
+	setvar VAR_0x8004, 2
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16F21F
+	setvar VAR_0x8004, 3
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16F22B
+	setvar VAR_0x8004, 4
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16F237
+	setvar VAR_0x8004, 5
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16F243
+	setvar VAR_0x8004, 6
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16F24F
+	setvar VAR_0x8004, 7
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_16F25B
+	end
+
+EventScript_16F207:: @ 816F207
+	setobjectxyperm 1, 5, 2
+	setobjectmovementtype 1, 7
+	return
+
+EventScript_16F213:: @ 816F213
+	setobjectxyperm 3, 7, 4
+	setobjectmovementtype 3, 9
+	return
+
+EventScript_16F21F:: @ 816F21F
+	setobjectxyperm 4, 2, 2
+	setobjectmovementtype 4, 7
+	return
+
+EventScript_16F22B:: @ 816F22B
+	setobjectxyperm 2, 3, 4
+	setobjectmovementtype 2, 10
+	return
+
+EventScript_16F237:: @ 816F237
+	setobjectxyperm 6, 4, 6
+	setobjectmovementtype 6, 7
+	return
+
+EventScript_16F243:: @ 816F243
+	setobjectxyperm 5, 10, 3
+	setobjectmovementtype 5, 7
+	return
+
+EventScript_16F24F:: @ 816F24F
+	setobjectxyperm 7, 7, 5
+	setobjectmovementtype 7, 9
+	return
+
+EventScript_16F25B:: @ 816F25B
+	setobjectxyperm 8, 9, 6
+	setobjectmovementtype 8, 9
+	return
+
+EventScript_16F267:: @ 816F267
+	call EventScript_16F22B
+	call EventScript_16F237
+	call EventScript_16F243
+	call EventScript_16F24F
+	call EventScript_16F25B
+	end
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
+	lock
+	faceplayer
+	setvar VAR_0x8004, 0
+	special sub_81133A4
+	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
+	goto_if_eq EventScript_16F2EE
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F2C0
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 7
+	goto_if_eq EventScript_16F2E4
+	msgbox gUnknown_819C420
+	release
+	end
+
+EventScript_16F2C0:: @ 816F2C0
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F2DA
+	msgbox gUnknown_819C390
+	release
+	end
+
+EventScript_16F2DA:: @ 816F2DA
+	msgbox gUnknown_819C3BD
+	release
+	end
+
+EventScript_16F2E4:: @ 816F2E4
+	msgbox gUnknown_819C4A5
+	release
+	end
+
+EventScript_16F2EE:: @ 816F2EE
+	msgbox gUnknown_819C55C
+	release
+	end
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
+	lock
+	faceplayer
+	setvar VAR_0x8004, 3
+	special sub_81133A4
+	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
+	goto_if_eq EventScript_16F365
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F337
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 7
+	goto_if_eq EventScript_16F35B
+	msgbox gUnknown_819CBD3
+	release
+	end
+
+EventScript_16F337:: @ 816F337
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F351
+	msgbox gUnknown_819CB32
+	release
+	end
+
+EventScript_16F351:: @ 816F351
+	msgbox gUnknown_819CB62
+	release
+	end
+
+EventScript_16F35B:: @ 816F35B
+	msgbox gUnknown_819CC2B
+	release
+	end
+
+EventScript_16F365:: @ 816F365
+	msgbox gUnknown_819CCC2
+	release
+	end
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
+	lock
+	faceplayer
+	setvar VAR_0x8004, 1
+	special sub_81133A4
+	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
+	goto_if_eq EventScript_16F3DC
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F3AE
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 7
+	goto_if_eq EventScript_16F3D2
+	msgbox gUnknown_819C6BA
+	release
+	end
+
+EventScript_16F3AE:: @ 816F3AE
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F3C8
+	msgbox gUnknown_819C5A9
+	release
+	end
+
+EventScript_16F3C8:: @ 816F3C8
+	msgbox gUnknown_819C600
+	release
+	end
+
+EventScript_16F3D2:: @ 816F3D2
+	msgbox gUnknown_819C73A
+	release
+	end
+
+EventScript_16F3DC:: @ 816F3DC
+	msgbox gUnknown_819C7C8
+	release
+	end
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
+	lock
+	faceplayer
+	setvar VAR_0x8004, 2
+	special sub_81133A4
+	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
+	goto_if_eq EventScript_16F453
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F425
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 7
+	goto_if_eq EventScript_16F449
+	msgbox gUnknown_819C986
+	release
+	end
+
+EventScript_16F425:: @ 816F425
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F43F
+	msgbox gUnknown_819C81E
+	release
+	end
+
+EventScript_16F43F:: @ 816F43F
+	msgbox gUnknown_819C8C1
+	release
+	end
+
+EventScript_16F449:: @ 816F449
+	msgbox gUnknown_819C9D5
+	release
+	end
+
+EventScript_16F453:: @ 816F453
+	msgbox gUnknown_819CA7C
+	release
+	end
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
+	lock
+	faceplayer
+	setvar VAR_0x8004, 5
+	special sub_81133A4
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F491
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 7
+	goto_if_eq EventScript_16F4B5
+	msgbox gUnknown_819D01F
+	release
+	end
+
+EventScript_16F491:: @ 816F491
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F4AB
+	msgbox gUnknown_819CEDF
+	release
+	end
+
+EventScript_16F4AB:: @ 816F4AB
+	msgbox gUnknown_819CF6D
+	release
+	end
+
+EventScript_16F4B5:: @ 816F4B5
+	msgbox gUnknown_819D075
+	release
+	end
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
+	lock
+	faceplayer
+	setvar VAR_0x8004, 4
+	special sub_81133A4
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F4F3
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 7
+	goto_if_eq EventScript_16F517
+	msgbox gUnknown_819CDDA
+	release
+	end
+
+EventScript_16F4F3:: @ 816F4F3
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F50D
+	msgbox gUnknown_819CCF3
+	release
+	end
+
+EventScript_16F50D:: @ 816F50D
+	msgbox gUnknown_819CD4E
+	release
+	end
+
+EventScript_16F517:: @ 816F517
+	msgbox gUnknown_819CE3A
+	release
+	end
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
+	lock
+	faceplayer
+	setvar VAR_0x8004, 6
+	special sub_81133A4
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F555
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 7
+	goto_if_eq EventScript_16F579
+	msgbox gUnknown_819D1AE
+	release
+	end
+
+EventScript_16F555:: @ 816F555
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F56F
+	msgbox gUnknown_819D0E3
+	release
+	end
+
+EventScript_16F56F:: @ 816F56F
+	msgbox gUnknown_819D148
+	release
+	end
+
+EventScript_16F579:: @ 816F579
+	msgbox gUnknown_819D211
+	release
+	end
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
+	lock
+	faceplayer
+	setvar VAR_0x8004, 7
+	special sub_81133A4
+	specialvar VAR_RESULT, sub_8113364
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F5B7
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 7
+	goto_if_eq EventScript_16F5DB
+	msgbox gUnknown_819D3D2
+	release
+	end
+
+EventScript_16F5B7:: @ 816F5B7
+	specialvar VAR_RESULT, sub_8113288
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16F5D1
+	msgbox gUnknown_819D2B4
+	release
+	end
+
+EventScript_16F5D1:: @ 816F5D1
+	msgbox gUnknown_819D31F
+	release
+	end
+
+EventScript_16F5DB:: @ 816F5DB
+	msgbox gUnknown_819D477
+	release
+	end
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
new file mode 100644
index 000000000..ecbf0b024
--- /dev/null
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
@@ -0,0 +1,290 @@
+gUnknown_819C22B:: @ 819C22B
+    .string "Huh?\n"
+    .string "You…$"
+
+gUnknown_819C235:: @ 819C235
+    .string "Are you maybe…\n"
+    .string "… …\p"
+    .string "You are!\n"
+    .string "You are {PLAYER}!\p"
+    .string "We were just talking about you!\p"
+    .string "We were talking about how an\n"
+    .string "incredibly good TRAINER appeared.\p"
+    .string "And that someone is you!\n"
+    .string "You're so cool!\p"
+    .string "So, we decided that we'll become\n"
+    .string "your FAN CLUB!\p"
+    .string "We all hope you'll keep battling\n"
+    .string "and show us how cool you are.\p"
+    .string "That way, maybe other people will\n"
+    .string "become fans just like me.$"
+
+gUnknown_819C390:: @ 819C390
+    .string "I'll always be cheering for you!\p"
+    .string "Go, {PLAYER}, go!$"
+
+gUnknown_819C3BD:: @ 819C3BD
+    .string "I'll always believe in you,\n"
+    .string "{PLAYER}.\p"
+    .string "Please show the others what you're\n"
+    .string "like when you battle seriously.$"
+
+gUnknown_819C420:: @ 819C420
+    .string "I'm sorry.\n"
+    .string "I was your fan before.\p"
+    .string "But now, you seem to have lost\n"
+    .string "the drive you had before.\p"
+    .string "Lately, I think {STR_VAR_1} has been\n"
+    .string "a lot cooler.$"
+
+gUnknown_819C4A5:: @ 819C4A5
+    .string "Oh!\n"
+    .string "{PLAYER}!\p"
+    .string "Everyone's been all excited about\n"
+    .string "you recently.\p"
+    .string "I can understand why.\n"
+    .string "I know that you're strong.\p"
+    .string "But, do you know what?\p"
+    .string "Once I became {STR_VAR_1}'s fan,\n"
+    .string "I can't just stop being a fan.$"
+
+gUnknown_819C55C:: @ 819C55C
+    .string "I think TRAINERS are so cool when\n"
+    .string "they're battling.\p"
+    .string "Don't you think so, too?$"
+
+gUnknown_819C5A9:: @ 819C5A9
+    .string "Oh! It's {PLAYER}!\n"
+    .string "Too cool!\p"
+    .string "Oh!\n"
+    .string "Oh, yeah!\p"
+    .string "Can you autograph something?\n"
+    .string "How about my shorts?$"
+
+gUnknown_819C600:: @ 819C600
+    .string "However hot it's been…\p"
+    .string "And however cold it may get…\p"
+    .string "I've always believed in, and worn,\n"
+    .string "shorts!\p"
+    .string "I'm counting on you to keep\n"
+    .string "winning!\p"
+    .string "I believe in you just as much as\n"
+    .string "I believe in shorts!$"
+
+gUnknown_819C6BA:: @ 819C6BA
+    .string "BROCK's my hero!\n"
+    .string "He's a man among men!\p"
+    .string "Heheh, I got my mom to do\n"
+    .string "something for me.\p"
+    .string "I got her to embroider “BROCK”\n"
+    .string "on my shorts!$"
+
+gUnknown_819C73A:: @ 819C73A
+    .string "…  …\p"
+    .string "…  …\n"
+    .string "I'm BROCK's fan!\p"
+    .string "Even if I were his only fan,\n"
+    .string "I swear it on my rock-hard will,\l"
+    .string "and on my shorts!\p"
+    .string "I'll be his fan to the bitter end!$"
+
+gUnknown_819C7C8:: @ 819C7C8
+    .string "BROCK's the last word on cool,\n"
+    .string "end of story!\p"
+    .string "Now there's a guy who I want to\n"
+    .string "be like!$"
+
+gUnknown_819C81E:: @ 819C81E
+    .string "{PLAYER}, I've had the pleasure of\n"
+    .string "watching you battle.\p"
+    .string "It brings back sweet memories of\n"
+    .string "my own long-lost youth.\p"
+    .string "May you continue to find success.\n"
+    .string "You have a fan in me!$"
+
+gUnknown_819C8C1:: @ 819C8C1
+    .string "I have journeyed far and wide\n"
+    .string "across the lands.\p"
+    .string "But never have I seen a TRAINER\n"
+    .string "of your magnificence.\p"
+    .string "Take courage in your abilities\n"
+    .string "and keep battling on!\p"
+    .string "Make that a promise to me,\n"
+    .string "my young idol!$"
+
+gUnknown_819C986:: @ 819C986
+    .string "Hmm…\n"
+    .string "And you are?\p"
+    .string "Were you hoping to sign up for\n"
+    .string "a membership in our FAN CLUB?$"
+
+gUnknown_819C9D5:: @ 819C9D5
+    .string "Ah, so you are the much-\n"
+    .string "talked-about {PLAYER}.\p"
+    .string "You certainly do have the look of\n"
+    .string "a winner.\p"
+    .string "But for me to accept you as\n"
+    .string "a true POKéMON great…\p"
+    .string "… …\p"
+    .string "You've still a ways to go!$"
+
+gUnknown_819CA7C:: @ 819CA7C
+    .string "All of us gathered here are fans\n"
+    .string "of POKéMON TRAINERS.\p"
+    .string "The way they look in battle…\n"
+    .string "They are the picture of coolness.\p"
+    .string "Perhaps you will be talked about\n"
+    .string "here, too, if you keep winning.$"
+
+gUnknown_819CB32:: @ 819CB32
+    .string "It's {PLAYER}!\n"
+    .string "It's {PLAYER}!\p"
+    .string "I want to be like {PLAYER} one day!$"
+
+gUnknown_819CB62:: @ 819CB62
+    .string "Everyone stopped being {PLAYER}'s\n"
+    .string "fan…\p"
+    .string "But that means I can have {PLAYER}\n"
+    .string "all to myself!\p"
+    .string "Yay! Go for it!\n"
+    .string "My one and only {PLAYER}!$"
+
+gUnknown_819CBD3:: @ 819CBD3
+    .string "Do you know what?\n"
+    .string "I want to be like SABRINA!\p"
+    .string "I want to be a psychic girl just\n"
+    .string "like her!$"
+
+gUnknown_819CC2B:: @ 819CC2B
+    .string "Even if I'm the only one, I won't\n"
+    .string "stop being SABRINA's fan.\p"
+    .string "My dream is to be like SABRINA,\n"
+    .string "cute, but cool.\p"
+    .string "I want to be a psychic girl just\n"
+    .string "like her!$"
+
+gUnknown_819CCC2:: @ 819CCC2
+    .string "I wonder if I can become a cool\n"
+    .string "TRAINER one day?$"
+
+gUnknown_819CCF3:: @ 819CCF3
+    .string "Oh, man, oh, man!\n"
+    .string "Cool! Too cool!\p"
+    .string "…Huh?\n"
+    .string "No, not you.\p"
+    .string "Just the way you battle.\n"
+    .string "That's cool.$"
+
+gUnknown_819CD4E:: @ 819CD4E
+    .string "Yo, {PLAYER}!\p"
+    .string "Looks like I'm the only one left\n"
+    .string "out of your fans.\p"
+    .string "But, you know, I like being an only\n"
+    .string "fan… It's less stressful.\p"
+    .string "Keep up and at it!$"
+
+gUnknown_819CDDA:: @ 819CDDA
+    .string "{STR_VAR_1}'s cool, huh?\n"
+    .string "I love the way he talks.\p"
+    .string "I'd really relish a chance to meet\n"
+    .string "him in person once.$"
+
+gUnknown_819CE3A:: @ 819CE3A
+    .string "Huh, can you believe it?\n"
+    .string "Everyone turned into your fans.\p"
+    .string "So after all we've been through,\n"
+    .string "I'm the lone {STR_VAR_1} fan?\p"
+    .string "Eh, being the one and only\n"
+    .string "{STR_VAR_1} fan's my style, anyway.$"
+
+gUnknown_819CEDF:: @ 819CEDF
+    .string "Oh, my goodness!\n"
+    .string "Is it really you, {PLAYER}?\p"
+    .string "I have to tell you, I adore the\n"
+    .string "way you battle.\p"
+    .string "I hope you'll keep at it.\n"
+    .string "I'll be your number one fan!$"
+
+gUnknown_819CF6D:: @ 819CF6D
+    .string "Oh, my goodness!\n"
+    .string "If it isn't {PLAYER}!\p"
+    .string "It's so disappointing… I realized\n"
+    .string "I'm your number-one-and-only fan!\p"
+    .string "Well, it can't be helped!\n"
+    .string "Let me cheer you on, at least!\p"
+    .string "Hurray, hurray, {PLAYER}!$"
+
+gUnknown_819D01F:: @ 819D01F
+    .string "Recently, {STR_VAR_1} has been on\n"
+    .string "fire.\p"
+    .string "The way he battles… It's just \n"
+    .string "the way that I like it!$"
+
+gUnknown_819D075:: @ 819D075
+    .string "Oh, hello!\n"
+    .string "If it isn't {PLAYER}!\p"
+    .string "Lately, all everyone talks about\n"
+    .string "is you.\p"
+    .string "I'm feeling lonesome because I\n"
+    .string "prefer {STR_VAR_1}.$"
+
+gUnknown_819D0E3:: @ 819D0E3
+    .string "Amazing!\n"
+    .string "{PLAYER}, you really are amazing!\p"
+    .string "Instead of just watching, maybe\n"
+    .string "I should become a TRAINER, too.$"
+
+gUnknown_819D148:: @ 819D148
+    .string "I'm your only fan…\n"
+    .string "Sigh… This is lonely…\p"
+    .string "Can't you try harder and make the\n"
+    .string "others take notice of you?$"
+
+gUnknown_819D1AE:: @ 819D1AE
+    .string "Master {STR_VAR_1} is so dignified…\n"
+    .string "He is so my type.\p"
+    .string "Why can't the others see the\n"
+    .string "dignity he simply oozes?$"
+
+gUnknown_819D211:: @ 819D211
+    .string "I believe in Master {STR_VAR_1}\n"
+    .string "with all my heart.\p"
+    .string "Even if I am the only one to\n"
+    .string "believe in him.\p"
+    .string "I won't ever feel lonesome, though.\p"
+    .string "Not if I keep thinking about Master\n"
+    .string "{STR_VAR_1}.$"
+
+gUnknown_819D2B4:: @ 819D2B4
+    .string "Hiyah!\p"
+    .string "Your battling style is most\n"
+    .string "educational.\p"
+    .string "I hope that you will keep plugging\n"
+    .string "away at success, hiyah!$"
+
+gUnknown_819D31F:: @ 819D31F
+    .string "Instead of just watching others\n"
+    .string "battle, battle yourself!\p"
+    .string "…My DOJO's MASTER chewed me out\n"
+    .string "like that…\p"
+    .string "But I won't let that stop me from\n"
+    .string "being your fan!\p"
+    .string "I can't stop being your fan!$"
+
+gUnknown_819D3D2:: @ 819D3D2
+    .string "Hiyah! There is but one TRAINER\n"
+    .string "who has my respect.\p"
+    .string "And that is none other than my\n"
+    .string "MASTER at the FIGHTING DOJO.\p"
+    .string "You should become a fan of my\n"
+    .string "MASTER like me! Hiyah!$"
+
+gUnknown_819D477:: @ 819D477
+    .string "Hiyah! I respect my MASTER at the\n"
+    .string "FIGHTING DOJO.\p"
+    .string "I will never become a fan of\n"
+    .string "anyone other than my MASTER!\p"
+    .string "I will even sneak out of the DOJO\n"
+    .string "to spread word of his greatness.\p"
+    .string "Hiyah!$"
+
diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json
new file mode 100644
index 000000000..c2927eef5
--- /dev/null
+++ b/data/maps/SeafoamIslands_1F/map.json
@@ -0,0 +1,109 @@
+{
+  "id": "MAP_SEAFOAM_ISLANDS_1F",
+  "name": "SeafoamIslands_1F",
+  "layout": "LAYOUT_SEAFOAM_ISLANDS_1F",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "97",
+      "x": 22,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 66,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_1F_EventScript_1BE11D",
+      "flag": "64"
+    },
+    {
+      "graphics_id": "97",
+      "x": 32,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 67,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_1F_EventScript_1BE11D",
+      "flag": "65"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_1F_EventScript_1BEBE7",
+      "flag": "468"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 28,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE20",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 32,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE20",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 21,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 30,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 10
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc
new file mode 100644
index 000000000..336c75f9f
--- /dev/null
+++ b/data/maps/SeafoamIslands_1F/scripts.inc
@@ -0,0 +1,7 @@
+SeafoamIslands_1F_MapScripts:: @ 8162F43
+	map_script 3, SeafoamIslands_1F_MapScript1_162F49
+	.byte 0
+
+SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49
+	setworldmapflag FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F
+	end
diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json
new file mode 100644
index 000000000..161ba065c
--- /dev/null
+++ b/data/maps/SeafoamIslands_B1F/map.json
@@ -0,0 +1,150 @@
+{
+  "id": "MAP_SEAFOAM_ISLANDS_B1F",
+  "name": "SeafoamIslands_B1F",
+  "layout": "LAYOUT_SEAFOAM_ISLANDS_B1F",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "97",
+      "x": 22,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 68,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B1F_EventScript_1BE11D",
+      "flag": "66"
+    },
+    {
+      "graphics_id": "97",
+      "x": 30,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 69,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B1F_EventScript_1BE11D",
+      "flag": "67"
+    },
+    {
+      "graphics_id": "92",
+      "x": 19,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B1F_EventScript_1BEBF4",
+      "flag": "469"
+    },
+    {
+      "graphics_id": "92",
+      "x": 24,
+      "y": 14,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B1F_EventScript_1BEC01",
+      "flag": "470"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 28,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 17,
+      "y": 9,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 25,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 32,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 23,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 28,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 21,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 29,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_1F",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SeafoamIslands_B1F/scripts.inc b/data/maps/SeafoamIslands_B1F/scripts.inc
new file mode 100644
index 000000000..25fc3de3c
--- /dev/null
+++ b/data/maps/SeafoamIslands_B1F/scripts.inc
@@ -0,0 +1,2 @@
+SeafoamIslands_B1F_MapScripts:: @ 8162F4D
+	.byte 0
diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json
new file mode 100644
index 000000000..b4984b189
--- /dev/null
+++ b/data/maps/SeafoamIslands_B2F/map.json
@@ -0,0 +1,137 @@
+{
+  "id": "MAP_SEAFOAM_ISLANDS_B2F",
+  "name": "SeafoamIslands_B2F",
+  "layout": "LAYOUT_SEAFOAM_ISLANDS_B2F",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "97",
+      "x": 22,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 70,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B2F_EventScript_1BE11D",
+      "flag": "68"
+    },
+    {
+      "graphics_id": "97",
+      "x": 30,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 71,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B2F_EventScript_1BE11D",
+      "flag": "69"
+    },
+    {
+      "graphics_id": "92",
+      "x": 18,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B2F_EventScript_1BEC0E",
+      "flag": "471"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 32,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 31,
+      "y": 17,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 17,
+      "y": 9,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 25,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 32,
+      "y": 14,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 22,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 29,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B1F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 24,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 27,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SeafoamIslands_B2F/scripts.inc b/data/maps/SeafoamIslands_B2F/scripts.inc
new file mode 100644
index 000000000..e719cc327
--- /dev/null
+++ b/data/maps/SeafoamIslands_B2F/scripts.inc
@@ -0,0 +1,2 @@
+SeafoamIslands_B2F_MapScripts:: @ 8162F4E
+	.byte 0
diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json
new file mode 100644
index 000000000..06815d1da
--- /dev/null
+++ b/data/maps/SeafoamIslands_B3F/map.json
@@ -0,0 +1,172 @@
+{
+  "id": "MAP_SEAFOAM_ISLANDS_B3F",
+  "name": "SeafoamIslands_B3F",
+  "layout": "LAYOUT_SEAFOAM_ISLANDS_B3F",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "97",
+      "x": 23,
+      "y": 8,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "70"
+    },
+    {
+      "graphics_id": "97",
+      "x": 24,
+      "y": 8,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "71"
+    },
+    {
+      "graphics_id": "97",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 77,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B3F_EventScript_1BE11D",
+      "flag": "74"
+    },
+    {
+      "graphics_id": "97",
+      "x": 13,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B3F_EventScript_1BE11D",
+      "flag": "75"
+    },
+    {
+      "graphics_id": "97",
+      "x": 9,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B3F_EventScript_1BE11D",
+      "flag": "73"
+    },
+    {
+      "graphics_id": "97",
+      "x": 6,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 76,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B3F_EventScript_1BE11D",
+      "flag": "72"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 14,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 31,
+      "y": 16,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 29,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B4F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 23,
+      "y": 9,
+      "elevation": 1,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 24,
+      "y": 9,
+      "elevation": 1,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B2F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 6,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B4F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B4F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 12,
+      "elevation": 0,
+      "item": "ITEM_NUGGET",
+      "flag": "29",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc
new file mode 100644
index 000000000..e54e7ceb7
--- /dev/null
+++ b/data/maps/SeafoamIslands_B3F/scripts.inc
@@ -0,0 +1,103 @@
+SeafoamIslands_B3F_MapScripts:: @ 8162F4F
+	map_script 3, SeafoamIslands_B3F_MapScript1_162F5A
+	map_script 2, SeafoamIslands_B3F_MapScript2_162F98
+	.byte 0
+
+SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A
+	checkflag FLAG_0x2D2
+	call_if 0, EventScript_162F6D
+	checkflag FLAG_0x2D2
+	call_if 1, EventScript_162F94
+	end
+
+EventScript_162F6D:: @ 8162F6D
+	setvar VAR_0x4002, 0
+	checkflag FLAG_0x046
+	call_if 0, EventScript_162FF0
+	checkflag FLAG_0x047
+	call_if 0, EventScript_162FF0
+	compare_var_to_value VAR_0x4002, 2
+	call_if 1, EventScript_162F90
+	return
+
+EventScript_162F90:: @ 8162F90
+	setflag FLAG_0x2D2
+	return
+
+EventScript_162F94:: @ 8162F94
+	setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC
+	return
+
+SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98
+	map_script_2 VAR_0x4001, 1, EventScript_162FA2
+	.2byte 0
+
+EventScript_162FA2:: @ 8162FA2
+	lockall
+	setvar VAR_0x4002, 0
+	checkflag FLAG_0x046
+	call_if 0, EventScript_162FF0
+	checkflag FLAG_0x047
+	call_if 0, EventScript_162FF0
+	compare_var_to_value VAR_0x4002, 2
+	goto_if_eq EventScript_16300C
+	getplayerxy VAR_0x8008, VAR_0x8009
+	compare_var_to_value VAR_0x8008, 24
+	call_if 0, EventScript_162FF6
+	compare_var_to_value VAR_0x8008, 24
+	call_if 4, EventScript_163001
+	setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1
+	warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21
+	waitstate
+	releaseall
+	end
+
+EventScript_162FF0:: @ 8162FF0
+	addvar VAR_0x4002, 1
+	return
+
+EventScript_162FF6:: @ 8162FF6
+	applymovement 255, Movement_163013
+	waitmovement 0
+	return
+
+EventScript_163001:: @ 8163001
+	applymovement 255, Movement_163021
+	waitmovement 0
+	return
+
+EventScript_16300C:: @ 816300C
+	setvar VAR_0x4001, 0
+	releaseall
+	end
+
+Movement_163013:: @ 8163013
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_20
+	step_20
+	step_20
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_end
+
+Movement_163021:: @ 8163021
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_20
+	step_20
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_1d
+	step_end
diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json
new file mode 100644
index 000000000..6f3a99b06
--- /dev/null
+++ b/data/maps/SeafoamIslands_B4F/map.json
@@ -0,0 +1,153 @@
+{
+  "id": "MAP_SEAFOAM_ISLANDS_B4F",
+  "name": "SeafoamIslands_B4F",
+  "layout": "LAYOUT_SEAFOAM_ISLANDS_B4F",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_SEAFOAM_ISLANDS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "97",
+      "x": 8,
+      "y": 18,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "76"
+    },
+    {
+      "graphics_id": "97",
+      "x": 9,
+      "y": 18,
+      "elevation": 1,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "77"
+    },
+    {
+      "graphics_id": "138",
+      "x": 9,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B4F_EventScript_1631AC",
+      "flag": "130"
+    },
+    {
+      "graphics_id": "92",
+      "x": 22,
+      "y": 19,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SeafoamIslands_B4F_EventScript_1BEC1B",
+      "flag": "472"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 9,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 32,
+      "y": 5,
+      "elevation": 4,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 8,
+      "y": 17,
+      "elevation": 1,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 9,
+      "y": 17,
+      "elevation": 1,
+      "dest_map": "MAP_SEAFOAM_ISLANDS_B3F",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 26,
+      "y": 19,
+      "elevation": 1,
+      "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
+      "var_value": 0,
+      "script": "SeafoamIslands_B4F_EventScript_16319D"
+    },
+    {
+      "type": "trigger",
+      "x": 27,
+      "y": 19,
+      "elevation": 1,
+      "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
+      "var_value": 0,
+      "script": "SeafoamIslands_B4F_EventScript_16319D"
+    },
+    {
+      "type": "trigger",
+      "x": 28,
+      "y": 19,
+      "elevation": 1,
+      "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
+      "var_value": 0,
+      "script": "SeafoamIslands_B4F_EventScript_16319D"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 13,
+      "y": 8,
+      "elevation": 0,
+      "item": "ITEM_WATER_STONE",
+      "flag": "30",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 30,
+      "y": 2,
+      "elevation": 0,
+      "script": "SeafoamIslands_B4F_EventScript_16322C"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 18,
+      "elevation": 0,
+      "script": "SeafoamIslands_B4F_EventScript_163223"
+    }
+  ]
+}
diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc
new file mode 100644
index 000000000..5ec6bc28c
--- /dev/null
+++ b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -0,0 +1,216 @@
+SeafoamIslands_B4F_MapScripts:: @ 816302E
+	map_script 3, SeafoamIslands_B4F_MapScript1_163066
+	map_script 5, SeafoamIslands_B4F_MapScript2_163048
+	map_script 1, SeafoamIslands_B4F_MapScript3_1630B1
+	map_script 4, SeafoamIslands_B4F_MapScript4_1630E7
+	map_script 2, SeafoamIslands_B4F_MapScript5_1630F9
+	.byte 0
+
+SeafoamIslands_B4F_MapScript2_163048:: @ 8163048
+	checkflag FLAG_0x807
+	call_if 1, EventScript_163052
+	end
+
+EventScript_163052:: @ 8163052
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 7
+	goto_if 5, EventScript_1A77A9
+	removeobject VAR_LAST_TALKED
+	return
+
+SeafoamIslands_B4F_MapScript1_163066:: @ 8163066
+	checkflag FLAG_0x2BE
+	call_if 0, EventScript_1630AD
+	checkflag FLAG_0x2D3
+	call_if 0, EventScript_163082
+	checkflag FLAG_0x2D3
+	call_if 1, EventScript_1630A9
+	end
+
+EventScript_163082:: @ 8163082
+	setvar VAR_0x4002, 0
+	checkflag FLAG_0x04C
+	call_if 0, EventScript_163169
+	checkflag FLAG_0x04D
+	call_if 0, EventScript_163169
+	compare_var_to_value VAR_0x4002, 2
+	call_if 1, EventScript_1630A5
+	return
+
+EventScript_1630A5:: @ 81630A5
+	setflag FLAG_0x2D3
+	return
+
+EventScript_1630A9:: @ 81630A9
+	setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833BE30
+	return
+
+EventScript_1630AD:: @ 81630AD
+	clearflag FLAG_0x082
+	return
+
+SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1
+	setvar VAR_0x4002, 0
+	checkflag FLAG_0x04C
+	call_if 0, EventScript_163169
+	checkflag FLAG_0x04D
+	call_if 0, EventScript_163169
+	compare_var_to_value VAR_0x4002, 2
+	goto_if_eq EventScript_1630D4
+	end
+
+EventScript_1630D4:: @ 81630D4
+	setmetatile 12, 14, 299, 0
+	setmetatile 13, 14, 299, 0
+	end
+
+SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7
+	map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1
+	.2byte 0
+
+EventScript_1630F1:: @ 81630F1
+	turnobject 255, 2
+	special sub_80CBD80
+	end
+
+SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9
+	map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B
+	map_script_2 VAR_0x4001, 1, EventScript_163121
+	.2byte 0
+
+EventScript_16310B:: @ 816310B
+	lockall
+	applymovement 255, Movement_16311D
+	waitmovement 0
+	setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0
+	releaseall
+	end
+
+Movement_16311D:: @ 816311D
+	step_1e
+	step_1e
+	step_1e
+	step_end
+
+EventScript_163121:: @ 8163121
+	lockall
+	setvar VAR_0x4002, 0
+	checkflag FLAG_0x04C
+	call_if 0, EventScript_163169
+	checkflag FLAG_0x04D
+	call_if 0, EventScript_163169
+	compare_var_to_value VAR_0x4002, 2
+	goto_if_eq EventScript_163185
+	getplayerxy VAR_0x8008, VAR_0x8009
+	compare_var_to_value VAR_0x8008, 9
+	call_if 0, EventScript_16316F
+	compare_var_to_value VAR_0x8008, 9
+	call_if 4, EventScript_16317A
+	special sub_805D1A8
+	setvar VAR_0x4001, 0
+	releaseall
+	end
+
+EventScript_163169:: @ 8163169
+	addvar VAR_0x4002, 1
+	return
+
+EventScript_16316F:: @ 816316F
+	applymovement 255, Movement_16318C
+	waitmovement 0
+	return
+
+EventScript_16317A:: @ 816317A
+	applymovement 255, Movement_163195
+	waitmovement 0
+	return
+
+EventScript_163185:: @ 8163185
+	setvar VAR_0x4001, 0
+	releaseall
+	end
+
+Movement_16318C:: @ 816318C
+	step_11
+	step_11
+	step_11
+	step_13
+	step_13
+	step_13
+	step_13
+	step_11
+	step_end
+
+Movement_163195:: @ 8163195
+	step_11
+	step_11
+	step_11
+	step_13
+	step_13
+	step_13
+	step_11
+	step_end
+
+SeafoamIslands_B4F_EventScript_16319D:: @ 816319D
+	lockall
+	applymovement 255, Movement_1631AA
+	waitmovement 0
+	releaseall
+	end
+
+Movement_1631AA:: @ 81631AA
+	step_11
+	step_end
+
+SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE
+	waitse
+	playmoncry SPECIES_ARTICUNO, 2
+	message Text_1A6448
+	waitmessage
+	waitmoncry
+	delay 10
+	playbgm BGM_FRLG_LEADER_EYE, 0
+	waitbuttonpress
+	setflag FLAG_0x807
+	special sub_807F9D8
+	waitstate
+	clearflag FLAG_0x807
+	specialvar VAR_RESULT, sub_80CA74C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16320F
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_163218
+	compare_var_to_value VAR_RESULT, 5
+	goto_if_eq EventScript_163218
+	setflag FLAG_0x2BE
+	release
+	end
+
+EventScript_16320F:: @ 816320F
+	setflag FLAG_0x2BE
+	goto EventScript_1A922D
+
+EventScript_163217:: @ 8163217
+	end
+
+EventScript_163218:: @ 8163218
+	setvar VAR_0x8004, SPECIES_ARTICUNO
+	goto EventScript_1A9236
+
+EventScript_163222:: @ 8163222
+	end
+
+SeafoamIslands_B4F_EventScript_163223:: @ 8163223
+	msgbox gUnknown_8179B36, 3
+	end
+
+SeafoamIslands_B4F_EventScript_16322C:: @ 816322C
+	msgbox gUnknown_8179B65, 3
+	end
diff --git a/data/maps/SeafoamIslands_B4F/text.inc b/data/maps/SeafoamIslands_B4F/text.inc
new file mode 100644
index 000000000..b2ef7d7e5
--- /dev/null
+++ b/data/maps/SeafoamIslands_B4F/text.inc
@@ -0,0 +1,29 @@
+Text_1799E0:: @ 81799E0
+    .string "When you're up on a rocky mountain\n"
+    .string "like this, rockslides are a threat.\p"
+    .string "Can you imagine?\n"
+    .string "Boulders tumbling down on you?\p"
+    .string "That'd be, like, waaaaaaaaaaah!\n"
+    .string "Total terror!\p"
+    .string "You don't seem to be scared.\n"
+    .string "Want to try using ROCK SLIDE?$"
+
+Text_179AC0:: @ 8179AC0
+    .string "Oh, so you are scared after all.$"
+
+Text_179AE1:: @ 8179AE1
+    .string "Which POKéMON should I teach\n"
+    .string "ROCK SLIDE?$"
+
+Text_179B0A:: @ 8179B0A
+    .string "It might be scary to use it in this\n"
+    .string "tunnel…$"
+
+gUnknown_8179B36:: @ 8179B36
+    .string "Hint: Boulders might change the\n"
+    .string "flow of water.$"
+
+gUnknown_8179B65:: @ 8179B65
+    .string "DANGER\n"
+    .string "Fast current!$"
+
diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json
new file mode 100644
index 000000000..003bd5192
--- /dev/null
+++ b/data/maps/SevenIsland/map.json
@@ -0,0 +1,107 @@
+{
+  "id": "MAP_SEVEN_ISLAND",
+  "name": "SevenIsland",
+  "layout": "LAYOUT_SEVEN_ISLAND",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SEVEN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SEVEN_ISLAND_TRAINER_TOWER",
+      "offset": -48,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "41",
+      "x": 7,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_EventScript_1C4B56",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "35",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_EventScript_167EC6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 15,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_EventScript_167ECF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 17,
+      "y": 9,
+      "elevation": 0,
+      "script": "SevenIsland_EventScript_167EBD"
+    }
+  ]
+}
diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc
new file mode 100644
index 000000000..92a3ceaf4
--- /dev/null
+++ b/data/maps/SevenIsland/scripts.inc
@@ -0,0 +1,19 @@
+SevenIsland_MapScripts:: @ 8167EB3
+	map_script 3, SevenIsland_MapScript1_167EB9
+	.byte 0
+
+SevenIsland_MapScript1_167EB9:: @ 8167EB9
+	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND
+	end
+
+SevenIsland_EventScript_167EBD:: @ 8167EBD
+	msgbox gUnknown_8183046, 3
+	end
+
+SevenIsland_EventScript_167EC6:: @ 8167EC6
+	msgbox gUnknown_818306C, 2
+	end
+
+SevenIsland_EventScript_167ECF:: @ 8167ECF
+	msgbox gUnknown_8183143, 2
+	end
diff --git a/data/maps/SevenIsland/text.inc b/data/maps/SevenIsland/text.inc
new file mode 100644
index 000000000..2795443a2
--- /dev/null
+++ b/data/maps/SevenIsland/text.inc
@@ -0,0 +1,38 @@
+Text_182F01:: @ 8182F01
+    .string "Not many people come out here.\p"
+    .string "If I train here, I'm convinced that\n"
+    .string "I'll get stronger and stronger.\p"
+    .string "Yep, stronger and stronger…\p"
+    .string "How would you like to learn a move\n"
+    .string "like that? It's SWORDS DANCE.$"
+
+Text_182FC1:: @ 8182FC1
+    .string "Well, that's fine, too.$"
+
+Text_182FD9:: @ 8182FD9
+    .string "All right, pick which POKéMON\n"
+    .string "I should teach it to.$"
+
+Text_18300D:: @ 818300D
+    .string "If only we could keep getting\n"
+    .string "stronger and stronger, eh?$"
+
+gUnknown_8183046:: @ 8183046
+    .string "SEVEN ISLAND\n"
+    .string "Quest Island of Infinity$"
+
+gUnknown_818306C:: @ 818306C
+    .string "These islands are called the SEVII\n"
+    .string "ISLANDS because there are seven.\p"
+    .string "…Or at least that's what the young\n"
+    .string "people believe.\p"
+    .string "The truth is, these islands are so\n"
+    .string "named because they are said to\l"
+    .string "have been made in seven days.$"
+
+gUnknown_8183143:: @ 8183143
+    .string "This island has been left virtually\n"
+    .string "untouched in its natural state.\p"
+    .string "It could be a little difficult to\n"
+    .string "hike around because of that.$"
+
diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json
new file mode 100644
index 000000000..df4507662
--- /dev/null
+++ b/data/maps/SevenIsland_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SEVEN_ISLAND_HARBOR",
+  "name": "SevenIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SEVEN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_Harbor_EventScript_170BE5",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..c4777e1ac
--- /dev/null
+++ b/data/maps/SevenIsland_Harbor/scripts.inc
@@ -0,0 +1,11 @@
+SevenIsland_Harbor_MapScripts:: @ 8170BE4
+	.byte 0
+
+SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 7
+	goto EventScript_1A900F
+	end
diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json
new file mode 100644
index 000000000..f7181d41f
--- /dev/null
+++ b/data/maps/SevenIsland_House_Room1/map.json
@@ -0,0 +1,56 @@
+{
+  "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM1",
+  "name": "SevenIsland_House_Room1",
+  "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SEVEN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "35",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_House_Room1_EventScript_170958",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "SevenIsland_House_Room1_EventScript_170A75"
+    }
+  ]
+}
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
new file mode 100644
index 000000000..107b91ad7
--- /dev/null
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -0,0 +1,183 @@
+SevenIsland_House_Room1_MapScripts:: @ 817088A
+	map_script 3, SevenIsland_House_Room1_MapScript1_170895
+	map_script 2, SevenIsland_House_Room1_MapScript2_1708CF
+	.byte 0
+
+SevenIsland_House_Room1_MapScript1_170895:: @ 8170895
+	special ValidateEReaderTrainer
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_1708AF
+	compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0
+	call_if 5, EventScript_1708C3
+	end
+
+EventScript_1708AF:: @ 81708AF
+	setvar VAR_0x4001, 1
+	setobjectxyperm 1, 4, 2
+	setobjectmovementtype 1, 8
+	setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C
+	return
+
+EventScript_1708C3:: @ 81708C3
+	setobjectxyperm 1, 3, 2
+	setobjectmovementtype 1, 10
+	return
+
+SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF
+	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9
+	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9
+	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9
+	.2byte 0
+
+EventScript_1708E9:: @ 1708E9
+	lockall
+	textcolor 1
+	applymovement 255, Movement_170953
+	waitmovement 0
+	applymovement 1, Movement_170955
+	waitmovement 0
+	moveobjectoffscreen 1
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
+	call_if 1, EventScript_170938
+	compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
+	call_if 1, EventScript_170941
+	compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3
+	call_if 1, EventScript_17094A
+	special LoadPlayerParty
+	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0
+	releaseall
+	end
+
+EventScript_170938:: @ 8170938
+	msgbox gUnknown_81A088C
+	return
+
+EventScript_170941:: @ 8170941
+	msgbox gUnknown_81A0971
+	return
+
+EventScript_17094A:: @ 817094A
+	msgbox gUnknown_81A0807
+	return
+
+Movement_170953:: @ 8170953
+	step_10
+	step_end
+
+Movement_170955:: @ 8170955
+	step_13
+	step_2d
+	step_end
+
+SevenIsland_House_Room1_EventScript_170958:: @ 8170958
+	lock
+	faceplayer
+	special ValidateEReaderTrainer
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_17097D
+	compare_var_to_value VAR_0x4001, 1
+	goto_if_eq EventScript_170987
+	msgbox gUnknown_81A049B
+	release
+	end
+
+EventScript_17097D:: @ 817097D
+	msgbox gUnknown_81A049B
+	release
+	end
+
+EventScript_170987:: @ 8170987
+	special SavePlayerParty
+	special sub_80CAAAC
+	msgbox gUnknown_81A0598, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_170A11
+	call EventScript_170A1E
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_170A11
+	msgbox gUnknown_81A0788, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_170A11
+	special LoadPlayerParty
+	call EventScript_1A4EAF
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_170A11
+	special SavePlayerParty
+	special sub_80A03D8
+	msgbox gUnknown_81A07C4
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_170A2D
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_170A3F
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_170A51
+	warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1
+	waitstate
+	release
+	end
+
+EventScript_170A11:: @ 8170A11
+	special LoadPlayerParty
+	msgbox gUnknown_81A064E
+	release
+	end
+
+EventScript_170A1E:: @ 8170A1E
+	msgbox gUnknown_81A06AB
+	fadescreen 1
+	special sub_80A0334
+	waitstate
+	return
+
+EventScript_170A2D:: @ 8170A2D
+	applymovement VAR_LAST_TALKED, Movement_170A6F
+	applymovement 255, Movement_170A63
+	waitmovement 0
+	return
+
+EventScript_170A3F:: @ 8170A3F
+	applymovement VAR_LAST_TALKED, Movement_170A72
+	applymovement 255, Movement_170A67
+	waitmovement 0
+	return
+
+EventScript_170A51:: @ 8170A51
+	applymovement VAR_LAST_TALKED, Movement_170A6F
+	applymovement 255, Movement_170A6B
+	waitmovement 0
+	return
+
+Movement_170A63:: @ 8170A63
+	step_1c
+	step_11
+	step_11
+	step_end
+
+Movement_170A67:: @ 8170A67
+	step_1c
+	step_13
+	step_11
+	step_end
+
+Movement_170A6B:: @ 8170A6B
+	step_1c
+	step_12
+	step_11
+	step_end
+
+Movement_170A6F:: @ 8170A6F
+	step_12
+	step_30
+	step_end
+
+Movement_170A72:: @ 8170A72
+	step_13
+	step_2f
+	step_end
+
+SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75
+	msgbox gUnknown_81A0567, 3
+	end
diff --git a/data/maps/SevenIsland_House_Room1/text.inc b/data/maps/SevenIsland_House_Room1/text.inc
new file mode 100644
index 000000000..2e6c7f2f8
--- /dev/null
+++ b/data/maps/SevenIsland_House_Room1/text.inc
@@ -0,0 +1,92 @@
+gUnknown_81A049B:: @ 81A049B
+    .string "I may not look like much now,\n"
+    .string "but when I was younger…\p"
+    .string "I flew everywhere, challenging\n"
+    .string "TRAINERS wherever I found them.\p"
+    .string "Now, my only source of enjoyment\n"
+    .string "is reminiscing about the past while\l"
+    .string "watching battles.$"
+
+gUnknown_81A0567:: @ 81A0567
+    .string "There is a slight breeze blowing\n"
+    .string "around the box.$"
+
+gUnknown_81A0598:: @ 81A0598
+    .string "Ah!\n"
+    .string "Welcome, my friend!\p"
+    .string "Let me tell you something. There's\n"
+    .string "a hidden room in the basement.\p"
+    .string "A TRAINER named {STR_VAR_1} is\n"
+    .string "waiting there now.\p"
+    .string "Tell me, you did come to challenge\n"
+    .string "{STR_VAR_1}, am I right?$"
+
+gUnknown_81A064E:: @ 81A064E
+    .string "Oh…\n"
+    .string "You won't battle…\p"
+    .string "I see, I see.\n"
+    .string "… …\p"
+    .string "Well, perhaps if you change your\n"
+    .string "mind, do come back.$"
+
+gUnknown_81A06AB:: @ 81A06AB
+    .string "Ah!\n"
+    .string "You will battle for me?\p"
+    .string "It was worth my time moving the\n"
+    .string "box aside, then.\p"
+    .string "… …\n"
+    .string "But there is one slight problem.\p"
+    .string "This hidden room is not built very\n"
+    .string "sturdy.\p"
+    .string "Can I get you to limit it to\n"
+    .string "battles of three POKéMON per side?$"
+
+gUnknown_81A0788:: @ 81A0788
+    .string "Fine! Before your battle, would\n"
+    .string "you like to save your game?$"
+
+gUnknown_81A07C4:: @ 81A07C4
+    .string "All right.\n"
+    .string "Don't hold anything back!$"
+
+Text_1A07E9:: @ 81A07E9
+    .string "{STR_VAR_1}$"
+
+gUnknown_81A07EC:: @ 81A07EC
+    .string "The match ended up a draw.$"
+
+gUnknown_81A0807:: @ 81A0807
+    .string "A draw, was it?\p"
+    .string "However, let me say that it was\n"
+    .string "a worthy spectacle.\p"
+    .string "I'd say it was a wonderful battle\n"
+    .string "with a real sense of depth!$"
+
+Text_1A0889:: @ 81A0889
+    .string "{STR_VAR_1}$"
+
+gUnknown_81A088C:: @ 81A088C
+    .string "Bravo!\p"
+    .string "Bravo, indeed!\n"
+    .string "What an astounding battle!\p"
+    .string "It was so astounding, why, it keeps\n"
+    .string "filling my eyes with tears!\p"
+    .string "The thrust and parry of expertly\n"
+    .string "used techniques!\p"
+    .string "The clash of power upon power!\p"
+    .string "Yes!\n"
+    .string "It was sheer magnificence!$"
+
+Text_1A096E:: @ 81A096E
+    .string "{STR_VAR_1}$"
+
+gUnknown_81A0971:: @ 81A0971
+    .string "Too bad!\n"
+    .string "I feel your disappointment.\p"
+    .string "However, that disappointment is\n"
+    .string "what will make you better.\p"
+    .string "Use it, learn from it, and make it\n"
+    .string "motivate you to seek greatness.\p"
+    .string "Forget not this disappointment\n"
+    .string "and redouble your training!$"
+
diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json
new file mode 100644
index 000000000..474d071d5
--- /dev/null
+++ b/data/maps/SevenIsland_House_Room2/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM2",
+  "name": "SevenIsland_House_Room2",
+  "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SEVEN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "240",
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM1",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc
new file mode 100644
index 000000000..db52423e4
--- /dev/null
+++ b/data/maps/SevenIsland_House_Room2/scripts.inc
@@ -0,0 +1,78 @@
+SevenIsland_House_Room2_MapScripts:: @ 8170A7E
+	map_script 3, SevenIsland_House_Room2_MapScript1_170A89
+	map_script 2, SevenIsland_House_Room2_MapScript2_170A8D
+	.byte 0
+
+SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89
+	special sub_80E5E70
+	end
+
+SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D
+	map_script_2 VAR_0x4001, 0, EventScript_170A97
+	.2byte 0
+
+EventScript_170A97:: @ 8170A97
+	lockall
+	applymovement 255, Movement_170B22
+	waitmovement 0
+	special sub_80E7538
+	loadword 0, gStringVar4 @ 2021D18
+	callstd 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	special sub_80E6900
+	waitstate
+	compare_var_to_value VAR_RESULT, 3
+	call_if 1, EventScript_170AFE
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_170B0C
+	compare_var_to_value VAR_RESULT, 2
+	call_if 1, EventScript_170B17
+	closemessage
+	special sp000_heal_pokemon
+	applymovement 255, Movement_170B28
+	waitmovement 0
+	special LoadPlayerParty
+	setvar VAR_0x4001, 1
+	warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1
+	waitstate
+	releaseall
+	end
+
+EventScript_170AFE:: @ 8170AFE
+	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3
+	msgbox gUnknown_81A07EC
+	return
+
+EventScript_170B0C:: @ 8170B0C
+	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
+	special sub_80CA68C
+	waitmessage
+	waitbuttonpress
+	return
+
+EventScript_170B17:: @ 8170B17
+	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
+	special sub_80CA68C
+	waitmessage
+	waitbuttonpress
+	return
+
+Movement_170B22:: @ 8170B22
+	step_10
+	step_10
+	step_10
+	step_13
+	step_13
+	step_end
+
+Movement_170B28:: @ 8170B28
+	step_12
+	step_12
+	step_11
+	step_11
+	step_11
+	step_11
+	step_1b
+	step_end
diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json
new file mode 100644
index 000000000..4d4be3485
--- /dev/null
+++ b/data/maps/SevenIsland_Mart/map.json
@@ -0,0 +1,80 @@
+{
+  "id": "MAP_SEVEN_ISLAND_MART",
+  "name": "SevenIsland_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SEVEN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_Mart_EventScript_170B31",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "16",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_Mart_EventScript_170B6E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "57",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_Mart_EventScript_170B80",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_Mart_EventScript_170B77",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc
new file mode 100644
index 000000000..ce9ad21ed
--- /dev/null
+++ b/data/maps/SevenIsland_Mart/scripts.inc
@@ -0,0 +1,42 @@
+SevenIsland_Mart_MapScripts:: @ 8170B30
+	.byte 0
+
+SevenIsland_Mart_EventScript_170B31:: @ 8170B31
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_170B58
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_170B58:: @ 8170B58
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E
+	msgbox gUnknown_81A0A4F, 2
+	end
+
+SevenIsland_Mart_EventScript_170B77:: @ 8170B77
+	msgbox gUnknown_81A0ACC, 2
+	end
+
+SevenIsland_Mart_EventScript_170B80:: @ 8170B80
+	msgbox gUnknown_81A0B09, 2
+	end
diff --git a/data/maps/SevenIsland_Mart/text.inc b/data/maps/SevenIsland_Mart/text.inc
new file mode 100644
index 000000000..9716c2427
--- /dev/null
+++ b/data/maps/SevenIsland_Mart/text.inc
@@ -0,0 +1,17 @@
+gUnknown_81A0A4F:: @ 81A0A4F
+    .string "POKéMON have personalities of their\n"
+    .string "own, just like people.\p"
+    .string "My PIKACHU has a HASTY nature,\n"
+    .string "so it grew to be a speedy POKéMON.$"
+
+gUnknown_81A0ACC:: @ 81A0ACC
+    .string "Okay, preparations are complete\n"
+    .string "for me to explore the RUINS.$"
+
+gUnknown_81A0B09:: @ 81A0B09
+    .string "I need to fish on SEVEN ISLAND.\p"
+    .string "That will complete my fishing tour\n"
+    .string "of the SEVII ISLANDS.\p"
+    .string "I'd better stock up on some\n"
+    .string "POKé BALLS first, though.$"
+
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..9cf243db6
--- /dev/null
+++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json
@@ -0,0 +1,113 @@
+{
+  "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F",
+  "name": "SevenIsland_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SEVEN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_170B98",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_170BA1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_170BAA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_170BB3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
+      "flag": "157"
+    },
+    {
+      "graphics_id": "0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
+      "flag": "157"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..170459099
--- /dev/null
+++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,27 @@
+SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89
+	map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94
+	map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94
+	setrespawn SPAWN_SEVEN_ISLAND
+	end
+
+SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1
+	msgbox gUnknown_81A0B98, 2
+	end
+
+SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA
+	msgbox gUnknown_81A0C1F, 2
+	end
+
+SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3
+	msgbox gUnknown_81A0CA5, 2
+	end
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/text.inc b/data/maps/SevenIsland_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..44e325ca0
--- /dev/null
+++ b/data/maps/SevenIsland_PokemonCenter_1F/text.inc
@@ -0,0 +1,19 @@
+gUnknown_81A0B98:: @ 81A0B98
+    .string "On this island, different events\n"
+    .string "occur depending on connections.\p"
+    .string "What are those connections?\p"
+    .string "They are for you to discover on\n"
+    .string "your own.$"
+
+gUnknown_81A0C1F:: @ 81A0C1F
+    .string "Did you ride a SEAGALLOP ferry\n"
+    .string "to get here?\p"
+    .string "There are at least ten of those\n"
+    .string "high-speed ships.\p"
+    .string "I don't know where they all go,\n"
+    .string "though.$"
+
+gUnknown_81A0CA5:: @ 81A0CA5
+    .string "If you're confident, you should\n"
+    .string "check out TRAINER TOWER.$"
+
diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..e7d48f819
--- /dev/null
+++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F",
+  "name": "SevenIsland_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SEVEN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..89d97e0db
--- /dev/null
+++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC
+	map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, SevenIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1
+	call EventScript_1BB4A3
+	end
+
+EventScript_170BD7:: @ 8170BD7
+	call EventScript_1BB6AB
+	end
+
+EventScript_170BDD:: @ 8170BDD
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json
new file mode 100644
index 000000000..fe1f030fd
--- /dev/null
+++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json
@@ -0,0 +1,183 @@
+{
+  "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
+  "name": "SevenIsland_SeavaultCanyon_TanobyKey",
+  "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_TANOBY_KEY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "97",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 6,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_0x4001",
+      "var_value": 99,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4007",
+      "var_value": 99,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4006",
+      "var_value": 99,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4005",
+      "var_value": 99,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4004",
+      "var_value": 99,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4003",
+      "var_value": 99,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4002",
+      "var_value": 99,
+      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc
new file mode 100644
index 000000000..566ed3ee6
--- /dev/null
+++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc
@@ -0,0 +1,143 @@
+SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
+	map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2
+	.byte 0
+
+SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
+	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY
+	checkflag FLAG_0x849
+	call_if 1, EventScript_164E07
+	setvar VAR_0x4001, 0
+	setvar VAR_0x4002, 0
+	setvar VAR_0x4003, 0
+	setvar VAR_0x4004, 0
+	setvar VAR_0x4005, 0
+	setvar VAR_0x4006, 0
+	setvar VAR_0x4007, 0
+	setvar VAR_0x4008, 0
+	end
+
+EventScript_164E07:: @ 8164E07
+	setobjectxyperm 1, 7, 2
+	setobjectxyperm 2, 4, 4
+	setobjectxyperm 3, 10, 4
+	setobjectxyperm 4, 5, 6
+	setobjectxyperm 5, 9, 6
+	setobjectxyperm 6, 5, 8
+	setobjectxyperm 7, 9, 8
+	return
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
+	lockall
+	compare_var_to_value VAR_0x4001, 100
+	goto_if_eq EventScript_164F8A
+	call EventScript_164F2E
+	setvar VAR_0x4001, 100
+	compare_var_to_value VAR_0x4008, 7
+	goto_if_eq EventScript_164F8C
+	releaseall
+	end
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
+	lockall
+	compare_var_to_value VAR_0x4002, 100
+	goto_if_eq EventScript_164F8A
+	call EventScript_164F2E
+	setvar VAR_0x4002, 100
+	compare_var_to_value VAR_0x4008, 7
+	goto_if_eq EventScript_164F8C
+	releaseall
+	end
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
+	lockall
+	compare_var_to_value VAR_0x4003, 100
+	goto_if_eq EventScript_164F8A
+	call EventScript_164F2E
+	setvar VAR_0x4003, 100
+	compare_var_to_value VAR_0x4008, 7
+	goto_if_eq EventScript_164F8C
+	releaseall
+	end
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
+	lockall
+	compare_var_to_value VAR_0x4004, 100
+	goto_if_eq EventScript_164F8A
+	call EventScript_164F2E
+	setvar VAR_0x4004, 100
+	compare_var_to_value VAR_0x4008, 7
+	goto_if_eq EventScript_164F8C
+	releaseall
+	end
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
+	lockall
+	compare_var_to_value VAR_0x4005, 100
+	goto_if_eq EventScript_164F8A
+	call EventScript_164F2E
+	setvar VAR_0x4005, 100
+	compare_var_to_value VAR_0x4008, 7
+	goto_if_eq EventScript_164F8C
+	releaseall
+	end
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
+	lockall
+	compare_var_to_value VAR_0x4006, 100
+	goto_if_eq EventScript_164F8A
+	call EventScript_164F2E
+	setvar VAR_0x4006, 100
+	compare_var_to_value VAR_0x4008, 7
+	goto_if_eq EventScript_164F8C
+	releaseall
+	end
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
+	lockall
+	compare_var_to_value VAR_0x4007, 100
+	goto_if_eq EventScript_164F8A
+	call EventScript_164F2E
+	setvar VAR_0x4007, 100
+	compare_var_to_value VAR_0x4008, 7
+	goto_if_eq EventScript_164F8C
+	releaseall
+	end
+
+EventScript_164F2E:: @ 8164F2E
+	addvar VAR_0x4008, 1
+	playse SE_RU_HYUU
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 3
+	special sub_80CAC28
+	delay 60
+	return
+
+EventScript_164F51:: @ 8164F51
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 10
+	setvar VAR_0x8007, 3
+	special sub_80CAC28
+	delay 60
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 12
+	setvar VAR_0x8007, 2
+	special sub_80CAC28
+	delay 60
+	playse SE_EXP
+	waitse
+	return
+
+EventScript_164F8A:: @ 8164F8A
+	releaseall
+	end
+
+EventScript_164F8C:: @ 8164F8C
+	call EventScript_164F51
+	msgbox gUnknown_817D31B
+	setflag FLAG_0x849
+	releaseall
+	end
diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc
new file mode 100644
index 000000000..c6f137869
--- /dev/null
+++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc
@@ -0,0 +1,4 @@
+gUnknown_817D31B:: @ 817D31B
+    .string "A mysterious rumble echoed\n"
+    .string "somewhere far away.$"
+
diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json
new file mode 100644
index 000000000..fbdaec45b
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon/map.json
@@ -0,0 +1,323 @@
+{
+  "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON",
+  "name": "SevenIsland_SevaultCanyon",
+  "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_SEVAULT_CANYON",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+      "offset": -48,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE",
+      "offset": -20,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "24",
+      "x": 13,
+      "y": 43,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACA4D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 13,
+      "y": 36,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACA8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 3,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "21",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACAC9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 3,
+      "y": 36,
+      "elevation": 3,
+      "movement_type": "22",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACB07",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 7,
+      "y": 56,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACB45",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 11,
+      "y": 63,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACB83",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 14,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACBC1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 14,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACC07",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 3,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "97",
+      "x": 13,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 7,
+      "y": 44,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "96",
+      "x": 12,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "96",
+      "x": 15,
+      "y": 46,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "96",
+      "x": 16,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "97",
+      "x": 17,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "96",
+      "x": 11,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C",
+      "flag": "27"
+    },
+    {
+      "graphics_id": "92",
+      "x": 18,
+      "y": 45,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BECDE",
+      "flag": "487"
+    },
+    {
+      "graphics_id": "92",
+      "x": 7,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BECEB",
+      "flag": "488"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1BECF8",
+      "flag": "489"
+    },
+    {
+      "graphics_id": "54",
+      "x": 8,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_1ACF95",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 17,
+      "elevation": 5,
+      "dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 61,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 66,
+      "elevation": 3,
+      "item": "ITEM_CHERI_BERRY",
+      "flag": "63",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 16,
+      "y": 71,
+      "elevation": 0,
+      "script": "SevenIsland_SevaultCanyon_EventScript_168BFE"
+    }
+  ]
+}
diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc
new file mode 100644
index 000000000..f0122ffbf
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc
@@ -0,0 +1,6 @@
+SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD
+	.byte 0
+
+SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE
+	msgbox gUnknown_818CF2B, 3
+	end
diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc
new file mode 100644
index 000000000..3d728797a
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon/text.inc
@@ -0,0 +1,122 @@
+Text_18C887:: @ 818C887
+    .string "My conditioning's in top form!$"
+
+Text_18C8A6:: @ 818C8A6
+    .string "Huh?\n"
+    .string "Something's not right…$"
+
+Text_18C8C2:: @ 818C8C2
+    .string "The way I am now, I may have to\n"
+    .string "hold off on TRAINER TOWER…$"
+
+Text_18C8FD:: @ 818C8FD
+    .string "It doesn't matter if you happen to\n"
+    .string "have the strongest POKéMON…\p"
+    .string "It doesn't mean a thing if you don't\n"
+    .string "know how to use them properly!$"
+
+Text_18C980:: @ 818C980
+    .string "You're a master at this.$"
+
+Text_18C999:: @ 818C999
+    .string "You see them every so often,\n"
+    .string "TRAINERS with awesome POKéMON\l"
+    .string "who have no idea what to do.\p"
+    .string "Before training POKéMON, TRAINERS\n"
+    .string "themselves need to grow up.$"
+
+Text_18CA2F:: @ 818CA2F
+    .string "I work to protect the environment.\n"
+    .string "In turn, nature protects me!$"
+
+Text_18CA6F:: @ 818CA6F
+    .string "Whoa! You're tough!\n"
+    .string "How about protecting me?$"
+
+Text_18CA9C:: @ 818CA9C
+    .string "From far out among the stars, our\n"
+    .string "planet is just a drop of water.\p"
+    .string "But we want to protect that drop\n"
+    .string "of water for everyone.$"
+
+Text_18CB16:: @ 818CB16
+    .string "Those shoes you have are pretty\n"
+    .string "snazzy.$"
+
+Text_18CB3E:: @ 818CB3E
+    .string "You're hot stuff in spite of your\n"
+    .string "cute looks.$"
+
+Text_18CB6C:: @ 818CB6C
+    .string "Your mom bought those snazzy\n"
+    .string "RUNNING SHOES for you?\p"
+    .string "She must adore you.$"
+
+Text_18CBB4:: @ 818CBB4
+    .string "You look strong.\n"
+    .string "Let me battle you, please!$"
+
+Text_18CBE0:: @ 818CBE0
+    .string "I knew it!\n"
+    .string "You're as tough as I thought!$"
+
+Text_18CC09:: @ 818CC09
+    .string "The way you battle has given me\n"
+    .string "a lot of useful data.\p"
+    .string "Thanks so much!$"
+
+Text_18CC4F:: @ 818CC4F
+    .string "I was given the best possible\n"
+    .string "education to become this strong.\p"
+    .string "I don't want to lose to anyone!$"
+
+Text_18CCAE:: @ 818CCAE
+    .string "Thank you. I feel like I've been\n"
+    .string "set free by losing to you.$"
+
+Text_18CCEA:: @ 818CCEA
+    .string "For some reason, I get furious\n"
+    .string "over the slightest thing.\p"
+    .string "I'll calm myself by breathing\n"
+    .string "deeply.$"
+
+Text_18CD49:: @ 818CD49
+    .string "LEX: My darling NYA, together\n"
+    .string "we could win!$"
+
+Text_18CD75:: @ 818CD75
+    .string "LEX: I seem to have been too\n"
+    .string "careless…$"
+
+Text_18CD9C:: @ 818CD9C
+    .string "LEX: I think it was a good\n"
+    .string "experience for NYA.\p"
+    .string "You have my gratitude.$"
+
+Text_18CDE2:: @ 818CDE2
+    .string "LEX: May I ask you to battle the\n"
+    .string "both of us at the same time?$"
+
+Text_18CE20:: @ 818CE20
+    .string "NYA: I'll do my best so I won't\n"
+    .string "drag down my mentor, LEX!$"
+
+Text_18CE5A:: @ 818CE5A
+    .string "NYA: Oh, no…\n"
+    .string "I'm so sorry, I…$"
+
+Text_18CE78:: @ 818CE78
+    .string "NYA: I think I'm going to need\n"
+    .string "much more seasoning and tutoring\l"
+    .string "under LEX…\p"
+    .string "…So, LEX, please, may I stay with\n"
+    .string "you like this?$"
+
+Text_18CEF4:: @ 818CEF4
+    .string "NYA: I'm sorry, but may we battle\n"
+    .string "in two-on-two style?$"
+
+gUnknown_818CF2B:: @ 818CF2B
+    .string "SEVAULT CANYON\n"
+    .string "TANOBY RUINS AHEAD$"
+
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
new file mode 100644
index 000000000..6011ec09d
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
@@ -0,0 +1,139 @@
+{
+  "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE",
+  "name": "SevenIsland_SevaultCanyon_Entrance",
+  "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_CANYON_ENTRANCE",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SEVEN_ISLAND",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON",
+      "offset": 20,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 3,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 4,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 11,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "20",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 10,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "19",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 11,
+      "y": 17,
+      "elevation": 5,
+      "movement_type": "23",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65321",
+      "x": 7,
+      "y": 65534,
+      "elevation": 1,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 17,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 29,
+      "elevation": 5,
+      "item": "ITEM_RAWST_BERRY",
+      "flag": "188",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 26,
+      "elevation": 0,
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4"
+    }
+  ]
+}
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc
new file mode 100644
index 000000000..7fcda3492
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc
@@ -0,0 +1,6 @@
+SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3
+	.byte 0
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4
+	msgbox gUnknown_818C82D, 3
+	end
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc
new file mode 100644
index 000000000..86ade1dbd
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc
@@ -0,0 +1,101 @@
+Text_18C384:: @ 818C384
+    .string "トレーナータワーには\n"
+    .string "いまは　はいれない　みたい‥$"
+
+Text_18C39E:: @ 818C39E
+    .string "トレーナータワーが　あいてる！\n"
+    .string "さっそく　はいってみよう！$"
+
+Text_18C3BC:: @ 818C3BC
+    .string "Kyahaha!\n"
+    .string "I'll flick you away effortlessly!$"
+
+Text_18C3E7:: @ 818C3E7
+    .string "Tch!\n"
+    .string "Too strong for me!$"
+
+Text_18C3FF:: @ 818C3FF
+    .string "What's that?\n"
+    .string "I don't act the way I look?\p"
+    .string "Heh, that's a part of my strategy!$"
+
+Text_18C44B:: @ 818C44B
+    .string "Howdy!\n"
+    .string "Are you a member of my fan club?$"
+
+Text_18C473:: @ 818C473
+    .string "Oh, so you're not a fan…\p"
+    .string "Well, I can change that.\n"
+    .string "Let me sing for you!$"
+
+Text_18C4BA:: @ 818C4BA
+    .string "Lalalah…\n"
+    .string "My POKéMON, I send them out,\l"
+    .string "all the girls scream and shout!$"
+
+Text_18C500:: @ 818C500
+    .string "This island is too spread out…\n"
+    .string "It's not easy patrolling the place.$"
+
+Text_18C543:: @ 818C543
+    .string "Uh-huh…$"
+
+Text_18C54B:: @ 818C54B
+    .string "TRAINERS like you from cities,\n"
+    .string "they sure are tough.\p"
+    .string "You'll be headed for the TOWER,\n"
+    .string "won't you?$"
+
+Text_18C5AA:: @ 818C5AA
+    .string "I punish people who abuse\n"
+    .string "POKéMON!$"
+
+Text_18C5CD:: @ 818C5CD
+    .string "You don't seem to be a problem\n"
+    .string "TRAINER.$"
+
+Text_18C5F5:: @ 818C5F5
+    .string "If you treat your POKéMON with\n"
+    .string "kindness, they'll understand.$"
+
+Text_18C632:: @ 818C632
+    .string "EVE: I'll team up with JON and\n"
+    .string "battle together.$"
+
+Text_18C662:: @ 818C662
+    .string "EVE: Me and JON, we lost.\n"
+    .string "Ehehe.$"
+
+Text_18C683:: @ 818C683
+    .string "EVE: I'm going to work harder with\n"
+    .string "JON.$"
+
+Text_18C6AB:: @ 818C6AB
+    .string "EVE: I want to team up with JON\n"
+    .string "when I battle you.\p"
+    .string "Come back with two POKéMON, okay?$"
+
+Text_18C700:: @ 818C700
+    .string "JON: When I'm with EVE, it feels\n"
+    .string "like we could never lose.$"
+
+Text_18C73B:: @ 818C73B
+    .string "JON: When I'm with EVE,\n"
+    .string "it doesn't feel like I've lost!$"
+
+Text_18C773:: @ 818C773
+    .string "JON: When I'm with EVE, I feel\n"
+    .string "giddy whether I win or lose.\p"
+    .string "It's magical!$"
+
+Text_18C7BD:: @ 818C7BD
+    .string "JON: If it's with EVE, I'll be\n"
+    .string "happy to battle with you.\p"
+    .string "So, I'd like to make it a\n"
+    .string "two-on-two battle, if I may.$"
+
+gUnknown_818C82D:: @ 818C82D
+    .string "SEVAULT CANYON ENTRANCE\p"
+    .string "TRAINERS are asked to refrain from\n"
+    .string "damaging plants in the CANYON.$"
+
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json
new file mode 100644
index 000000000..a1a85b829
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE",
+  "name": "SevenIsland_SevaultCanyon_House",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SEVAULT_CANYON",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_House_EventScript_172183",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "117",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_House_EventScript_172242",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 6,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC",
+      "flag": "509"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
new file mode 100644
index 000000000..4098a0e0d
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
@@ -0,0 +1,82 @@
+SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182
+	.byte 0
+
+SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
+	lock
+	checkflag FLAG_0x002
+	goto_if_eq EventScript_172211
+	playbgm BGM_FRLG_CHANSEY_DANCE, 0
+	applymovement 1, Movement_172231
+	waitmovement 0
+	fadedefaultbgm
+	delay 30
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81A4D72
+	textcolor 3
+	msgbox gUnknown_81A4DAF, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_172225
+	msgbox gUnknown_81A4DD8
+	closemessage
+	call EventScript_1A6675
+	compare_var_to_value VAR_FACING, 1
+	call_if 5, EventScript_172206
+	delay 30
+	playbgm BGM_FRLG_CHANSEY_DANCE, 0
+	applymovement 255, Movement_172231
+	waitmovement 0
+	fadedefaultbgm
+	delay 30
+	call EventScript_1A6C26
+	msgbox gUnknown_81A4DF5
+	setflag FLAG_0x002
+	release
+	end
+
+EventScript_172206:: @ 8172206
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_172211:: @ 8172211
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81A4D72
+	release
+	end
+
+EventScript_172225:: @ 8172225
+	textcolor 0
+	msgbox gUnknown_81A4DC8
+	release
+	end
+
+Movement_172231:: @ 8172231
+	step_25
+	step_1c
+	step_25
+	step_1c
+	step_25
+	step_1c
+	step_25
+	step_1c
+	step_30
+	step_1a
+	step_2e
+	step_1a
+	step_2f
+	step_1a
+	step_2d
+	step_1a
+	step_end
+
+SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_CHANSEY, 0
+	msgbox gUnknown_81A4E26
+	waitmoncry
+	release
+	end
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/text.inc b/data/maps/SevenIsland_SevaultCanyon_House/text.inc
new file mode 100644
index 000000000..0602136b9
--- /dev/null
+++ b/data/maps/SevenIsland_SevaultCanyon_House/text.inc
@@ -0,0 +1,22 @@
+gUnknown_81A4D72:: @ 81A4D72
+    .string "Dance, dance!\n"
+    .string "CHANSEY Dance!\p"
+    .string "You join in, too!\n"
+    .string "Dance, dance!$"
+
+gUnknown_81A4DAF:: @ 81A4DAF
+    .string "Would you like to dance?$"
+
+gUnknown_81A4DC8:: @ 81A4DC8
+    .string "Come on, dance!$"
+
+gUnknown_81A4DD8:: @ 81A4DD8
+    .string "{PLAYER} danced the CHANSEY Dance!$"
+
+gUnknown_81A4DF5:: @ 81A4DF5
+    .string "Ahahahaha!\p"
+    .string "There, you're all chipper now!\n"
+    .string "Lucky!$"
+
+gUnknown_81A4E26:: @ 81A4E26
+    .string "CHANSEY: Chansi! Chansi!$"
diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json
new file mode 100644
index 000000000..1659d862d
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins/map.json
@@ -0,0 +1,165 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+  "name": "SevenIsland_TanobyRuins",
+  "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_TANOBY_RUINS",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON",
+      "offset": 48,
+      "direction": "up"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "56",
+      "x": 35,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 121,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 85,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 85,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_TanobyRuins_EventScript_1ACD07",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 120,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 103,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 88,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 44,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 32,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 33,
+      "y": 10,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "65",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 86,
+      "y": 9,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "66",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 125,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "67",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "64",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SevenIsland_TanobyRuins/scripts.inc b/data/maps/SevenIsland_TanobyRuins/scripts.inc
new file mode 100644
index 000000000..7bb8054e3
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins/scripts.inc
@@ -0,0 +1,2 @@
+SevenIsland_TanobyRuins_MapScripts:: @ 8168C07
+	.byte 0
diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json
new file mode 100644
index 000000000..7347361dc
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json
@@ -0,0 +1,27 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER",
+  "name": "SevenIsland_TanobyRuins_DilfordChamber",
+  "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_DILFORD_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc
new file mode 100644
index 000000000..f0b8a602e
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc
@@ -0,0 +1,7 @@
+SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6
+	map_script 3, SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC
+	.byte 0
+
+SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC:: @ 8164CFC
+	call EventScript_1A925E
+	end
diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json
new file mode 100644
index 000000000..42e25a9bd
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json
@@ -0,0 +1,27 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER",
+  "name": "SevenIsland_TanobyRuins_LiptooChamber",
+  "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_LIPTOO_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc
new file mode 100644
index 000000000..2a9d64e42
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc
@@ -0,0 +1,7 @@
+SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE
+	map_script 3, SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4
+	.byte 0
+
+SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4:: @ 8164CE4
+	call EventScript_1A925E
+	end
diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json
new file mode 100644
index 000000000..1bdee8840
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json
@@ -0,0 +1,27 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER",
+  "name": "SevenIsland_TanobyRuins_MoneanChamber",
+  "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_MONEAN_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc
new file mode 100644
index 000000000..391a45a95
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc
@@ -0,0 +1,8 @@
+SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF
+	map_script 3, SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5
+	.byte 0
+
+SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5
+	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER
+	call EventScript_1A925E
+	end
diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json
new file mode 100644
index 000000000..af7181502
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json
@@ -0,0 +1,27 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER",
+  "name": "SevenIsland_TanobyRuins_RixyChamber",
+  "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_RIXY_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc
new file mode 100644
index 000000000..de1c0cd97
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc
@@ -0,0 +1,7 @@
+SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E
+	map_script 3, SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14
+	.byte 0
+
+SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14:: @ 8164D14
+	call EventScript_1A925E
+	end
diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json
new file mode 100644
index 000000000..58fa3d18c
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json
@@ -0,0 +1,27 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER",
+  "name": "SevenIsland_TanobyRuins_ScufibChamber",
+  "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_SCUFIB_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc
new file mode 100644
index 000000000..2cbb2d08d
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc
@@ -0,0 +1,7 @@
+SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02
+	map_script 3, SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08
+	.byte 0
+
+SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08:: @ 8164D08
+	call EventScript_1A925E
+	end
diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json
new file mode 100644
index 000000000..90cf4bd82
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json
@@ -0,0 +1,27 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER",
+  "name": "SevenIsland_TanobyRuins_ViapoisChamber",
+  "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_VIAPOIS_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc
new file mode 100644
index 000000000..ea63fa0ea
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc
@@ -0,0 +1,7 @@
+SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A
+	map_script 3, SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20
+	.byte 0
+
+SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20:: @ 8164D20
+	call EventScript_1A925E
+	end
diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json
new file mode 100644
index 000000000..542f8f61e
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json
@@ -0,0 +1,27 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER",
+  "name": "SevenIsland_TanobyRuins_WeepthChamber",
+  "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_WEEPTH_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_2",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc
new file mode 100644
index 000000000..ae8294f89
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc
@@ -0,0 +1,7 @@
+SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA
+	map_script 3, SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0
+	.byte 0
+
+SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0:: @ 8164CF0
+	call EventScript_1A925E
+	end
diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json
new file mode 100644
index 000000000..3c509950e
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER",
+  "name": "SevenIsland_TrainerTower",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_TRAINER_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SEVEN_ISLAND",
+      "offset": 48,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "19",
+      "x": 56,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_TrainerTower_EventScript_1AC84D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 56,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SevenIsland_TrainerTower_EventScript_1AC88B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 58,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 49,
+      "y": 27,
+      "elevation": 3,
+      "item": "ITEM_BIG_PEARL",
+      "flag": "185",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 47,
+      "y": 30,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "186",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 59,
+      "y": 32,
+      "elevation": 3,
+      "item": "ITEM_NANAB_BERRY",
+      "flag": "187",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 56,
+      "y": 8,
+      "elevation": 0,
+      "script": "SevenIsland_TrainerTower_EventScript_168BE1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 50,
+      "y": 30,
+      "elevation": 0,
+      "script": "SevenIsland_TrainerTower_EventScript_168BEA"
+    }
+  ]
+}
diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc
new file mode 100644
index 000000000..74902ebc8
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower/scripts.inc
@@ -0,0 +1,15 @@
+SevenIsland_TrainerTower_MapScripts:: @ 8168BD5
+	map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB
+	.byte 0
+
+SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB
+	setvar VAR_0x4082, 0
+	end
+
+SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1
+	msgbox gUnknown_818C338, 3
+	end
+
+SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA
+	msgbox gUnknown_818C370, 3
+	end
diff --git a/data/maps/SevenIsland_TrainerTower/text.inc b/data/maps/SevenIsland_TrainerTower/text.inc
new file mode 100644
index 000000000..027b3de54
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower/text.inc
@@ -0,0 +1,97 @@
+Text_18BE5D:: @ 818BE5D
+    .string "There appear to be many secrets\n"
+    .string "still unsolved in this world.$"
+
+Text_18BE9B:: @ 818BE9B
+    .string "Hmm…$"
+
+Text_18BEA0:: @ 818BEA0
+    .string "I suggest to you that you, too,\n"
+    .string "give a thought to the secrets and\l"
+    .string "mysteries of our world once a day.$"
+
+Text_18BF05:: @ 818BF05
+    .string "I'm curious, what compelled you to\n"
+    .string "come here?$"
+
+Text_18BF33:: @ 818BF33
+    .string "It's been so long since I battled,\n"
+    .string "my instincts are off.$"
+
+Text_18BF6C:: @ 818BF6C
+    .string "There are several ruins on the\n"
+    .string "SEVII ISLANDS.\p"
+    .string "The majority of them date back\n"
+    .string "a long way.$"
+
+Text_18BFC5:: @ 818BFC5
+    .string "It's been said that there are\n"
+    .string "mysterious stones on this island.\p"
+    .string "I suspect it has something to do\n"
+    .string "with the ruins here.$"
+
+Text_18C03B:: @ 818C03B
+    .string "Oh, interesting.$"
+
+Text_18C04C:: @ 818C04C
+    .string "Those ruins over there…\p"
+    .string "I haven't had any luck in finding\n"
+    .string "how I can get inside.$"
+
+Text_18C09C:: @ 818C09C
+    .string "A battle with you, so high up!$"
+
+Text_18C0BB:: @ 818C0BB
+    .string "Oh, the heartbreak of losing so\n"
+    .string "easily to you!$"
+
+Text_18C0EA:: @ 818C0EA
+    .string "Experience the joy of climbing!$"
+
+Text_18C10A:: @ 818C10A
+    .string "I'm pretty familiar with the land\n"
+    .string "around these parts.$"
+
+Text_18C140:: @ 818C140
+    .string "You don't need to be so pushy.\n"
+    .string "I'll be happy to tell you.$"
+
+Text_18C17A:: @ 818C17A
+    .string "The door to the ruins…\n"
+    .string "It has these strange patterns\l"
+    .string "engraved on the outside.\p"
+    .string "I don't know what they mean,\n"
+    .string "though.$"
+
+Text_18C1ED:: @ 818C1ED
+    .string "I sensed your approach.$"
+
+Text_18C205:: @ 818C205
+    .string "Give up…$"
+
+Text_18C20E:: @ 818C20E
+    .string "In your future, I sense that you\n"
+    .string "will meet many others.\p"
+    .string "I think you will be linked to each\n"
+    .string "other by a strange power.$"
+
+Text_18C283:: @ 818C283
+    .string "Somewhere on this island, peculiar\n"
+    .string "POKéMON are sleeping.$"
+
+Text_18C2BC:: @ 818C2BC
+    .string "What an amazing TRAINER!$"
+
+Text_18C2D5:: @ 818C2D5
+    .string "Somewhere on this island, peculiar\n"
+    .string "POKéMON are sleeping.\p"
+    .string "Could it be that they're waiting\n"
+    .string "for you?$"
+
+gUnknown_818C338:: @ 818C338
+    .string "TRAINER TOWER ENTRANCE\n"
+    .string "Rise to the Challenge, TRAINERS!$"
+
+gUnknown_818C370:: @ 818C370
+    .string "TRAINER TOWER AHEAD$"
+
diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json
new file mode 100644
index 000000000..f894c679f
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_1F/map.json
@@ -0,0 +1,128 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
+  "name": "SevenIsland_TrainerTower_1F",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "6"
+    },
+    {
+      "graphics_id": "240",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8",
+      "flag": "2"
+    },
+    {
+      "graphics_id": "241",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE",
+      "flag": "3"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4",
+      "flag": "4"
+    },
+    {
+      "graphics_id": "243",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA",
+      "flag": "5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400E",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 0,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc
new file mode 100644
index 000000000..eb9475260
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc
@@ -0,0 +1,60 @@
+SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8
+	map_script 5, SevenIsland_TrainerTower_1F_MapScript1_1C4F54
+	map_script 3, SevenIsland_TrainerTower_1F_MapScript2_1C4F62
+	map_script 2, SevenIsland_TrainerTower_1F_MapScript3_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8
+	call EventScript_1C52F4
+	end
+
+SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE
+	call EventScript_1C533B
+	end
+
+SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4
+	call EventScript_1C5382
+	end
+
+SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA
+	call EventScript_1C538C
+	end
+
+SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json
new file mode 100644
index 000000000..1af583fc9
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_2F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
+  "name": "SevenIsland_TrainerTower_2F",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0",
+      "flag": "6"
+    },
+    {
+      "graphics_id": "240",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8",
+      "flag": "2"
+    },
+    {
+      "graphics_id": "241",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE",
+      "flag": "3"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4",
+      "flag": "4"
+    },
+    {
+      "graphics_id": "243",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA",
+      "flag": "5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400E",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc
new file mode 100644
index 000000000..91107975b
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc
@@ -0,0 +1,25 @@
+SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6
+	map_script 5, SevenIsland_TrainerTower_2F_MapScript1_1C4F54
+	map_script 3, SevenIsland_TrainerTower_2F_MapScript2_1C4F62
+	map_script 2, SevenIsland_TrainerTower_2F_MapScript3_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6
+	call EventScript_1C52F4
+	end
+
+EventScript_1646FC:: @ 81646FC
+	call EventScript_1C533B
+	end
+
+EventScript_164702:: @ 8164702
+	call EventScript_1C5382
+	end
+
+EventScript_164708:: @ 8164708
+	call EventScript_1C538C
+	end
+
+EventScript_16470E:: @ 816470E
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json
new file mode 100644
index 000000000..1ada6e08b
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_3F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
+  "name": "SevenIsland_TrainerTower_3F",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0",
+      "flag": "6"
+    },
+    {
+      "graphics_id": "240",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8",
+      "flag": "2"
+    },
+    {
+      "graphics_id": "241",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE",
+      "flag": "3"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4",
+      "flag": "4"
+    },
+    {
+      "graphics_id": "243",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA",
+      "flag": "5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400E",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc
new file mode 100644
index 000000000..c4ecde9a0
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc
@@ -0,0 +1,25 @@
+SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714
+	map_script 5, SevenIsland_TrainerTower_3F_MapScript1_1C4F54
+	map_script 3, SevenIsland_TrainerTower_3F_MapScript2_1C4F62
+	map_script 2, SevenIsland_TrainerTower_3F_MapScript3_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724
+	call EventScript_1C52F4
+	end
+
+EventScript_16472A:: @ 816472A
+	call EventScript_1C533B
+	end
+
+EventScript_164730:: @ 8164730
+	call EventScript_1C5382
+	end
+
+EventScript_164736:: @ 8164736
+	call EventScript_1C538C
+	end
+
+EventScript_16473C:: @ 816473C
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json
new file mode 100644
index 000000000..e16cdcc95
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_4F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
+  "name": "SevenIsland_TrainerTower_4F",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0",
+      "flag": "6"
+    },
+    {
+      "graphics_id": "240",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8",
+      "flag": "2"
+    },
+    {
+      "graphics_id": "241",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE",
+      "flag": "3"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4",
+      "flag": "4"
+    },
+    {
+      "graphics_id": "243",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA",
+      "flag": "5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400E",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc
new file mode 100644
index 000000000..32d17a844
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc
@@ -0,0 +1,25 @@
+SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742
+	map_script 5, SevenIsland_TrainerTower_4F_MapScript1_1C4F54
+	map_script 3, SevenIsland_TrainerTower_4F_MapScript2_1C4F62
+	map_script 2, SevenIsland_TrainerTower_4F_MapScript3_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752
+	call EventScript_1C52F4
+	end
+
+EventScript_164758:: @ 8164758
+	call EventScript_1C533B
+	end
+
+EventScript_16475E:: @ 816475E
+	call EventScript_1C5382
+	end
+
+EventScript_164764:: @ 8164764
+	call EventScript_1C538C
+	end
+
+EventScript_16476A:: @ 816476A
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json
new file mode 100644
index 000000000..d30f293c6
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_5F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
+  "name": "SevenIsland_TrainerTower_5F",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0",
+      "flag": "6"
+    },
+    {
+      "graphics_id": "240",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8",
+      "flag": "2"
+    },
+    {
+      "graphics_id": "241",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE",
+      "flag": "3"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4",
+      "flag": "4"
+    },
+    {
+      "graphics_id": "243",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA",
+      "flag": "5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400E",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc
new file mode 100644
index 000000000..5c461c0e8
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc
@@ -0,0 +1,25 @@
+SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770
+	map_script 5, SevenIsland_TrainerTower_5F_MapScript1_1C4F54
+	map_script 3, SevenIsland_TrainerTower_5F_MapScript2_1C4F62
+	map_script 2, SevenIsland_TrainerTower_5F_MapScript3_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780
+	call EventScript_1C52F4
+	end
+
+EventScript_164786:: @ 8164786
+	call EventScript_1C533B
+	end
+
+EventScript_16478C:: @ 816478C
+	call EventScript_1C5382
+	end
+
+EventScript_164792:: @ 8164792
+	call EventScript_1C538C
+	end
+
+EventScript_164798:: @ 8164798
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json
new file mode 100644
index 000000000..03436ecc9
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_6F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
+  "name": "SevenIsland_TrainerTower_6F",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0",
+      "flag": "6"
+    },
+    {
+      "graphics_id": "240",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8",
+      "flag": "2"
+    },
+    {
+      "graphics_id": "241",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE",
+      "flag": "3"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4",
+      "flag": "4"
+    },
+    {
+      "graphics_id": "243",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA",
+      "flag": "5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400E",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc
new file mode 100644
index 000000000..5dd711203
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc
@@ -0,0 +1,25 @@
+SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E
+	map_script 5, SevenIsland_TrainerTower_6F_MapScript1_1C4F54
+	map_script 3, SevenIsland_TrainerTower_6F_MapScript2_1C4F62
+	map_script 2, SevenIsland_TrainerTower_6F_MapScript3_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE
+	call EventScript_1C52F4
+	end
+
+EventScript_1647B4:: @ 81647B4
+	call EventScript_1C533B
+	end
+
+EventScript_1647BA:: @ 81647BA
+	call EventScript_1C5382
+	end
+
+EventScript_1647C0:: @ 81647C0
+	call EventScript_1C538C
+	end
+
+EventScript_1647C6:: @ 81647C6
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json
new file mode 100644
index 000000000..cc738186e
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_7F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
+  "name": "SevenIsland_TrainerTower_7F",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0",
+      "flag": "6"
+    },
+    {
+      "graphics_id": "240",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8",
+      "flag": "2"
+    },
+    {
+      "graphics_id": "241",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE",
+      "flag": "3"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4",
+      "flag": "4"
+    },
+    {
+      "graphics_id": "243",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA",
+      "flag": "5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400E",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc
new file mode 100644
index 000000000..2a74cfb91
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc
@@ -0,0 +1,25 @@
+SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC
+	map_script 5, SevenIsland_TrainerTower_7F_MapScript1_1C4F54
+	map_script 3, SevenIsland_TrainerTower_7F_MapScript2_1C4F62
+	map_script 2, SevenIsland_TrainerTower_7F_MapScript3_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC
+	call EventScript_1C52F4
+	end
+
+EventScript_1647E2:: @ 81647E2
+	call EventScript_1C533B
+	end
+
+EventScript_1647E8:: @ 81647E8
+	call EventScript_1C5382
+	end
+
+EventScript_1647EE:: @ 81647EE
+	call EventScript_1C538C
+	end
+
+EventScript_1647F4:: @ 81647F4
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json
new file mode 100644
index 000000000..bcf7ce583
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_8F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
+  "name": "SevenIsland_TrainerTower_8F",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0",
+      "flag": "6"
+    },
+    {
+      "graphics_id": "240",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8",
+      "flag": "2"
+    },
+    {
+      "graphics_id": "241",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE",
+      "flag": "3"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4",
+      "flag": "4"
+    },
+    {
+      "graphics_id": "243",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA",
+      "flag": "5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400E",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x400F",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc
new file mode 100644
index 000000000..1219425d0
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc
@@ -0,0 +1,25 @@
+SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA
+	map_script 5, SevenIsland_TrainerTower_8F_MapScript1_1C4F54
+	map_script 3, SevenIsland_TrainerTower_8F_MapScript2_1C4F62
+	map_script 2, SevenIsland_TrainerTower_8F_MapScript3_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A
+	call EventScript_1C52F4
+	end
+
+EventScript_164810:: @ 8164810
+	call EventScript_1C533B
+	end
+
+EventScript_164816:: @ 8164816
+	call EventScript_1C5382
+	end
+
+EventScript_16481C:: @ 816481C
+	call EventScript_1C538C
+	end
+
+EventScript_164822:: @ 8164822
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json
new file mode 100644
index 000000000..a1130c118
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_Elevator/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+  "name": "SevenIsland_TrainerTower_Elevator",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 0,
+      "y": 2,
+      "elevation": 0,
+      "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03"
+    }
+  ]
+}
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
new file mode 100644
index 000000000..de508c706
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
@@ -0,0 +1,81 @@
+SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8
+	map_script 5, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54
+	map_script 2, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
+	lockall
+	setvar VAR_0x8004, 6
+	checkflag FLAG_0x002
+	call_if 0, EventScript_1A7AB9
+	copyvar VAR_0x8005, VAR_0x403A
+	special sub_80CB580
+	message Text_1A535C
+	waitmessage
+	setvar VAR_0x8004, 6
+	specialvar VAR_RESULT, sub_80CB328
+	switch VAR_RESULT
+	case 0, EventScript_164B46
+	case 1, EventScript_164B52
+	end
+
+EventScript_164B46:: @ 8164B46
+	multichoicedefault 0, 0, 20, 0, 0
+	goto EventScript_164B5E
+	end
+
+EventScript_164B52:: @ 8164B52
+	multichoicedefault 0, 0, 20, 1, 0
+	goto EventScript_164B5E
+	end
+
+EventScript_164B5E:: @ 8164B5E
+	switch VAR_RESULT
+	case 0, EventScript_164BCD
+	case 1, EventScript_164B90
+	case 2, EventScript_164BD3
+	case 127, EventScript_164BD3
+	end
+
+EventScript_164B90:: @ 8164B90
+	setvar VAR_0x8006, 3
+	setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
+	compare_var_to_value VAR_0x403A, 3
+	goto_if_eq EventScript_164BD3
+	call EventScript_164BD8
+	setvar VAR_0x403A, 3
+	special sub_80CB63C
+	delay 25
+	applymovement 255, Movement_164BE5
+	waitmovement 0
+	warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
+	waitstate
+	releaseall
+	end
+
+EventScript_164BCD:: @ 8164BCD
+	goto EventScript_164BD3
+	end
+
+EventScript_164BD3:: @ 8164BD3
+	special sub_80CB63C
+	releaseall
+	end
+
+EventScript_164BD8:: @ 8164BD8
+	special sub_80CB63C
+	closemessage
+	waitse
+	special sub_80CB498
+	waitstate
+	setflag FLAG_0x002
+	return
+
+Movement_164BE5:: @ 8164BE5
+	step_2d
+	step_1c
+	step_10
+	step_13
+	step_13
+	step_10
+	step_end
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json
new file mode 100644
index 000000000..d65c41577
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json
@@ -0,0 +1,125 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+  "name": "SevenIsland_TrainerTower_Lobby",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "66",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164992",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "66",
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164966",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 12,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 2,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x4082",
+      "var_value": 0,
+      "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 8,
+      "y": 10,
+      "elevation": 0,
+      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8"
+    }
+  ]
+}
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
new file mode 100644
index 000000000..0b6b930c7
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
@@ -0,0 +1,237 @@
+SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839
+	map_script 5, SevenIsland_TrainerTower_Lobby_MapScript1_164853
+	map_script 7, SevenIsland_TrainerTower_Lobby_MapScript2_164887
+	map_script 3, SevenIsland_TrainerTower_Lobby_MapScript3_1648AD
+	map_script 1, SevenIsland_TrainerTower_Lobby_MapScript4_164897
+	map_script 2, SevenIsland_TrainerTower_Lobby_MapScript5_1648B6
+	.byte 0
+
+SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853
+	setvar VAR_0x4002, 0
+	setvar VAR_0x8004, 10
+	special sub_815D9E8
+	setvar VAR_0x8004, 18
+	special sub_815D9E8
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_164886
+	setvar VAR_0x4000, 0
+	setobjectxy 255, 9, 7
+	applymovement 255, Movement_164AD4
+
+EventScript_164886:: @ 8164886
+	end
+
+SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887
+	addobject 1
+	addobject 2
+	addobject 3
+	addobject 4
+	addobject 5
+	end
+
+SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897
+	compare_var_to_value VAR_0x400D, 17
+	call_if 1, EventScript_1648A3
+	end
+
+EventScript_1648A3:: @ 81648A3
+	setmetatile 17, 10, 647, 0
+	return
+
+SevenIsland_TrainerTower_Lobby_MapScript3_1648AD:: @ 81648AD
+	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY
+	getplayerxy VAR_0x400D, VAR_RESULT
+	end
+
+SevenIsland_TrainerTower_Lobby_MapScript5_1648B6:: @ 81648B6
+	map_script_2 VAR_0x4000, 0, EventScript_1648ED
+	map_script_2 VAR_0x400D, 0x11, EventScript_1648C8
+	.2byte 0
+
+EventScript_1648C8:: @ 81648C8
+	lockall
+	applymovement 255, Movement_1648EA
+	waitmovement 0
+	setmetatile 17, 10, 692, 1
+	special DrawWholeMapView
+	playse SE_N
+	waitse
+	setvar VAR_0x400D, 0
+	releaseall
+	end
+
+Movement_1648EA:: @ 81648EA
+	step_10
+	step_10
+	step_end
+
+EventScript_1648ED:: @ 81648ED
+	setvar VAR_0x4000, 1
+	setvar VAR_0x8004, 12
+	special sub_815D9E8
+	switch VAR_RESULT
+	case 0, EventScript_164920
+	case 1, EventScript_164938
+	case 2, EventScript_16495C
+
+EventScript_164920:: @ 8164920
+	lock
+	faceplayer
+	applymovement 255, Movement_164AD4
+	textcolor 1
+	msgbox gUnknown_817C937
+	goto EventScript_16494B
+
+EventScript_164938:: @ 8164938
+	lock
+	faceplayer
+	applymovement 255, Movement_164AD4
+	textcolor 1
+	msgbox gUnknown_817C9C0
+
+EventScript_16494B:: @ 816494B
+	closemessage
+	applymovement 255, Movement_164AD6
+	waitmovement 0
+	setvar VAR_0x4082, 0
+	release
+
+EventScript_16495C:: @ 816495C
+	end
+
+SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966
+	lock
+	faceplayer
+	setvar VAR_0x8004, 20
+	special sub_815D9E8
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_164988
+	msgbox gUnknown_817C9A2
+	goto EventScript_164990
+
+EventScript_164988:: @ 8164988
+	msgbox gUnknown_817CE1F
+
+EventScript_164990:: @ 8164990
+	release
+	end
+
+SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_1649B8
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_1649B8:: @ 81649B8
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE
+	lockall
+	applymovement 255, Movement_164AD4
+	textcolor 1
+	msgbox gUnknown_817C794
+	setvar VAR_0x8004, 17
+	special sub_815D9E8
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_164A00
+	msgbox gUnknown_817C7D9
+	goto EventScript_164A08
+
+EventScript_164A00:: @ 8164A00
+	msgbox gUnknown_817C850
+
+EventScript_164A08:: @ 8164A08
+	message Text_17C88D
+	waitmessage
+	multichoice 18, 6, 16, 0
+	switch VAR_RESULT
+	case 0, EventScript_164A53
+	case 1, EventScript_164ABF
+	case 2, EventScript_164A45
+	case 127, EventScript_164ABF
+	end
+
+EventScript_164A45:: @ 8164A45
+	msgbox gUnknown_817CCC9
+	goto EventScript_164A08
+	end
+
+EventScript_164A53:: @ 8164A53
+	multichoice 13, 3, 64, 0
+	switch VAR_RESULT
+	case 0, EventScript_164AA0
+	case 1, EventScript_164AA0
+	case 2, EventScript_164AA0
+	case 3, EventScript_164AA0
+	case 4, EventScript_164ABF
+	case 127, EventScript_164ABF
+	end
+
+EventScript_164AA0:: @ 8164AA0
+	copyvar VAR_0x8005, VAR_RESULT
+	setvar VAR_0x4082, 1
+	special sp000_heal_pokemon
+	msgbox gUnknown_817C8BF
+	setvar VAR_0x8004, 6
+	special sub_815D9E8
+	releaseall
+	end
+
+EventScript_164ABF:: @ 8164ABF
+	msgbox gUnknown_817C91D
+	closemessage
+	applymovement 255, Movement_164AD6
+	waitmovement 0
+	releaseall
+	end
+
+Movement_164AD4:: @ 8164AD4
+	step_03
+	step_end
+
+Movement_164AD6:: @ 8164AD6
+	step_10
+	step_end
+
+SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8
+	lockall
+	fadescreen 1
+	setvar VAR_0x8004, 1
+	special sub_80CD228
+	waitstate
+	releaseall
+	end
+
+SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6
+	msgbox gUnknown_817CE38, 2
+	end
+
+SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF
+	msgbox gUnknown_817CE9F, 2
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc b/data/maps/SevenIsland_TrainerTower_Lobby/text.inc
new file mode 100644
index 000000000..bf1e73b91
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/text.inc
@@ -0,0 +1,118 @@
+gUnknown_817C794:: @ 817C794
+    .string "Hello!\p"
+    .string "Welcome to TRAINER TOWER where\n"
+    .string "TRAINERS gather from all over!$"
+
+gUnknown_817C7D9:: @ 817C7D9
+    .string "TRAINERS from all over the world\n"
+    .string "gather here to battle.\p"
+    .string "Let me see…\p"
+    .string "Right now, there are TRAINERS only\n"
+    .string "up to Floor {STR_VAR_1}.$"
+
+gUnknown_817C850:: @ 817C850
+    .string "TRAINERS are awaiting your\n"
+    .string "challenge up to the eighth floor.$"
+
+Text_17C88D:: @ 817C88D
+    .string "Would you like to challenge the\n"
+    .string "waiting TRAINERS?$"
+
+gUnknown_817C8BF:: @ 817C8BF
+    .string "Okay, I'll get the clock started,\n"
+    .string "so give it everything you have.\p"
+    .string "On your marks…\p"
+    .string "Get set…\p"
+    .string "Go!$"
+
+gUnknown_817C91D:: @ 817C91D
+    .string "Please do visit us again!$"
+
+gUnknown_817C937:: @ 817C937
+    .string "That was too bad.\p"
+    .string "I think you put in a tremendous\n"
+    .string "effort in your battling.\p"
+    .string "Please come back and try again!$"
+
+gUnknown_817C9A2:: @ 817C9A2
+    .string "I hope you give it your best.$"
+
+gUnknown_817C9C0:: @ 817C9C0
+    .string "When the TRAINERS switch places,\n"
+    .string "the movement can be hectic.\p"
+    .string "To avoid the stampede, we moved\n"
+    .string "the reception counter here.\p"
+    .string "I'm sorry for the inconvenience.$"
+
+Text_17CA5A:: @ 817CA5A
+    .string "Hello…\p"
+    .string "I am the owner of this TOWER…\p"
+    .string "How the sky soars above this\n"
+    .string "rooftop…\p"
+    .string "The caress of the winds up here…\p"
+    .string "It's all so perfect…\p"
+    .string "The way you battled…\n"
+    .string "It, too, was perfection…$"
+
+Text_17CB09:: @ 817CB09
+    .string "This is for you…$"
+
+Text_17CB1A:: @ 817CB1A
+    .string "Oh!\n"
+    .string "Stupendous!\p"
+    .string "It's marvelous how you've come up\n"
+    .string "here so quickly.\p"
+    .string "The fact is, you've done it in\n"
+    .string "record time…\p"
+    .string "I'll have your record posted at\n"
+    .string "the reception counter.$"
+
+Text_17CBC0:: @ 817CBC0
+    .string "You seem to have taken your sweet\n"
+    .string "time getting here…$"
+
+Text_17CBF5:: @ 817CBF5
+    .string "What I would like to see is a\n"
+    .string "better time out of you…\p"
+    .string "I'm counting on you.\p"
+    .string "Until then, farewell…$"
+
+Text_17CC56:: @ 817CC56
+    .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
+
+Text_17CC69:: @ 817CC69
+    .string "せいせきひょうです$"
+
+Text_17CC73:: @ 817CC73
+    .string "This is a two-on-two battle.\p"
+    .string "You may not battle unless you have\n"
+    .string "at least two POKéMON.$"
+
+gUnknown_817CCC9:: @ 817CCC9
+    .string "Here at TRAINER TOWER, there is an\n"
+    .string "event called TIME ATTACK.\p"
+    .string "You will be timed on how quickly\n"
+    .string "you can get from the reception\l"
+    .string "counter to the OWNER on the roof.\p"
+    .string "The best times will be recorded on\n"
+    .string "the Time Board.\p"
+    .string "Try competing with friends to see\n"
+    .string "who can beat it the fastest.\p"
+    .string "You will not earn any EXP. Points\n"
+    .string "or money by beating TRAINERS here.$"
+
+gUnknown_817CE1F:: @ 817CE1F
+    .string "Thank you for competing!$"
+
+gUnknown_817CE38:: @ 817CE38
+    .string "I'm here to see how good I am.\p"
+    .string "I wonder what kinds of TRAINERS\n"
+    .string "are waiting for me?\p"
+    .string "It's nerve-racking!$"
+
+gUnknown_817CE9F:: @ 817CE9F
+    .string "Gasp, gasp…\n"
+    .string "Gasp…\p"
+    .string "Never mind battling! These stairs…\n"
+    .string "They're tougher than any battle…$"
+
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json
new file mode 100644
index 000000000..b8f8f858b
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
+  "name": "SevenIsland_TrainerTower_Roof",
+  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
+  "music": "BGM_FRLG_TRAINER_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "70",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0",
+      "flag": "6"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc
new file mode 100644
index 000000000..af451e565
--- /dev/null
+++ b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc
@@ -0,0 +1,8 @@
+SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828
+	map_script 5, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54
+	map_script 2, SevenIsland_TrainerTower_Roof_MapScript2_1C5046
+	.byte 0
+
+SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833
+	call EventScript_1C53AA
+	end
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json
new file mode 100644
index 000000000..51dcc5ee6
--- /dev/null
+++ b/data/maps/SilphCo_10F/map.json
@@ -0,0 +1,186 @@
+{
+  "id": "MAP_SILPH_CO_10F",
+  "name": "SilphCo_10F",
+  "layout": "LAYOUT_SILPH_CO_10F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 10,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SilphCo_10F_EventScript_161DC0",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "48",
+      "x": 10,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_10F_EventScript_161D96",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 0,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SilphCo_10F_EventScript_161DD7",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_10F_EventScript_1BE8F5",
+      "flag": "407"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_10F_EventScript_1BE902",
+      "flag": "408"
+    },
+    {
+      "graphics_id": "92",
+      "x": 3,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_10F_EventScript_1BE90F",
+      "flag": "409"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_11F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_4F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_4F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_9F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 14,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_4F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 13,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_10F_EventScript_1A8AEF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_10F_EventScript_1A8AEF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 12,
+      "elevation": 0,
+      "script": "SilphCo_10F_EventScript_1A8AEF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 12,
+      "elevation": 0,
+      "script": "SilphCo_10F_EventScript_1A8AEF"
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 9,
+      "elevation": 0,
+      "item": "ITEM_HP_UP",
+      "flag": "143",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_10F_EventScript_161DB7"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc
new file mode 100644
index 000000000..dea6b7af4
--- /dev/null
+++ b/data/maps/SilphCo_10F/scripts.inc
@@ -0,0 +1,36 @@
+SilphCo_10F_MapScripts:: @ 8161D86
+	map_script 1, SilphCo_10F_MapScript1_161D8C
+	.byte 0
+
+SilphCo_10F_MapScript1_161D8C:: @ 8161D8C
+	checkflag FLAG_0x28C
+	call_if 0, EventScript_1A84D6
+	end
+
+SilphCo_10F_EventScript_161D96:: @ 8161D96
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_161DAD
+	msgbox gUnknown_8176DBA
+	release
+	end
+
+EventScript_161DAD:: @ 8161DAD
+	msgbox gUnknown_8176DCE
+	release
+	end
+
+SilphCo_10F_EventScript_161DB7:: @ 8161DB7
+	msgbox gUnknown_8176DF8, 3
+	end
+
+SilphCo_10F_EventScript_161DC0:: @ 8161DC0
+	trainerbattle 0, 345, 0, Text_176D57, Text_176D73
+	msgbox gUnknown_8176D86, 6
+	end
+
+SilphCo_10F_EventScript_161DD7:: @ 8161DD7
+	trainerbattle 0, 389, 0, Text_176CED, Text_176D18
+	msgbox gUnknown_8176D25, 6
+	end
diff --git a/data/maps/SilphCo_10F/text.inc b/data/maps/SilphCo_10F/text.inc
new file mode 100644
index 000000000..a910cd435
--- /dev/null
+++ b/data/maps/SilphCo_10F/text.inc
@@ -0,0 +1,33 @@
+Text_176CED:: @ 8176CED
+    .string "Welcome to 10F!\n"
+    .string "So good of you to join me!$"
+
+Text_176D18:: @ 8176D18
+    .string "I'm stunned!$"
+
+gUnknown_8176D25:: @ 8176D25
+    .string "Nice try, but the boardroom is up\n"
+    .string "one more floor.$"
+
+Text_176D57:: @ 8176D57
+    .string "Enough of your silly games!$"
+
+Text_176D73:: @ 8176D73
+    .string "No continues left!$"
+
+gUnknown_8176D86:: @ 8176D86
+    .string "Are you satisfied with beating me?\n"
+    .string "Then go on home!$"
+
+gUnknown_8176DBA:: @ 8176DBA
+    .string "Waaaaa!\n"
+    .string "I'm scared!$"
+
+gUnknown_8176DCE:: @ 8176DCE
+    .string "About me crying…\n"
+    .string "Please keep it a secret.$"
+
+gUnknown_8176DF8:: @ 8176DF8
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "10F$"
+
diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json
new file mode 100644
index 000000000..1d479e041
--- /dev/null
+++ b/data/maps/SilphCo_11F/map.json
@@ -0,0 +1,184 @@
+{
+  "id": "MAP_SILPH_CO_11F",
+  "name": "SilphCo_11F",
+  "layout": "LAYOUT_SILPH_CO_11F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 11,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "33",
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_11F_EventScript_161DFE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "48",
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_11F_EventScript_161E7F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "87",
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "49",
+      "x": 16,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "SilphCo_11F_EventScript_161F40",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "92",
+      "x": 16,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_11F_EventScript_1BEB58",
+      "flag": "457"
+    },
+    {
+      "graphics_id": "49",
+      "x": 2,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "SilphCo_11F_EventScript_161F57",
+      "flag": "83"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_10F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_7F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 13,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 0,
+      "script": "SilphCo_11F_EventScript_161E88"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 0,
+      "script": "SilphCo_11F_EventScript_161E94"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 16,
+      "elevation": 3,
+      "script": "SilphCo_11F_EventScript_1A8B09"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 17,
+      "elevation": 3,
+      "script": "SilphCo_11F_EventScript_1A8B09"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 16,
+      "elevation": 3,
+      "script": "SilphCo_11F_EventScript_1A8B09"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 17,
+      "elevation": 3,
+      "script": "SilphCo_11F_EventScript_1A8B09"
+    },
+    {
+      "type": "hidden_item",
+      "x": 10,
+      "y": 18,
+      "elevation": 0,
+      "item": "ITEM_REVIVE",
+      "flag": "144",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_11F_EventScript_161F37"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc
new file mode 100644
index 000000000..92dc9ebc0
--- /dev/null
+++ b/data/maps/SilphCo_11F/scripts.inc
@@ -0,0 +1,144 @@
+SilphCo_11F_MapScripts:: @ 8161DEE
+	map_script 1, SilphCo_11F_MapScript1_161DF4
+	.byte 0
+
+SilphCo_11F_MapScript1_161DF4:: @ 8161DF4
+	checkflag FLAG_0x28D
+	call_if 0, EventScript_1A8504
+	end
+
+SilphCo_11F_EventScript_161DFE:: @ 8161DFE
+	lock
+	faceplayer
+	checkflag FLAG_0x250
+	goto_if_eq EventScript_161E75
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_161E59
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_161E62
+	checkitemspace ITEM_MASTER_BALL, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_161E6B
+	additem ITEM_MASTER_BALL, 1
+	giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, BGM_FRLG_ME_KEYITEM
+	msgbox gUnknown_8176FEB
+	setflag FLAG_0x250
+	release
+	end
+
+EventScript_161E59:: @ 8161E59
+	msgbox gUnknown_8176E12
+	return
+
+EventScript_161E62:: @ 8161E62
+	msgbox gUnknown_8176EE7
+	return
+
+EventScript_161E6B:: @ 8161E6B
+	msgbox gUnknown_817708E
+	release
+	end
+
+EventScript_161E75:: @ 8161E75
+	msgbox gUnknown_8176FEB
+	release
+	end
+
+SilphCo_11F_EventScript_161E7F:: @ 8161E7F
+	msgbox gUnknown_81770A9, 2
+	end
+
+SilphCo_11F_EventScript_161E88:: @ 8161E88
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_161EA0
+
+EventScript_161E93:: @ 8161E93
+	end
+
+SilphCo_11F_EventScript_161E94:: @ 8161E94
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_161EA0
+
+EventScript_161E9F:: @ 8161E9F
+	end
+
+EventScript_161EA0:: @ 8161EA0
+	textcolor 0
+	applymovement 3, Movement_1A75ED
+	waitmovement 0
+	delay 25
+	msgbox gUnknown_8177108
+	closemessage
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_161F00
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_161F12
+	setvar VAR_LAST_TALKED, 3
+	trainerbattle 3, 349, 0, Text_1771AB
+	msgbox gUnknown_81771C2
+	closemessage
+	fadescreen 1
+	removeobject 3
+	removeobject 4
+	removeobject 6
+	fadescreen 0
+	setvar VAR_0x4060, 1
+	setflag FLAG_0x03E
+	clearflag FLAG_0x03F
+	releaseall
+	end
+
+EventScript_161F00:: @ 8161F00
+	applymovement 3, Movement_161F1D
+	applymovement 255, Movement_161F27
+	waitmovement 0
+	return
+
+EventScript_161F12:: @ 8161F12
+	applymovement 3, Movement_161F23
+	waitmovement 0
+	return
+
+Movement_161F1D:: @ 8161F1D
+	step_10
+	step_10
+	step_10
+	step_10
+	step_2f
+	step_end
+
+Movement_161F23:: @ 8161F23
+	step_10
+	step_10
+	step_10
+	step_end
+
+Movement_161F27:: @ 8161F27
+	step_1c
+	step_1c
+	step_1c
+	step_1b
+	step_1a
+	step_30
+	step_end
+
+EventScript_161F2E:: @ 8161F2E
+	msgbox gUnknown_817732B, 3
+	end
+
+SilphCo_11F_EventScript_161F37:: @ 8161F37
+	msgbox gUnknown_817734A, 3
+	end
+
+SilphCo_11F_EventScript_161F40:: @ 8161F40
+	trainerbattle 0, 390, 0, Text_1772B8, Text_1772E7
+	msgbox gUnknown_81772F9, 6
+	end
+
+SilphCo_11F_EventScript_161F57:: @ 8161F57
+	trainerbattle 0, 391, 0, Text_17726A, Text_17728C
+	msgbox gUnknown_817729B, 6
+	end
diff --git a/data/maps/SilphCo_11F/text.inc b/data/maps/SilphCo_11F/text.inc
new file mode 100644
index 000000000..dcb60219a
--- /dev/null
+++ b/data/maps/SilphCo_11F/text.inc
@@ -0,0 +1,94 @@
+gUnknown_8176E12:: @ 8176E12
+    .string "PRESIDENT: Oh, dear boy!\n"
+    .string "Thank you for saving SILPH.\p"
+    .string "I will never forget you saved us in\n"
+    .string "our moment of peril.\p"
+    .string "I have to thank you in some way.\p"
+    .string "Because I am rich, I can give you\n"
+    .string "anything.\p"
+    .string "Here, maybe this will do.$"
+
+gUnknown_8176EE7:: @ 8176EE7
+    .string "PRESIDENT: Oh, dear girl!\n"
+    .string "Thank you for saving SILPH.\p"
+    .string "I will never forget you saved us in\n"
+    .string "our moment of peril.\p"
+    .string "I have to thank you in some way.\p"
+    .string "Because I am rich, I can give you\n"
+    .string "anything.\p"
+    .string "Here, maybe this will do.$"
+
+gUnknown_8176FBD:: @ 8176FBD
+    .string "{PLAYER} obtained a MASTER BALL\n"
+    .string "from the PRESIDENT!$"
+
+gUnknown_8176FEB:: @ 8176FEB
+    .string "PRESIDENT: You can't buy that\n"
+    .string "anywhere.\p"
+    .string "It's our secret prototype MASTER\n"
+    .string "BALL.\p"
+    .string "It will catch any POKéMON without\n"
+    .string "fail!\p"
+    .string "You should be quiet about using it,\n"
+    .string "though.$"
+
+gUnknown_817708E:: @ 817708E
+    .string "You have no room for this.$"
+
+gUnknown_81770A9:: @ 81770A9
+    .string "SECRETARY: Thank you for rescuing\n"
+    .string "all of us.\p"
+    .string "We, from the PRESIDENT down,\n"
+    .string "are indebted to you.$"
+
+gUnknown_8177108:: @ 8177108
+    .string "Ah, {PLAYER}!\n"
+    .string "So we meet again!\p"
+    .string "The PRESIDENT and I are discussing\n"
+    .string "a vital business proposition.\p"
+    .string "Keep your nose out of grown-up\n"
+    .string "matters…\p"
+    .string "Or, experience a world of pain!$"
+
+Text_1771AB:: @ 81771AB
+    .string "Arrgh!!\n"
+    .string "I lost again!?$"
+
+gUnknown_81771C2:: @ 81771C2
+    .string "Blast it all!\n"
+    .string "You ruined our plans for SILPH!\p"
+    .string "But, TEAM ROCKET will never fall!\p"
+    .string "{PLAYER}! Never forget that all\n"
+    .string "POKéMON exist for TEAM ROCKET!\p"
+    .string "I must go, but I shall return!$"
+
+Text_17726A:: @ 817726A
+    .string "Stop right there!\n"
+    .string "Don't you move!$"
+
+Text_17728C:: @ 817728C
+    .string "Don't…\n"
+    .string "Please!$"
+
+gUnknown_817729B:: @ 817729B
+    .string "So, you want to see my BOSS?$"
+
+Text_1772B8:: @ 81772B8
+    .string "Halt! Do you have an appointment\n"
+    .string "with my BOSS?$"
+
+Text_1772E7:: @ 81772E7
+    .string "Gaah!\n"
+    .string "Demolished!$"
+
+gUnknown_81772F9:: @ 81772F9
+    .string "Watch your step…\n"
+    .string "My BOSS likes his POKéMON tough!$"
+
+gUnknown_817732B:: @ 817732B
+    .string "The monitor has POKéMON on it!$"
+
+gUnknown_817734A:: @ 817734A
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "11F$"
+
diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json
new file mode 100644
index 000000000..325cef8b5
--- /dev/null
+++ b/data/maps/SilphCo_1F/map.json
@@ -0,0 +1,77 @@
+{
+  "id": "MAP_SILPH_CO_1F",
+  "name": "SilphCo_1F",
+  "layout": "LAYOUT_SILPH_CO_1F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 1,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "48",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_1F_EventScript_16162F",
+      "flag": "63"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SAFFRON_CITY_DUPLICATE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 22,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 30,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_1F_EventScript_161638"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc
new file mode 100644
index 000000000..ffb126808
--- /dev/null
+++ b/data/maps/SilphCo_1F/scripts.inc
@@ -0,0 +1,15 @@
+SilphCo_1F_MapScripts:: @ 8161625
+	map_script 3, SilphCo_1F_MapScript1_16162B
+	.byte 0
+
+SilphCo_1F_MapScript1_16162B:: @ 816162B
+	setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F
+	end
+
+SilphCo_1F_EventScript_16162F:: @ 816162F
+	msgbox gUnknown_81754F7, 2
+	end
+
+SilphCo_1F_EventScript_161638:: @ 8161638
+	msgbox gUnknown_8175549, 3
+	end
diff --git a/data/maps/SilphCo_1F/text.inc b/data/maps/SilphCo_1F/text.inc
new file mode 100644
index 000000000..048102660
--- /dev/null
+++ b/data/maps/SilphCo_1F/text.inc
@@ -0,0 +1,13 @@
+gUnknown_81754F7:: @ 81754F7
+    .string "Welcome.\p"
+    .string "The PRESIDENT is in the boardroom\n"
+    .string "on 11F.$"
+
+Text_17552A:: @ 817552A
+    .string "めちゃめちゃに　こわされてる\n"
+    .string "とうぶん　なおりそうに　ない‥$"
+
+gUnknown_8175549:: @ 8175549
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "1F$"
+
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
new file mode 100644
index 000000000..51d1ba7a6
--- /dev/null
+++ b/data/maps/SilphCo_2F/map.json
@@ -0,0 +1,208 @@
+{
+  "id": "MAP_SILPH_CO_2F",
+  "name": "SilphCo_2F",
+  "layout": "LAYOUT_SILPH_CO_2F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 2,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 29,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "SilphCo_2F_EventScript_1616AE",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "55",
+      "x": 28,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "15",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SilphCo_2F_EventScript_161680",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "49",
+      "x": 20,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SilphCo_2F_EventScript_161697",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "55",
+      "x": 5,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_2F_EventScript_161669",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "28",
+      "x": 10,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_2F_EventScript_16165A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 28,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_8F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 30,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 7,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_6F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 33,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_8F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 22,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_1A891B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_1A891B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_1A891B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_1A891B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 15,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_1A8935"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 15,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_1A8935"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 16,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_1A8935"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 16,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_1A8935"
+    },
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 21,
+      "elevation": 0,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "135",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_2F_EventScript_161660"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc
new file mode 100644
index 000000000..309ee5d13
--- /dev/null
+++ b/data/maps/SilphCo_2F/scripts.inc
@@ -0,0 +1,40 @@
+SilphCo_2F_MapScripts:: @ 8161641
+	map_script 1, SilphCo_2F_MapScript1_161647
+	.byte 0
+
+SilphCo_2F_MapScript1_161647:: @ 8161647
+	checkflag FLAG_0x27A
+	call_if 0, EventScript_1A8149
+	checkflag FLAG_0x27B
+	call_if 0, EventScript_1A8177
+	end
+
+SilphCo_2F_EventScript_16165A:: @ 816165A
+	goto EventScript_1C4816
+
+EventScript_16165F:: @ 816165F
+	end
+
+SilphCo_2F_EventScript_161660:: @ 8161660
+	msgbox gUnknown_8175894, 3
+	end
+
+SilphCo_2F_EventScript_161669:: @ 8161669
+	trainerbattle 0, 336, 0, Text_175562, Text_17557E
+	msgbox gUnknown_817559F, 6
+	end
+
+SilphCo_2F_EventScript_161680:: @ 8161680
+	trainerbattle 0, 337, 0, Text_1755C6, Text_1755E5
+	msgbox gUnknown_81755F2, 6
+	end
+
+SilphCo_2F_EventScript_161697:: @ 8161697
+	trainerbattle 0, 373, 0, Text_17562D, Text_17564A
+	msgbox gUnknown_8175651, 6
+	end
+
+SilphCo_2F_EventScript_1616AE:: @ 81616AE
+	trainerbattle 0, 374, 0, Text_1756AD, Text_1756D8
+	msgbox gUnknown_81756E2, 6
+	end
diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc
new file mode 100644
index 000000000..ee3fbc0b0
--- /dev/null
+++ b/data/maps/SilphCo_2F/text.inc
@@ -0,0 +1,74 @@
+Text_175562:: @ 8175562
+    .string "Help!\n"
+    .string "I'm a SILPH employee.$"
+
+Text_17557E:: @ 817557E
+    .string "How did you know\n"
+    .string "I was a ROCKET?$"
+
+gUnknown_817559F:: @ 817559F
+    .string "I work for both SILPH and TEAM\n"
+    .string "ROCKET.$"
+
+Text_1755C6:: @ 81755C6
+    .string "It's off-limits here!\n"
+    .string "Go home!$"
+
+Text_1755E5:: @ 81755E5
+    .string "You're good.$"
+
+gUnknown_81755F2:: @ 81755F2
+    .string "Can you solve the maze in here?\n"
+    .string "It's not easy, I tell you!$"
+
+Text_17562D:: @ 817562D
+    .string "No kids are allowed in here!$"
+
+Text_17564A:: @ 817564A
+    .string "Tough!$"
+
+gUnknown_8175651:: @ 8175651
+    .string "Diamond-shaped tiles are teleport\n"
+    .string "blocks.\p"
+    .string "They're transporters for this\n"
+    .string "high-tech building.$"
+
+Text_1756AD:: @ 81756AD
+    .string "Hey, kid!\n"
+    .string "What are you wandering here for?$"
+
+Text_1756D8:: @ 81756D8
+    .string "I goofed!$"
+
+gUnknown_81756E2:: @ 81756E2
+    .string "SILPH CO. will be associated with\n"
+    .string "TEAM ROCKET!$"
+
+Text_175711:: @ 8175711
+    .string "Eeek!\n"
+    .string "No! Stop! Help!\p"
+    .string "Oh, you're not with TEAM ROCKET.\n"
+    .string "I'm sorry, I thought…\p"
+    .string "Will you forgive me if I teach\n"
+    .string "you the THUNDER WAVE technique?$"
+
+Text_17579D:: @ 817579D
+    .string "Oh…\n"
+    .string "But THUNDER WAVE is convenient…$"
+
+Text_1757C1:: @ 81757C1
+    .string "Which POKéMON should I teach\n"
+    .string "THUNDER WAVE?$"
+
+Text_1757EC:: @ 81757EC
+    .string "THUNDER WAVE causes paralysis in\n"
+    .string "the target POKéMON.\p"
+    .string "A paralyzed POKéMON may be unable\n"
+    .string "to move in battle.\p"
+    .string "It's an ELECTRIC-type move, so it\n"
+    .string "won't work on some POKéMON.$"
+
+gUnknown_8175894:: @ 8175894
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "2F$"
+
diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
new file mode 100644
index 000000000..b900dd5dd
--- /dev/null
+++ b/data/maps/SilphCo_3F/map.json
@@ -0,0 +1,216 @@
+{
+  "id": "MAP_SILPH_CO_3F",
+  "name": "SilphCo_3F",
+  "layout": "LAYOUT_SILPH_CO_3F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 3,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 25,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SilphCo_3F_EventScript_16171F",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "47",
+      "x": 31,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_3F_EventScript_1616DE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_3F_EventScript_161708",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "92",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_3F_EventScript_1BE866",
+      "flag": "396"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 28,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_5F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 13,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_7F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 30,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_4F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 2,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_9F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_5F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 29,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 32,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 22,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 12,
+      "elevation": 3,
+      "script": "SilphCo_3F_EventScript_1A894F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "script": "SilphCo_3F_EventScript_1A894F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 12,
+      "elevation": 3,
+      "script": "SilphCo_3F_EventScript_1A8969"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 13,
+      "elevation": 3,
+      "script": "SilphCo_3F_EventScript_1A8969"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "script": "SilphCo_3F_EventScript_1A894F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "script": "SilphCo_3F_EventScript_1A894F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 20,
+      "y": 12,
+      "elevation": 3,
+      "script": "SilphCo_3F_EventScript_1A8969"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 20,
+      "y": 13,
+      "elevation": 3,
+      "script": "SilphCo_3F_EventScript_1A8969"
+    },
+    {
+      "type": "hidden_item",
+      "x": 34,
+      "y": 18,
+      "elevation": 0,
+      "item": "ITEM_PROTEIN",
+      "flag": "136",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_3F_EventScript_1616FF"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc
new file mode 100644
index 000000000..d4b7458ce
--- /dev/null
+++ b/data/maps/SilphCo_3F/scripts.inc
@@ -0,0 +1,38 @@
+SilphCo_3F_MapScripts:: @ 81616C5
+	map_script 1, SilphCo_3F_MapScript1_1616CB
+	.byte 0
+
+SilphCo_3F_MapScript1_1616CB:: @ 81616CB
+	checkflag FLAG_0x27C
+	call_if 0, EventScript_1A81A5
+	checkflag FLAG_0x27D
+	call_if 0, EventScript_1A81DC
+	end
+
+SilphCo_3F_EventScript_1616DE:: @ 81616DE
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_1616F5
+	msgbox gUnknown_81758AD
+	release
+	end
+
+EventScript_1616F5:: @ 81616F5
+	msgbox gUnknown_81758D3
+	release
+	end
+
+SilphCo_3F_EventScript_1616FF:: @ 81616FF
+	msgbox gUnknown_81759DC, 3
+	end
+
+SilphCo_3F_EventScript_161708:: @ 8161708
+	trainerbattle 0, 338, 0, Text_175948, Text_17597D
+	msgbox gUnknown_8175990, 6
+	end
+
+SilphCo_3F_EventScript_16171F:: @ 816171F
+	trainerbattle 0, 375, 0, Text_1758F6, Text_175911
+	msgbox gUnknown_817591C, 6
+	end
diff --git a/data/maps/SilphCo_3F/text.inc b/data/maps/SilphCo_3F/text.inc
new file mode 100644
index 000000000..6b8a8d4d1
--- /dev/null
+++ b/data/maps/SilphCo_3F/text.inc
@@ -0,0 +1,34 @@
+gUnknown_81758AD:: @ 81758AD
+    .string "I work for SILPH CO.\n"
+    .string "What am I to do?$"
+
+gUnknown_81758D3:: @ 81758D3
+    .string "{PLAYER}!\n"
+    .string "You and your POKéMON saved us!$"
+
+Text_1758F6:: @ 81758F6
+    .string "Quit messing with us, kid!$"
+
+Text_175911:: @ 8175911
+    .string "I give up!$"
+
+gUnknown_817591C:: @ 817591C
+    .string "A hint? You can open doors with\n"
+    .string "a CARD KEY!$"
+
+Text_175948:: @ 8175948
+    .string "I support TEAM ROCKET more than\n"
+    .string "I support SILPH CO.!$"
+
+Text_17597D:: @ 817597D
+    .string "You really got me!$"
+
+gUnknown_8175990:: @ 8175990
+    .string "Humph…\p"
+    .string "TEAM ROCKET said that if I helped\n"
+    .string "them, they'd let me study POKéMON.$"
+
+gUnknown_81759DC:: @ 81759DC
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "3F$"
+
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json
new file mode 100644
index 000000000..04966c66f
--- /dev/null
+++ b/data/maps/SilphCo_4F/map.json
@@ -0,0 +1,247 @@
+{
+  "id": "MAP_SILPH_CO_4F",
+  "name": "SilphCo_4F",
+  "layout": "LAYOUT_SILPH_CO_4F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 4,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 33,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SilphCo_4F_EventScript_1617A7",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "49",
+      "x": 10,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "SilphCo_4F_EventScript_161790",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "55",
+      "x": 14,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SilphCo_4F_EventScript_161779",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "47",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_4F_EventScript_16174F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_4F_EventScript_1BE873",
+      "flag": "397"
+    },
+    {
+      "graphics_id": "92",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_4F_EventScript_1BE880",
+      "flag": "398"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_4F_EventScript_1BE88D",
+      "flag": "399"
+    },
+    {
+      "graphics_id": "92",
+      "x": 30,
+      "y": 18,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_4F_EventScript_1BEE09",
+      "flag": "510"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 28,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_6F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 30,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_10F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_10F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 18,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_10F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 22,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 16,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_1A8983"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 16,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_1A8983"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 17,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_1A8983"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 17,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_1A8983"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_1A899D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_1A899D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 12,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_1A899D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 12,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_1A899D"
+    },
+    {
+      "type": "hidden_item",
+      "x": 35,
+      "y": 20,
+      "elevation": 0,
+      "item": "ITEM_IRON",
+      "flag": "137",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_4F_EventScript_161770"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc
new file mode 100644
index 000000000..884f2e410
--- /dev/null
+++ b/data/maps/SilphCo_4F/scripts.inc
@@ -0,0 +1,43 @@
+SilphCo_4F_MapScripts:: @ 8161736
+	map_script 1, SilphCo_4F_MapScript1_16173C
+	.byte 0
+
+SilphCo_4F_MapScript1_16173C:: @ 816173C
+	checkflag FLAG_0x27E
+	call_if 0, EventScript_1A8213
+	checkflag FLAG_0x27F
+	call_if 0, EventScript_1A8241
+	end
+
+SilphCo_4F_EventScript_16174F:: @ 816174F
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_161766
+	msgbox gUnknown_81759F5
+	release
+	end
+
+EventScript_161766:: @ 8161766
+	msgbox gUnknown_8175A15
+	release
+	end
+
+SilphCo_4F_EventScript_161770:: @ 8161770
+	msgbox gUnknown_8175B57, 3
+	end
+
+SilphCo_4F_EventScript_161779:: @ 8161779
+	trainerbattle 0, 339, 0, Text_175A90, Text_175AB0
+	msgbox gUnknown_8175AC8, 6
+	end
+
+SilphCo_4F_EventScript_161790:: @ 8161790
+	trainerbattle 0, 376, 0, Text_175A2F, Text_175A5B
+	msgbox gUnknown_8175A62, 6
+	end
+
+SilphCo_4F_EventScript_1617A7:: @ 81617A7
+	trainerbattle 0, 377, 0, Text_175B19, Text_175B2B
+	msgbox gUnknown_8175B38, 6
+	end
diff --git a/data/maps/SilphCo_4F/text.inc b/data/maps/SilphCo_4F/text.inc
new file mode 100644
index 000000000..d8741f9a3
--- /dev/null
+++ b/data/maps/SilphCo_4F/text.inc
@@ -0,0 +1,45 @@
+gUnknown_81759F5:: @ 81759F5
+    .string "Sssh!\n"
+    .string "Can't you see I'm hiding?$"
+
+gUnknown_8175A15:: @ 8175A15
+    .string "Huh?\n"
+    .string "TEAM ROCKET is gone?$"
+
+Text_175A2F:: @ 8175A2F
+    .string "TEAM ROCKET has taken control\n"
+    .string "of SILPH CO.!$"
+
+Text_175A5B:: @ 8175A5B
+    .string "Arrgh!$"
+
+gUnknown_8175A62:: @ 8175A62
+    .string "Fwahahaha!\n"
+    .string "My BOSS has been after this place!$"
+
+Text_175A90:: @ 8175A90
+    .string "My POKéMON is my loyal servant.$"
+
+Text_175AB0:: @ 8175AB0
+    .string "Darn!\n"
+    .string "You weak POKéMON!$"
+
+gUnknown_8175AC8:: @ 8175AC8
+    .string "The doors are electronically\n"
+    .string "locked.\p"
+    .string "It takes a CARD KEY to open the\n"
+    .string "doors here.$"
+
+Text_175B19:: @ 8175B19
+    .string "Intruder spotted!$"
+
+Text_175B2B:: @ 8175B2B
+    .string "Who are you?$"
+
+gUnknown_8175B38:: @ 8175B38
+    .string "I better tell the BOSS on 11F!$"
+
+gUnknown_8175B57:: @ 8175B57
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "4F$"
+
diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json
new file mode 100644
index 000000000..b3f512516
--- /dev/null
+++ b/data/maps/SilphCo_5F/map.json
@@ -0,0 +1,318 @@
+{
+  "id": "MAP_SILPH_CO_5F",
+  "name": "SilphCo_5F",
+  "layout": "LAYOUT_SILPH_CO_5F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 5,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 35,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SilphCo_5F_EventScript_161853",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "26",
+      "x": 23,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SilphCo_5F_EventScript_16186A",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "47",
+      "x": 16,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_5F_EventScript_1617E0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SilphCo_5F_EventScript_161825",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "49",
+      "x": 9,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "16",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SilphCo_5F_EventScript_16183C",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "92",
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_5F_EventScript_1BE89A",
+      "flag": "400"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_5F_EventScript_1BE8A7",
+      "flag": "401"
+    },
+    {
+      "graphics_id": "92",
+      "x": 22,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_5F_EventScript_1BE8B4",
+      "flag": "402"
+    },
+    {
+      "graphics_id": "55",
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "28",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_5F_EventScript_1AD0D4",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 28,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 30,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_6F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 10,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_9F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_7F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 22,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 13,
+      "y": 16,
+      "elevation": 0,
+      "item": "ITEM_ELIXIR",
+      "flag": "24",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89B7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 10,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89B7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 18,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89D1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 19,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89D1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 19,
+      "y": 13,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89EB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 19,
+      "y": 14,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89EB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89B7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 10,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89B7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 19,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89D1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 18,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89D1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 18,
+      "y": 13,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89EB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 18,
+      "y": 14,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_1A89EB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 28,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_161813"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 30,
+      "y": 13,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_16180A"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 25,
+      "y": 15,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_161801"
+    },
+    {
+      "type": "hidden_item",
+      "x": 32,
+      "y": 9,
+      "elevation": 0,
+      "item": "ITEM_PP_UP",
+      "flag": "138",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_5F_EventScript_16181C"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc
new file mode 100644
index 000000000..e17c791b9
--- /dev/null
+++ b/data/maps/SilphCo_5F/scripts.inc
@@ -0,0 +1,62 @@
+SilphCo_5F_MapScripts:: @ 81617BE
+	map_script 1, SilphCo_5F_MapScript1_1617C4
+	.byte 0
+
+SilphCo_5F_MapScript1_1617C4:: @ 81617C4
+	checkflag FLAG_0x280
+	call_if 0, EventScript_1A826F
+	checkflag FLAG_0x281
+	call_if 0, EventScript_1A82A6
+	checkflag FLAG_0x282
+	call_if 0, EventScript_1A82DD
+	end
+
+SilphCo_5F_EventScript_1617E0:: @ 81617E0
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_1617F7
+	msgbox gUnknown_8175B70
+	release
+	end
+
+EventScript_1617F7:: @ 81617F7
+	msgbox gUnknown_8175BB3
+	release
+	end
+
+SilphCo_5F_EventScript_161801:: @ 8161801
+	msgbox gUnknown_8175D89, 3
+	end
+
+SilphCo_5F_EventScript_16180A:: @ 816180A
+	msgbox gUnknown_8175DE0, 3
+	end
+
+SilphCo_5F_EventScript_161813:: @ 8161813
+	msgbox gUnknown_8175E28, 3
+	end
+
+SilphCo_5F_EventScript_16181C:: @ 816181C
+	msgbox gUnknown_8175E80, 3
+	end
+
+SilphCo_5F_EventScript_161825:: @ 8161825
+	trainerbattle 0, 340, 0, Text_175C40, Text_175C6D
+	msgbox gUnknown_8175C7D, 6
+	end
+
+SilphCo_5F_EventScript_16183C:: @ 816183C
+	trainerbattle 0, 378, 0, Text_175BE5, Text_175C09
+	msgbox gUnknown_8175C0F, 6
+	end
+
+SilphCo_5F_EventScript_161853:: @ 8161853
+	trainerbattle 0, 379, 0, Text_175D28, Text_175D4B
+	msgbox gUnknown_8175D59, 6
+	end
+
+SilphCo_5F_EventScript_16186A:: @ 816186A
+	trainerbattle 0, 286, 0, Text_175CBD, Text_175CEB
+	msgbox gUnknown_8175CF9, 6
+	end
diff --git a/data/maps/SilphCo_5F/text.inc b/data/maps/SilphCo_5F/text.inc
new file mode 100644
index 000000000..5a768d5f5
--- /dev/null
+++ b/data/maps/SilphCo_5F/text.inc
@@ -0,0 +1,74 @@
+gUnknown_8175B70:: @ 8175B70
+    .string "TEAM ROCKET is in an uproar over\n"
+    .string "some intruder.\p"
+    .string "That's you, right?$"
+
+gUnknown_8175BB3:: @ 8175BB3
+    .string "TEAM ROCKET took off!\n"
+    .string "You're our hero! Thank you!$"
+
+Text_175BE5:: @ 8175BE5
+    .string "I heard a kid was wandering\n"
+    .string "around.$"
+
+Text_175C09:: @ 8175C09
+    .string "Boom!$"
+
+gUnknown_8175C0F:: @ 8175C0F
+    .string "It's not smart to pick a fight with\n"
+    .string "TEAM ROCKET!$"
+
+Text_175C40:: @ 8175C40
+    .string "We study POKé BALL technology on\n"
+    .string "this floor.$"
+
+Text_175C6D:: @ 8175C6D
+    .string "Dang!\n"
+    .string "Blast it!$"
+
+gUnknown_8175C7D:: @ 8175C7D
+    .string "We worked on the ultimate POKé\n"
+    .string "BALL which would catch anything.$"
+
+Text_175CBD:: @ 8175CBD
+    .string "Whaaat?\p"
+    .string "There shouldn't be any children\n"
+    .string "here!$"
+
+Text_175CEB:: @ 8175CEB
+    .string "Oh, goodness!$"
+
+gUnknown_8175CF9:: @ 8175CF9
+    .string "You're only on 5F.\n"
+    .string "It's a long way to my BOSS!$"
+
+Text_175D28:: @ 8175D28
+    .string "Show TEAM ROCKET a little respect!$"
+
+Text_175D4B:: @ 8175D4B
+    .string "Cough…\n"
+    .string "Cough…$"
+
+gUnknown_8175D59:: @ 8175D59
+    .string "Which reminds me.\p"
+    .string "KOFFING evolves into WEEZING!$"
+
+gUnknown_8175D89:: @ 8175D89
+    .string "It's a POKéMON REPORT!\p"
+    .string "POKéMON LAB created PORYGON,\n"
+    .string "the first virtual-reality POKéMON.$"
+
+gUnknown_8175DE0:: @ 8175DE0
+    .string "It's a POKéMON REPORT!\p"
+    .string "Over 350 POKéMON techniques have\n"
+    .string "been confirmed.$"
+
+gUnknown_8175E28:: @ 8175E28
+    .string "It's a POKéMON REPORT!\p"
+    .string "Some POKéMON have been confirmed\n"
+    .string "to evolve when they are traded.$"
+
+gUnknown_8175E80:: @ 8175E80
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "5F$"
+
diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json
new file mode 100644
index 000000000..c9c1b2f09
--- /dev/null
+++ b/data/maps/SilphCo_6F/map.json
@@ -0,0 +1,231 @@
+{
+  "id": "MAP_SILPH_CO_6F",
+  "name": "SilphCo_6F",
+  "layout": "LAYOUT_SILPH_CO_6F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 6,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 21,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SilphCo_6F_EventScript_161956",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "47",
+      "x": 23,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_6F_EventScript_1618D3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "48",
+      "x": 24,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_6F_EventScript_1618F4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 22,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_6F_EventScript_161891",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_6F_EventScript_1618B2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "48",
+      "x": 16,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_6F_EventScript_161915",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 9,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SilphCo_6F_EventScript_16193F",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "92",
+      "x": 2,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_6F_EventScript_1BE8C1",
+      "flag": "403"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_6F_EventScript_1BE8CE",
+      "flag": "404"
+    },
+    {
+      "graphics_id": "49",
+      "x": 18,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SilphCo_6F_EventScript_16196D",
+      "flag": "83"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_7F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 29,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_2F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 26,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_5F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_4F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 15,
+      "elevation": 0,
+      "script": "SilphCo_6F_EventScript_1A8A05"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 16,
+      "elevation": 0,
+      "script": "SilphCo_6F_EventScript_1A8A05"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 15,
+      "elevation": 0,
+      "script": "SilphCo_6F_EventScript_1A8A05"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 16,
+      "elevation": 0,
+      "script": "SilphCo_6F_EventScript_1A8A05"
+    },
+    {
+      "type": "hidden_item",
+      "x": 1,
+      "y": 8,
+      "elevation": 0,
+      "item": "ITEM_CARBOS",
+      "flag": "139",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 25,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_6F_EventScript_161936"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc
new file mode 100644
index 000000000..caeedd216
--- /dev/null
+++ b/data/maps/SilphCo_6F/scripts.inc
@@ -0,0 +1,97 @@
+SilphCo_6F_MapScripts:: @ 8161881
+	map_script 1, SilphCo_6F_MapScript1_161887
+	.byte 0
+
+SilphCo_6F_MapScript1_161887:: @ 8161887
+	checkflag FLAG_0x283
+	call_if 0, EventScript_1A8314
+	end
+
+SilphCo_6F_EventScript_161891:: @ 8161891
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_1618A8
+	msgbox gUnknown_817607E
+	release
+	end
+
+EventScript_1618A8:: @ 81618A8
+	msgbox gUnknown_81760B6
+	release
+	end
+
+SilphCo_6F_EventScript_1618B2:: @ 81618B2
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_1618C9
+	msgbox gUnknown_8175F24
+	release
+	end
+
+EventScript_1618C9:: @ 81618C9
+	msgbox gUnknown_8175F51
+	release
+	end
+
+SilphCo_6F_EventScript_1618D3:: @ 81618D3
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_1618EA
+	msgbox gUnknown_8175F70
+	release
+	end
+
+EventScript_1618EA:: @ 81618EA
+	msgbox gUnknown_8175F93
+	release
+	end
+
+SilphCo_6F_EventScript_1618F4:: @ 81618F4
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_16190B
+	msgbox gUnknown_8175FAA
+	release
+	end
+
+EventScript_16190B:: @ 816190B
+	msgbox gUnknown_8175FD3
+	release
+	end
+
+SilphCo_6F_EventScript_161915:: @ 8161915
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_16192C
+	msgbox gUnknown_8176012
+	release
+	end
+
+EventScript_16192C:: @ 816192C
+	msgbox gUnknown_817604B
+	release
+	end
+
+SilphCo_6F_EventScript_161936:: @ 8161936
+	msgbox gUnknown_817624D, 3
+	end
+
+SilphCo_6F_EventScript_16193F:: @ 816193F
+	trainerbattle 0, 341, 0, Text_176136, Text_1761BD
+	msgbox gUnknown_81761C4, 6
+	end
+
+SilphCo_6F_EventScript_161956:: @ 8161956
+	trainerbattle 0, 380, 0, Text_1760DE, Text_176104
+	msgbox gUnknown_817610F, 6
+	end
+
+SilphCo_6F_EventScript_16196D:: @ 816196D
+	trainerbattle 0, 381, 0, Text_1761F1, Text_17620E
+	msgbox gUnknown_817621B, 6
+	end
diff --git a/data/maps/SilphCo_6F/text.inc b/data/maps/SilphCo_6F/text.inc
new file mode 100644
index 000000000..1de83df51
--- /dev/null
+++ b/data/maps/SilphCo_6F/text.inc
@@ -0,0 +1,86 @@
+Text_175E99:: @ 8175E99
+    .string "Those thugs that took over our\n"
+    .string "building…\p"
+    .string "Their BOSS said he was looking for\n"
+    .string "strong POKéMON.\p"
+    .string "I hope our PRESIDENT managed to\n"
+    .string "avoid trouble…$"
+
+gUnknown_8175F24:: @ 8175F24
+    .string "The ROCKETS came and took over\n"
+    .string "the building!$"
+
+gUnknown_8175F51:: @ 8175F51
+    .string "Well, better get back to work.$"
+
+gUnknown_8175F70:: @ 8175F70
+    .string "Oh dear, oh dear.\n"
+    .string "Help me, please!$"
+
+gUnknown_8175F93:: @ 8175F93
+    .string "We got engaged.\n"
+    .string "Heheh!$"
+
+gUnknown_8175FAA:: @ 8175FAA
+    .string "That man next to me…\n"
+    .string "He's such a coward!$"
+
+gUnknown_8175FD3:: @ 8175FD3
+    .string "He's so helpless, he needed\n"
+    .string "someone like me to look after him.$"
+
+gUnknown_8176012:: @ 8176012
+    .string "TEAM ROCKET is trying to conquer\n"
+    .string "the world with POKéMON.$"
+
+gUnknown_817604B:: @ 817604B
+    .string "TEAM ROCKET ran away, and it's all\n"
+    .string "because of you!$"
+
+gUnknown_817607E:: @ 817607E
+    .string "They must have targeted SILPH for\n"
+    .string "our POKéMON products.$"
+
+gUnknown_81760B6:: @ 81760B6
+    .string "Come work for SILPH when you\n"
+    .string "get older.$"
+
+Text_1760DE:: @ 81760DE
+    .string "I am one of the four ROCKET\n"
+    .string "BROTHERS!$"
+
+Text_176104:: @ 8176104
+    .string "Flame out!$"
+
+gUnknown_817610F:: @ 817610F
+    .string "No matter!\n"
+    .string "My brothers will avenge me!$"
+
+Text_176136:: @ 8176136
+    .string "That rotten PRESIDENT!\p"
+    .string "Serves him right for shipping me\n"
+    .string "off to the TIKSI BRANCH!\p"
+    .string "That's why TEAM ROCKET came after\n"
+    .string "us, I'm sure of it!$"
+
+Text_1761BD:: @ 81761BD
+    .string "Shoot!$"
+
+gUnknown_81761C4:: @ 81761C4
+    .string "TIKSI BRANCH?\n"
+    .string "It's in Russian no-man's-land!$"
+
+Text_1761F1:: @ 81761F1
+    .string "You dare betray TEAM ROCKET?$"
+
+Text_17620E:: @ 817620E
+    .string "You traitor!$"
+
+gUnknown_817621B:: @ 817621B
+    .string "If you stand for justice, you\n"
+    .string "betray us bad guys!$"
+
+gUnknown_817624D:: @ 817624D
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "6F$"
+
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json
new file mode 100644
index 000000000..36f2d0ba7
--- /dev/null
+++ b/data/maps/SilphCo_7F/map.json
@@ -0,0 +1,326 @@
+{
+  "id": "MAP_SILPH_CO_7F",
+  "name": "SilphCo_7F",
+  "layout": "LAYOUT_SILPH_CO_7F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 7,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "72",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "78"
+    },
+    {
+      "graphics_id": "47",
+      "x": 0,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_7F_EventScript_161AC8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 24,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SilphCo_7F_EventScript_161C1A",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "49",
+      "x": 24,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SilphCo_7F_EventScript_161C31",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "49",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SilphCo_7F_EventScript_161C48",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "48",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_7F_EventScript_161BD9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 13,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_7F_EventScript_161B97",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "47",
+      "x": 9,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "27",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_7F_EventScript_161BB8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "55",
+      "x": 3,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SilphCo_7F_EventScript_161C03",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "92",
+      "x": 0,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_7F_EventScript_1BE8DB",
+      "flag": "405"
+    },
+    {
+      "graphics_id": "92",
+      "x": 30,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_7F_EventScript_1BE8E8",
+      "flag": "406"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 19,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_6F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_11F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 25,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_5F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 27,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_8F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 23,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x405C",
+      "var_value": 0,
+      "script": "SilphCo_7F_EventScript_1619BC"
+    },
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x405C",
+      "var_value": 0,
+      "script": "SilphCo_7F_EventScript_1619C8"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 8,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A1F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 8,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A1F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A1F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 9,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A1F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 24,
+      "y": 7,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A39"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 25,
+      "y": 7,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A39"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 25,
+      "y": 8,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A39"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 24,
+      "y": 8,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A39"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 25,
+      "y": 13,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A53"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 26,
+      "y": 13,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A53"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 25,
+      "y": 14,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A53"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 26,
+      "y": 14,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_1A8A53"
+    },
+    {
+      "type": "hidden_item",
+      "x": 22,
+      "y": 11,
+      "elevation": 0,
+      "item": "ITEM_ZINC",
+      "flag": "140",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 20,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_7F_EventScript_161BFA"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc
new file mode 100644
index 000000000..93893b711
--- /dev/null
+++ b/data/maps/SilphCo_7F/scripts.inc
@@ -0,0 +1,263 @@
+SilphCo_7F_MapScripts:: @ 8161984
+	map_script 1, SilphCo_7F_MapScript1_16198F
+	map_script 3, SilphCo_7F_MapScript2_1619AB
+	.byte 0
+
+SilphCo_7F_MapScript1_16198F:: @ 816198F
+	checkflag FLAG_0x284
+	call_if 0, EventScript_1A834B
+	checkflag FLAG_0x285
+	call_if 0, EventScript_1A8379
+	checkflag FLAG_0x286
+	call_if 0, EventScript_1A83A7
+	end
+
+SilphCo_7F_MapScript2_1619AB:: @ 81619AB
+	compare_var_to_value VAR_0x4060, 1
+	call_if 4, EventScript_1619B7
+	end
+
+EventScript_1619B7:: @ 81619B7
+	setobjectmovementtype 8, 7
+	return
+
+SilphCo_7F_EventScript_1619BC:: @ 81619BC
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_1619D4
+
+EventScript_1619C7:: @ 81619C7
+	end
+
+SilphCo_7F_EventScript_1619C8:: @ 81619C8
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_1619D4
+
+EventScript_1619D3:: @ 81619D3
+	end
+
+EventScript_1619D4:: @ 81619D4
+	textcolor 0
+	playbgm BGM_FRLG_RIVAL, 0
+	applymovement 1, Movement_1A75DB
+	waitmovement 0
+	applymovement 255, Movement_1A75ED
+	applymovement 1, Movement_1A75DD
+	waitmovement 0
+	msgbox gUnknown_8176710
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_161A73
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_161A7F
+	msgbox gUnknown_8176727
+	setvar VAR_LAST_TALKED, 1
+	compare_var_to_value VAR_STARTER_MON, 2
+	call_if 1, EventScript_161A80
+	compare_var_to_value VAR_STARTER_MON, 1
+	call_if 1, EventScript_161A8B
+	compare_var_to_value VAR_STARTER_MON, 0
+	call_if 1, EventScript_161A96
+	msgbox gUnknown_8176827
+	closemessage
+	playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_161AA1
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_161AAC
+	playse SE_FU_ZUZUZU
+	fadedefaultbgm
+	removeobject 1
+	waitse
+	setvar VAR_0x405C, 1
+	releaseall
+	end
+
+EventScript_161A73:: @ 8161A73
+	closemessage
+	applymovement 1, Movement_161AB7
+	waitmovement 0
+	return
+
+EventScript_161A7F:: @ 8161A7F
+	return
+
+EventScript_161A80:: @ 8161A80
+	trainerbattle 3, 432, 0, Text_1767D0
+	return
+
+EventScript_161A8B:: @ 8161A8B
+	trainerbattle 3, 433, 0, Text_1767D0
+	return
+
+EventScript_161A96:: @ 8161A96
+	trainerbattle 3, 434, 0, Text_1767D0
+	return
+
+EventScript_161AA1:: @ 8161AA1
+	applymovement 1, Movement_161AB9
+	waitmovement 0
+	return
+
+EventScript_161AAC:: @ 8161AAC
+	applymovement 1, Movement_161ABF
+	waitmovement 0
+	return
+
+Movement_161AB7:: @ 8161AB7
+	step_11
+	step_end
+
+Movement_161AB9:: @ 8161AB9
+	step_13
+	step_13
+	step_13
+	step_11
+	step_1c
+	step_end
+
+Movement_161ABF:: @ 8161ABF
+	step_12
+	step_11
+	step_11
+	step_13
+	step_13
+	step_13
+	step_13
+	step_1c
+	step_end
+
+SilphCo_7F_EventScript_161AC8:: @ 8161AC8
+	lock
+	faceplayer
+	checkflag FLAG_0x246
+	goto_if_eq EventScript_161B8D
+	msgbox gUnknown_8176266
+	setvar VAR_0x4001, SPECIES_LAPRAS
+	givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_161B12
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_161B45
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A927C
+	release
+	end
+
+EventScript_161B12:: @ 8161B12
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message Text_1762D7
+	waitmessage
+	waitfanfare
+	getspeciesname 0, SPECIES_LAPRAS
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_161B7E
+	call EventScript_1A8C27
+	call EventScript_1A74EB
+	goto EventScript_161B7E
+
+EventScript_161B44:: @ 8161B44
+	end
+
+EventScript_161B45:: @ 8161B45
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message Text_1762D7
+	waitmessage
+	waitfanfare
+	getspeciesname 0, SPECIES_LAPRAS
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_161B73
+	call EventScript_1A8C33
+	goto EventScript_161B73
+
+EventScript_161B72:: @ 8161B72
+	end
+
+EventScript_161B73:: @ 8161B73
+	call EventScript_1A8C3C
+	goto EventScript_161B7E
+
+EventScript_161B7D:: @ 8161B7D
+	end
+
+EventScript_161B7E:: @ 8161B7E
+	textcolor 0
+	msgbox gUnknown_8176305
+	setflag FLAG_0x246
+	release
+	end
+
+EventScript_161B8D:: @ 8161B8D
+	msgbox gUnknown_81763DD
+	release
+	end
+
+SilphCo_7F_EventScript_161B97:: @ 8161B97
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_161BAE
+	msgbox gUnknown_8176444
+	release
+	end
+
+EventScript_161BAE:: @ 8161BAE
+	msgbox gUnknown_8176486
+	release
+	end
+
+SilphCo_7F_EventScript_161BB8:: @ 8161BB8
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_161BCF
+	msgbox gUnknown_81764C2
+	release
+	end
+
+EventScript_161BCF:: @ 8161BCF
+	msgbox gUnknown_8176501
+	release
+	end
+
+SilphCo_7F_EventScript_161BD9:: @ 8161BD9
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_161BF0
+	msgbox gUnknown_8176532
+	release
+	end
+
+EventScript_161BF0:: @ 8161BF0
+	msgbox gUnknown_8176573
+	release
+	end
+
+SilphCo_7F_EventScript_161BFA:: @ 8161BFA
+	msgbox gUnknown_8176954, 3
+	end
+
+SilphCo_7F_EventScript_161C03:: @ 8161C03
+	trainerbattle 0, 342, 0, Text_1765E2, Text_17660C
+	msgbox gUnknown_8176616, 6
+	end
+
+SilphCo_7F_EventScript_161C1A:: @ 8161C1A
+	trainerbattle 0, 383, 0, Text_176643, Text_176669
+	msgbox gUnknown_8176681, 6
+	end
+
+SilphCo_7F_EventScript_161C31:: @ 8161C31
+	trainerbattle 0, 384, 0, Text_1766B3, Text_1766D7
+	msgbox gUnknown_81766E5, 6
+	end
+
+SilphCo_7F_EventScript_161C48:: @ 8161C48
+	trainerbattle 0, 385, 0, Text_176586, Text_1765A5
+	msgbox gUnknown_81765B1, 6
+	end
diff --git a/data/maps/SilphCo_7F/text.inc b/data/maps/SilphCo_7F/text.inc
new file mode 100644
index 000000000..d977d816e
--- /dev/null
+++ b/data/maps/SilphCo_7F/text.inc
@@ -0,0 +1,146 @@
+gUnknown_8176266:: @ 8176266
+    .string "Oh! Hi! You're not a ROCKET!\n"
+    .string "You came to save us?\l"
+    .string "Why, thank you!\p"
+    .string "I want you to have this POKéMON\n"
+    .string "for saving us.$"
+
+Text_1762D7:: @ 81762D7
+    .string "{PLAYER} obtained a LAPRAS from\n"
+    .string "the SILPH employee!$"
+
+gUnknown_8176305:: @ 8176305
+    .string "It's a LAPRAS.\n"
+    .string "It's a very intelligent POKéMON.\p"
+    .string "We kept it in our lab, but it will\n"
+    .string "be much better off with you.\p"
+    .string "I think you will be a good TRAINER\n"
+    .string "for LAPRAS!\p"
+    .string "It's a good swimmer.\n"
+    .string "It'll give you a lift across water!$"
+
+gUnknown_81763DD:: @ 81763DD
+    .string "TEAM ROCKET's BOSS went to the\n"
+    .string "boardroom!\p"
+    .string "Is our PRESIDENT okay?\n"
+    .string "I'm worried.$"
+
+Text_17642B:: @ 817642B
+    .string "あ‥　もう　もてないぞ$"
+
+Text_176437:: @ 8176437
+    .string "たすかったよ　ありがと！$"
+
+gUnknown_8176444:: @ 8176444
+    .string "TEAM ROCKET was after the MASTER\n"
+    .string "BALL, which catches any POKéMON.$"
+
+gUnknown_8176486:: @ 8176486
+    .string "We canceled the MASTER BALL\n"
+    .string "project because of TEAM ROCKET.$"
+
+gUnknown_81764C2:: @ 81764C2
+    .string "It would be bad if TEAM ROCKET\n"
+    .string "took over SILPH or our POKéMON.$"
+
+gUnknown_8176501:: @ 8176501
+    .string "Wow!\p"
+    .string "You chased off TEAM ROCKET all by\n"
+    .string "yourself?$"
+
+gUnknown_8176532:: @ 8176532
+    .string "You!\n"
+    .string "It's really dangerous here!\p"
+    .string "You came to save me?\n"
+    .string "You can't!$"
+
+gUnknown_8176573:: @ 8176573
+    .string "Thank you so much!$"
+
+Text_176586:: @ 8176586
+    .string "Uh-oh!\n"
+    .string "I smell a little mouse!$"
+
+Text_1765A5:: @ 81765A5
+    .string "Lights out!$"
+
+gUnknown_81765B1:: @ 81765B1
+    .string "You won't find my BOSS by just\n"
+    .string "scurrying around!$"
+
+Text_1765E2:: @ 81765E2
+    .string "Heheh!\p"
+    .string "You mistook me for a SILPH worker?$"
+
+Text_17660C:: @ 817660C
+    .string "I'm done!$"
+
+gUnknown_8176616:: @ 8176616
+    .string "Despite your age, you are a\n"
+    .string "skilled TRAINER!$"
+
+Text_176643:: @ 8176643
+    .string "I am one of the four ROCKET\n"
+    .string "BROTHERS!$"
+
+Text_176669:: @ 8176669
+    .string "Aack!\n"
+    .string "Brothers, I lost!$"
+
+gUnknown_8176681:: @ 8176681
+    .string "Doesn't matter.\n"
+    .string "My brothers will repay the favor!$"
+
+Text_1766B3:: @ 81766B3
+    .string "A child intruder?\n"
+    .string "That must be you!$"
+
+Text_1766D7:: @ 81766D7
+    .string "Fine!\n"
+    .string "I lost!$"
+
+gUnknown_81766E5:: @ 81766E5
+    .string "Go on home before my BOSS gets\n"
+    .string "ticked off!$"
+
+gUnknown_8176710:: @ 8176710
+    .string "{RIVAL}: What kept you, {PLAYER}?$"
+
+gUnknown_8176727:: @ 8176727
+    .string "{RIVAL}: Hahaha! I thought you'd\n"
+    .string "turn up if I waited here!\p"
+    .string "I guess TEAM ROCKET slowed you\n"
+    .string "down! Not that I care!\p"
+    .string "I saw you in SAFFRON, so I decided\n"
+    .string "to see if you got better!$"
+
+Text_1767D0:: @ 81767D0
+    .string "Oh, man!\n"
+    .string "So, you are ready for BOSS\l"
+    .string "ROCKET!$"
+
+Text_1767FC:: @ 81767FC
+    .string "{RIVAL}“おまえなあ‥\p"
+    .string "こんな　うでまえじゃ\n"
+    .string "まだまだ‥\l"
+    .string "いちにんまえ　とは　いえないぜ$"
+
+gUnknown_8176827:: @ 8176827
+    .string "Well, {PLAYER}!\n"
+    .string "I'm moving on up and ahead!\p"
+    .string "By checking my POKéDEX, I'm\n"
+    .string "starting to see what's strong and\l"
+    .string "how they evolve!\p"
+    .string "Am I a genius or what?\p"
+    .string "I'm going to the POKéMON LEAGUE to\n"
+    .string "boot out the ELITE FOUR.\p"
+    .string "I'll become the world's most\n"
+    .string "powerful TRAINER!\p"
+    .string "{PLAYER}, well, good luck to you!\n"
+    .string "Don't sweat it!\l"
+    .string "Smell ya!$"
+
+gUnknown_8176954:: @ 8176954
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "7F$"
+
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
new file mode 100644
index 000000000..9c23aac86
--- /dev/null
+++ b/data/maps/SilphCo_8F/map.json
@@ -0,0 +1,193 @@
+{
+  "id": "MAP_SILPH_CO_8F",
+  "name": "SilphCo_8F",
+  "layout": "LAYOUT_SILPH_CO_8F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 8,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 28,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SilphCo_8F_EventScript_161CB0",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "49",
+      "x": 10,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "SilphCo_8F_EventScript_161CC7",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "55",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SilphCo_8F_EventScript_161C99",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "47",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_8F_EventScript_161C6F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 24,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_8F_EventScript_1BEB4B",
+      "flag": "456"
+    },
+    {
+      "graphics_id": "55",
+      "x": 29,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_8F_EventScript_1AD0ED",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_9F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_8F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_2F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 28,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_7F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 2,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_8F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 22,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "script": "SilphCo_8F_EventScript_1A8A6D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_8F_EventScript_1A8A6D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_8F_EventScript_1A8A6D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "script": "SilphCo_8F_EventScript_1A8A6D"
+    },
+    {
+      "type": "hidden_item",
+      "x": 29,
+      "y": 10,
+      "elevation": 0,
+      "item": "ITEM_NUGGET",
+      "flag": "141",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 27,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_8F_EventScript_161C90"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc
new file mode 100644
index 000000000..99112ee5e
--- /dev/null
+++ b/data/maps/SilphCo_8F/scripts.inc
@@ -0,0 +1,41 @@
+SilphCo_8F_MapScripts:: @ 8161C5F
+	map_script 1, SilphCo_8F_MapScript1_161C65
+	.byte 0
+
+SilphCo_8F_MapScript1_161C65:: @ 8161C65
+	checkflag FLAG_0x287
+	call_if 0, EventScript_1A83D5
+	end
+
+SilphCo_8F_EventScript_161C6F:: @ 8161C6F
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_161C86
+	msgbox gUnknown_817696D
+	release
+	end
+
+EventScript_161C86:: @ 8161C86
+	msgbox gUnknown_817698C
+	release
+	end
+
+SilphCo_8F_EventScript_161C90:: @ 8161C90
+	msgbox gUnknown_8176AB2, 3
+	end
+
+SilphCo_8F_EventScript_161C99:: @ 8161C99
+	trainerbattle 0, 343, 0, Text_1769FD, Text_176A19
+	msgbox gUnknown_8176A26, 6
+	end
+
+SilphCo_8F_EventScript_161CB0:: @ 8161CB0
+	trainerbattle 0, 382, 0, Text_1769A2, Text_1769BE
+	msgbox gUnknown_81769CF, 6
+	end
+
+SilphCo_8F_EventScript_161CC7:: @ 8161CC7
+	trainerbattle 0, 386, 0, Text_176A56, Text_176A7C
+	msgbox gUnknown_8176A90, 6
+	end
diff --git a/data/maps/SilphCo_8F/text.inc b/data/maps/SilphCo_8F/text.inc
new file mode 100644
index 000000000..858d5da17
--- /dev/null
+++ b/data/maps/SilphCo_8F/text.inc
@@ -0,0 +1,42 @@
+gUnknown_817696D:: @ 817696D
+    .string "I wonder if SILPH is finished…$"
+
+gUnknown_817698C:: @ 817698C
+    .string "Thanks for saving us!$"
+
+Text_1769A2:: @ 81769A2
+    .string "That's as far as you'll go!$"
+
+Text_1769BE:: @ 81769BE
+    .string "Not enough grit!$"
+
+gUnknown_81769CF:: @ 81769CF
+    .string "If you don't turn back…\n"
+    .string "I'll call for backup!$"
+
+Text_1769FD:: @ 81769FD
+    .string "You're causing us problems!$"
+
+Text_176A19:: @ 8176A19
+    .string "Huh?\n"
+    .string "I lost?$"
+
+gUnknown_8176A26:: @ 8176A26
+    .string "So, what do you think of SILPH\n"
+    .string "BUILDING's maze?$"
+
+Text_176A56:: @ 8176A56
+    .string "I am one of the four ROCKET\n"
+    .string "BROTHERS!$"
+
+Text_176A7C:: @ 8176A7C
+    .string "Whoo!\n"
+    .string "Oh, Brothers!$"
+
+gUnknown_8176A90:: @ 8176A90
+    .string "I'll leave you up to my brothers.$"
+
+gUnknown_8176AB2:: @ 8176AB2
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "8F$"
+
diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json
new file mode 100644
index 000000000..05bbe1138
--- /dev/null
+++ b/data/maps/SilphCo_9F/map.json
@@ -0,0 +1,246 @@
+{
+  "id": "MAP_SILPH_CO_9F",
+  "name": "SilphCo_9F",
+  "layout": "LAYOUT_SILPH_CO_9F",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 7,
+  "elevator_flag": 9,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 26,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SilphCo_9F_EventScript_161D41",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "49",
+      "x": 15,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SilphCo_9F_EventScript_161D6F",
+      "flag": "83"
+    },
+    {
+      "graphics_id": "28",
+      "x": 2,
+      "y": 16,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SilphCo_9F_EventScript_161D09",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "49",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "SilphCo_9F_EventScript_161D58",
+      "flag": "83"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_8F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 22,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_5F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_3F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 18,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SILPH_CO_10F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 24,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_SILPH_CO_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 14,
+      "elevation": 3,
+      "item": "ITEM_MAX_POTION",
+      "flag": "25",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 10,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8A87"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8A87"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 16,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8AA1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 13,
+      "y": 17,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8AA1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 6,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8ABB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 22,
+      "y": 6,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8ABB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 22,
+      "y": 7,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8ABB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 7,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8ABB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 13,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8AD5"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 12,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8AD5"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 22,
+      "y": 12,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8AD5"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 22,
+      "y": 13,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8AD5"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 11,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8A87"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 10,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8A87"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 16,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8AA1"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 17,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_1A8AA1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "item": "ITEM_CALCIUM",
+      "flag": "142",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 17,
+      "y": 1,
+      "elevation": 0,
+      "script": "SilphCo_9F_EventScript_161D38"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc
new file mode 100644
index 000000000..530ae7c1a
--- /dev/null
+++ b/data/maps/SilphCo_9F/scripts.inc
@@ -0,0 +1,50 @@
+SilphCo_9F_MapScripts:: @ 8161CDE
+	map_script 1, SilphCo_9F_MapScript1_161CE4
+	.byte 0
+
+SilphCo_9F_MapScript1_161CE4:: @ 8161CE4
+	checkflag FLAG_0x288
+	call_if 0, EventScript_1A840C
+	checkflag FLAG_0x289
+	call_if 0, EventScript_1A8443
+	checkflag FLAG_0x28A
+	call_if 0, EventScript_1A847A
+	checkflag FLAG_0x28B
+	call_if 0, EventScript_1A84A8
+	end
+
+SilphCo_9F_EventScript_161D09:: @ 8161D09
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4060, 1
+	goto_if 4, EventScript_161D2E
+	msgbox gUnknown_8176B54
+	closemessage
+	call EventScript_1A6C26
+	msgbox gUnknown_8176B81
+	release
+	end
+
+EventScript_161D2E:: @ 8161D2E
+	msgbox gUnknown_8176B90
+	release
+	end
+
+SilphCo_9F_EventScript_161D38:: @ 8161D38
+	msgbox gUnknown_8176CD4, 3
+	end
+
+SilphCo_9F_EventScript_161D41:: @ 8161D41
+	trainerbattle 0, 344, 0, Text_176BFB, Text_176C2B
+	msgbox gUnknown_8176C3C, 6
+	end
+
+SilphCo_9F_EventScript_161D58:: @ 8161D58
+	trainerbattle 0, 387, 0, Text_176BA3, Text_176BC8
+	msgbox gUnknown_8176BD0, 6
+	end
+
+SilphCo_9F_EventScript_161D6F:: @ 8161D6F
+	trainerbattle 0, 388, 0, Text_176C7A, Text_176CA0
+	msgbox gUnknown_8176CB8, 6
+	end
diff --git a/data/maps/SilphCo_9F/text.inc b/data/maps/SilphCo_9F/text.inc
new file mode 100644
index 000000000..bf400f768
--- /dev/null
+++ b/data/maps/SilphCo_9F/text.inc
@@ -0,0 +1,55 @@
+Text_176ACB:: @ 8176ACB
+    .string "TEAM ROCKET's BOSS is terribly\n"
+    .string "cruel!\p"
+    .string "To him, POKéMON are just tools to\n"
+    .string "be used.\p"
+    .string "What will happen if that tyrant\n"
+    .string "takes over our company…$"
+
+gUnknown_8176B54:: @ 8176B54
+    .string "You look tired.\n"
+    .string "You should take a quick nap.$"
+
+gUnknown_8176B81:: @ 8176B81
+    .string "Don't give up!$"
+
+gUnknown_8176B90:: @ 8176B90
+    .string "Thank you so much.$"
+
+Text_176BA3:: @ 8176BA3
+    .string "Your POKéMON seem to adore you,\n"
+    .string "kid!$"
+
+Text_176BC8:: @ 8176BC8
+    .string "Ghaaah!$"
+
+gUnknown_8176BD0:: @ 8176BD0
+    .string "If I had started as a TRAINER at\n"
+    .string "your age…$"
+
+Text_176BFB:: @ 8176BFB
+    .string "Your POKéMON have weak points!\n"
+    .string "I can nail them!$"
+
+Text_176C2B:: @ 8176C2B
+    .string "You hammered me!$"
+
+gUnknown_8176C3C:: @ 8176C3C
+    .string "Exploiting weak spots does work.\n"
+    .string "Think about type advantages.$"
+
+Text_176C7A:: @ 8176C7A
+    .string "I am one of the four ROCKET\n"
+    .string "BROTHERS!$"
+
+Text_176CA0:: @ 8176CA0
+    .string "Warg!\n"
+    .string "Brothers, I lost!$"
+
+gUnknown_8176CB8:: @ 8176CB8
+    .string "My brothers will avenge me!$"
+
+gUnknown_8176CD4:: @ 8176CD4
+    .string "SILPH CO. HEAD OFFICE\n"
+    .string "9F$"
+
diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json
new file mode 100644
index 000000000..be61c86d2
--- /dev/null
+++ b/data/maps/SilphCo_Elevator/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_SILPH_CO_ELEVATOR",
+  "name": "SilphCo_Elevator",
+  "layout": "LAYOUT_SILPH_CO_ELEVATOR",
+  "music": "BGM_FRLG_SILPH",
+  "region_map_section": "MAPSEC_SILPH_CO",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "script": "SilphCo_Elevator_EventScript_161F6F"
+    }
+  ]
+}
diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc
new file mode 100644
index 000000000..d36334429
--- /dev/null
+++ b/data/maps/SilphCo_Elevator/scripts.inc
@@ -0,0 +1,177 @@
+SilphCo_Elevator_MapScripts:: @ 8161F6E
+	.byte 0
+
+SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
+	lockall
+	setvar VAR_0x8004, 1
+	checkflag FLAG_0x002
+	call_if 0, EventScript_1A7AB9
+	copyvar VAR_0x8005, VAR_0x403A
+	special sub_80CB580
+	message Text_1A535C
+	waitmessage
+	setvar VAR_0x8004, 1
+	specialvar VAR_RESULT, sub_80CB328
+	special sub_80CB7C4
+	waitstate
+	switch VAR_RESULT
+	case 0, EventScript_1621BF
+	case 1, EventScript_162197
+	case 2, EventScript_16216F
+	case 3, EventScript_162147
+	case 4, EventScript_16211F
+	case 5, EventScript_1620F7
+	case 6, EventScript_1620CF
+	case 7, EventScript_1620A7
+	case 8, EventScript_16207F
+	case 9, EventScript_162057
+	case 10, EventScript_16202F
+	case 11, EventScript_1621E7
+	case 127, EventScript_1621E7
+	end
+
+EventScript_16202F:: @ 816202F
+	setvar VAR_0x8006, 4
+	setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3
+	compare_var_to_value VAR_0x403A, 4
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 4
+	goto EventScript_1621E7
+
+EventScript_162056:: @ 8162056
+	end
+
+EventScript_162057:: @ 8162057
+	setvar VAR_0x8006, 5
+	setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3
+	compare_var_to_value VAR_0x403A, 5
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 5
+	goto EventScript_1621E7
+
+EventScript_16207E:: @ 816207E
+	end
+
+EventScript_16207F:: @ 816207F
+	setvar VAR_0x8006, 6
+	setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3
+	compare_var_to_value VAR_0x403A, 6
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 6
+	goto EventScript_1621E7
+
+EventScript_1620A6:: @ 81620A6
+	end
+
+EventScript_1620A7:: @ 81620A7
+	setvar VAR_0x8006, 7
+	setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3
+	compare_var_to_value VAR_0x403A, 7
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 7
+	goto EventScript_1621E7
+
+EventScript_1620CE:: @ 81620CE
+	end
+
+EventScript_1620CF:: @ 81620CF
+	setvar VAR_0x8006, 8
+	setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3
+	compare_var_to_value VAR_0x403A, 8
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 8
+	goto EventScript_1621E7
+
+EventScript_1620F6:: @ 81620F6
+	end
+
+EventScript_1620F7:: @ 81620F7
+	setvar VAR_0x8006, 9
+	setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3
+	compare_var_to_value VAR_0x403A, 9
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 9
+	goto EventScript_1621E7
+
+EventScript_16211E:: @ 816211E
+	end
+
+EventScript_16211F:: @ 816211F
+	setvar VAR_0x8006, 10
+	setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3
+	compare_var_to_value VAR_0x403A, 10
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 10
+	goto EventScript_1621E7
+
+EventScript_162146:: @ 8162146
+	end
+
+EventScript_162147:: @ 8162147
+	setvar VAR_0x8006, 11
+	setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3
+	compare_var_to_value VAR_0x403A, 11
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 11
+	goto EventScript_1621E7
+
+EventScript_16216E:: @ 816216E
+	end
+
+EventScript_16216F:: @ 816216F
+	setvar VAR_0x8006, 12
+	setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3
+	compare_var_to_value VAR_0x403A, 12
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 12
+	goto EventScript_1621E7
+
+EventScript_162196:: @ 8162196
+	end
+
+EventScript_162197:: @ 8162197
+	setvar VAR_0x8006, 13
+	setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3
+	compare_var_to_value VAR_0x403A, 13
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 13
+	goto EventScript_1621E7
+
+EventScript_1621BE:: @ 81621BE
+	end
+
+EventScript_1621BF:: @ 81621BF
+	setvar VAR_0x8006, 14
+	setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3
+	compare_var_to_value VAR_0x403A, 14
+	goto_if_eq EventScript_1621E7
+	call EventScript_1621EC
+	setvar VAR_0x403A, 14
+	goto EventScript_1621E7
+
+EventScript_1621E6:: @ 81621E6
+	end
+
+EventScript_1621E7:: @ 81621E7
+	special sub_80CB63C
+	releaseall
+	end
+
+EventScript_1621EC:: @ 81621EC
+	special sub_80CB63C
+	closemessage
+	waitse
+	special sub_80CB498
+	waitstate
+	setflag FLAG_0x002
+	return
diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json
new file mode 100644
index 000000000..f65e61afd
--- /dev/null
+++ b/data/maps/SixIsland/map.json
@@ -0,0 +1,98 @@
+{
+  "id": "MAP_SIX_ISLAND",
+  "name": "SixIsland",
+  "layout": "LAYOUT_SIX_ISLAND",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SIX_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SIX_ISLAND_WATER_PATH",
+      "offset": -40,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "19",
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_EventScript_167EEB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_EventScript_167EE2",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_SIX_ISLAND_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 20,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_SIX_ISLAND_MART",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 17,
+      "elevation": 0,
+      "script": "SixIsland_EventScript_167EF4"
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "item": "ITEM_LEPPA_BERRY",
+      "flag": "184",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc
new file mode 100644
index 000000000..3a36d37b1
--- /dev/null
+++ b/data/maps/SixIsland/scripts.inc
@@ -0,0 +1,19 @@
+SixIsland_MapScripts:: @ 8167ED8
+	map_script 3, SixIsland_MapScript1_167EDE
+	.byte 0
+
+SixIsland_MapScript1_167EDE:: @ 8167EDE
+	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND
+	end
+
+SixIsland_EventScript_167EE2:: @ 8167EE2
+	msgbox gUnknown_81831EF, 2
+	end
+
+SixIsland_EventScript_167EEB:: @ 8167EEB
+	msgbox gUnknown_8183255, 2
+	end
+
+SixIsland_EventScript_167EF4:: @ 8167EF4
+	msgbox gUnknown_81831C6, 3
+	end
diff --git a/data/maps/SixIsland/text.inc b/data/maps/SixIsland/text.inc
new file mode 100644
index 000000000..bade2abd1
--- /dev/null
+++ b/data/maps/SixIsland/text.inc
@@ -0,0 +1,14 @@
+gUnknown_81831C6:: @ 81831C6
+    .string "SIX ISLAND\n"
+    .string "Fortune Island of Aged Wisdom$"
+
+gUnknown_81831EF:: @ 81831EF
+    .string "Keep going this way and you'll get\n"
+    .string "to the WATER PATH.\p"
+    .string "Stay on that and you'll get to\n"
+    .string "the RUIN VALLEY.$"
+
+gUnknown_8183255:: @ 8183255
+    .string "When you're this far away from the\n"
+    .string "city, the sky at night is fantastic.$"
+
diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json
new file mode 100644
index 000000000..c5376d59d
--- /dev/null
+++ b/data/maps/SixIsland_AlteringCave/map.json
@@ -0,0 +1,27 @@
+{
+  "id": "MAP_SIX_ISLAND_ALTERING_CAVE",
+  "name": "SixIsland_AlteringCave",
+  "layout": "LAYOUT_SIX_ISLAND_ALTERING_CAVE",
+  "music": "BGM_FRLG_MT_EMBER",
+  "region_map_section": "MAPSEC_ALTERING_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_OUTCAST_ISLAND",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc
new file mode 100644
index 000000000..6733f94b3
--- /dev/null
+++ b/data/maps/SixIsland_AlteringCave/scripts.inc
@@ -0,0 +1,7 @@
+SixIsland_AlteringCave_MapScripts:: @ 81646A4
+	map_script 3, SixIsland_AlteringCave_MapScript1_1646AA
+	.byte 0
+
+SixIsland_AlteringCave_MapScript1_1646AA:: @ 81646AA
+	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE
+	end
diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json
new file mode 100644
index 000000000..bd7bb4933
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_1F/map.json
@@ -0,0 +1,48 @@
+{
+  "id": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+  "name": "SixIsland_DottedHole_1F",
+  "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_DOTTED_HOLE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_RUIN_VALLEY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc
new file mode 100644
index 000000000..2d9e52209
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc
@@ -0,0 +1,35 @@
+SixIsland_DottedHole_1F_MapScripts:: @ 8164182
+	map_script 3, SixIsland_DottedHole_1F_MapScript1_164188
+	.byte 0
+
+SixIsland_DottedHole_1F_MapScript1_164188:: @ 8164188
+	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F
+	end
+
+SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C
+	lockall
+	braillemessage gUnknown_81A9288
+	waitbuttonpress
+	releaseall
+	end
+
+SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195
+	lockall
+	braillemessage gUnknown_81A928B
+	waitbuttonpress
+	releaseall
+	end
+
+SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E
+	lockall
+	braillemessage gUnknown_81A9290
+	waitbuttonpress
+	releaseall
+	end
+
+SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7
+	lockall
+	braillemessage gUnknown_81A9296
+	waitbuttonpress
+	releaseall
+	end
diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json
new file mode 100644
index 000000000..497bde584
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_B1F/map.json
@@ -0,0 +1,63 @@
+{
+  "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F",
+  "name": "SixIsland_DottedHole_B1F",
+  "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_DOTTED_HOLE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "script": "SixIsland_DottedHole_B1F_EventScript_16418C"
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_DottedHole_B1F/scripts.inc b/data/maps/SixIsland_DottedHole_B1F/scripts.inc
new file mode 100644
index 000000000..ee0b34abc
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_B1F/scripts.inc
@@ -0,0 +1,2 @@
+SixIsland_DottedHole_B1F_MapScripts:: @ 81641B0
+	.byte 0
diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json
new file mode 100644
index 000000000..c01e689f5
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_B2F/map.json
@@ -0,0 +1,63 @@
+{
+  "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F",
+  "name": "SixIsland_DottedHole_B2F",
+  "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_DOTTED_HOLE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "script": "SixIsland_DottedHole_B2F_EventScript_1641A7"
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_DottedHole_B2F/scripts.inc b/data/maps/SixIsland_DottedHole_B2F/scripts.inc
new file mode 100644
index 000000000..8517edd5a
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_B2F/scripts.inc
@@ -0,0 +1,2 @@
+SixIsland_DottedHole_B2F_MapScripts:: @ 81641B1
+	.byte 0
diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json
new file mode 100644
index 000000000..97bf261ca
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_B3F/map.json
@@ -0,0 +1,63 @@
+{
+  "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F",
+  "name": "SixIsland_DottedHole_B3F",
+  "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_DOTTED_HOLE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "script": "SixIsland_DottedHole_B3F_EventScript_16419E"
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_DottedHole_B3F/scripts.inc b/data/maps/SixIsland_DottedHole_B3F/scripts.inc
new file mode 100644
index 000000000..2810ad0b3
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_B3F/scripts.inc
@@ -0,0 +1,2 @@
+SixIsland_DottedHole_B3F_MapScripts:: @ 81641B2
+	.byte 0
diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json
new file mode 100644
index 000000000..f418ee608
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_B4F/map.json
@@ -0,0 +1,63 @@
+{
+  "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F",
+  "name": "SixIsland_DottedHole_B4F",
+  "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_DOTTED_HOLE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "script": "SixIsland_DottedHole_B4F_EventScript_164195"
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_DottedHole_B4F/scripts.inc b/data/maps/SixIsland_DottedHole_B4F/scripts.inc
new file mode 100644
index 000000000..acde6c019
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_B4F/scripts.inc
@@ -0,0 +1,2 @@
+SixIsland_DottedHole_B4F_MapScripts:: @ 81641B3
+	.byte 0
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
new file mode 100644
index 000000000..db1a1715a
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM",
+  "name": "SixIsland_DottedHole_SapphireRoom",
+  "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM",
+  "music": "BGM_FRLG_TANOBY_RUINS",
+  "region_map_section": "MAPSEC_DOTTED_HOLE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "100",
+      "x": 7,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5",
+      "flag": "143"
+    },
+    {
+      "graphics_id": "55",
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "144"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_1",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F"
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
new file mode 100644
index 000000000..ce372cae9
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
@@ -0,0 +1,304 @@
+SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4
+	.byte 0
+
+SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
+	lock
+	faceplayer
+	textcolor 3
+	playfanfare BGM_FRLG_ME_KEYITEM
+	message Text_17BD82
+	waitmessage
+	waitfanfare
+	closemessage
+	setobjectxyperm 2, 5, 0
+	addobject 2
+	playse SE_FU_ZAKU
+	applymovement 2, Movement_16440F
+	waitmovement 0
+	playse SE_W115
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_16430F
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_16430F
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_16431A
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_16431A
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 12
+	setvar VAR_0x8007, 3
+	special sub_80CAC28
+	delay 60
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_164325
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_164330
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_16433B
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_164346
+	textcolor 0
+	msgbox gUnknown_817BD97
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_164351
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_164366
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_16437B
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_164390
+	removeobject 1
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_1642F9
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_1642F9
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_164304
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_164304
+	msgbox gUnknown_817BDD4
+	closemessage
+	compare_var_to_value VAR_FACING, 2
+	call_if 1, EventScript_1643A5
+	compare_var_to_value VAR_FACING, 1
+	call_if 1, EventScript_1643B7
+	compare_var_to_value VAR_FACING, 4
+	call_if 1, EventScript_1643C9
+	compare_var_to_value VAR_FACING, 3
+	call_if 1, EventScript_1643DB
+	playse SE_KAIDAN
+	delay 35
+	removeobject 2
+	setflag FLAG_0x2D8
+	release
+	end
+
+EventScript_1642F9:: @ 81642F9
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_164304:: @ 8164304
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_16430F:: @ 816430F
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_16431A:: @ 816431A
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_164325:: @ 8164325
+	applymovement 2, Movement_1643ED
+	waitmovement 0
+	return
+
+EventScript_164330:: @ 8164330
+	applymovement 2, Movement_1643ED
+	waitmovement 0
+	return
+
+EventScript_16433B:: @ 816433B
+	applymovement 2, Movement_1643F1
+	waitmovement 0
+	return
+
+EventScript_164346:: @ 8164346
+	applymovement 2, Movement_1643F1
+	waitmovement 0
+	return
+
+EventScript_164351:: @ 8164351
+	applymovement 2, Movement_1643F5
+	waitmovement 0
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_164366:: @ 8164366
+	applymovement 2, Movement_1643F5
+	waitmovement 0
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_16437B:: @ 816437B
+	applymovement 2, Movement_1643F7
+	waitmovement 0
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	return
+
+EventScript_164390:: @ 8164390
+	applymovement 2, Movement_1643F7
+	waitmovement 0
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_1643A5:: @ 81643A5
+	applymovement 255, Movement_16441C
+	applymovement 2, Movement_1643F9
+	waitmovement 0
+	return
+
+EventScript_1643B7:: @ 81643B7
+	applymovement 255, Movement_16441C
+	applymovement 2, Movement_164401
+	waitmovement 0
+	return
+
+EventScript_1643C9:: @ 81643C9
+	applymovement 255, Movement_16441C
+	applymovement 2, Movement_164409
+	waitmovement 0
+	return
+
+EventScript_1643DB:: @ 81643DB
+	applymovement 255, Movement_16441C
+	applymovement 2, Movement_164409
+	waitmovement 0
+	return
+
+Movement_1643ED:: @ 81643ED
+	step_11
+	step_11
+	step_30
+	step_end
+
+Movement_1643F1:: @ 81643F1
+	step_13
+	step_13
+	step_2e
+	step_end
+
+Movement_1643F5:: @ 81643F5
+	step_13
+	step_end
+
+Movement_1643F7:: @ 81643F7
+	step_11
+	step_end
+
+Movement_1643F9:: @ 81643F9
+	step_1e
+	step_20
+	step_20
+	step_20
+	step_1d
+	step_20
+	step_20
+	step_end
+
+Movement_164401:: @ 8164401
+	step_1d
+	step_20
+	step_20
+	step_20
+	step_1e
+	step_20
+	step_20
+	step_end
+
+Movement_164409:: @ 8164409
+	step_20
+	step_20
+	step_20
+	step_20
+	step_1e
+	step_end
+
+Movement_16440F:: @ 816440F
+	step_00
+	step_5e
+	step_39
+	step_39
+	step_39
+	step_39
+	step_39
+	step_39
+	step_39
+	step_39
+	step_39
+	step_5f
+	step_end
+
+Movement_16441C:: @ 816441C
+	step_1c
+	step_30
+	step_end
+
+SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
+	lockall
+	setvar VAR_0x8005, 130
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A9321
+	getbraillestringwidth gUnknown_81A9321
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A932D
+	getbraillestringwidth gUnknown_81A932D
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A9338
+	getbraillestringwidth gUnknown_81A9338
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A933F
+	getbraillestringwidth gUnknown_81A933F
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A934A
+	getbraillestringwidth gUnknown_81A934A
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A9356
+	getbraillestringwidth gUnknown_81A9356
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A9362
+	getbraillestringwidth gUnknown_81A9362
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A9368
+	getbraillestringwidth gUnknown_81A9368
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A9374
+	getbraillestringwidth gUnknown_81A9374
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A937C
+	getbraillestringwidth gUnknown_81A937C
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A9387
+	getbraillestringwidth gUnknown_81A9387
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A9393
+	getbraillestringwidth gUnknown_81A9393
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A939F
+	getbraillestringwidth gUnknown_81A939F
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A93AB
+	getbraillestringwidth gUnknown_81A93AB
+	call EventScript_1A926C
+	setvar VAR_0x8006, 0
+	braillemessage gUnknown_81A93B4
+	getbraillestringwidth gUnknown_81A93B4
+	call EventScript_1A926C
+	braillemessage gUnknown_81A93C0
+	waitbuttonpress
+	releaseall
+	end
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc
new file mode 100644
index 000000000..713e8cadf
--- /dev/null
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc
@@ -0,0 +1,24 @@
+Text_17BD82:: @ 817BD82
+    .string "{PLAYER} found a SAPPHIRE!$"
+
+gUnknown_817BD97:: @ 817BD97
+    .string "Fufu… Fufufufu…\n"
+    .string "I guessed right.\p"
+    .string "I was right in tailing you!$"
+
+gUnknown_817BDD4:: @ 817BDD4
+    .string "I knew that there was a SAPPHIRE\n"
+    .string "here, so it belongs to me!\p"
+    .string "I'll sell it to TEAM ROCKET for\n"
+    .string "serious money.\p"
+    .string "…D-don't glare at me like that!\p"
+    .string "If you want it back, why don't you\n"
+    .string "go get it after I sell it?\p"
+    .string "I'll even tell you one of the\n"
+    .string "passwords to TEAM ROCKET's\l"
+    .string "WAREHOUSE.\p"
+    .string "The WAREHOUSE password I know is\n"
+    .string "“Yes, nah, CHANSEY.”\p"
+    .string "I'm done.\n"
+    .string "Don't think badly of me!$"
+
diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json
new file mode 100644
index 000000000..abcf7f0af
--- /dev/null
+++ b/data/maps/SixIsland_GreenPath/map.json
@@ -0,0 +1,97 @@
+{
+  "id": "MAP_SIX_ISLAND_GREEN_PATH",
+  "name": "SixIsland_GreenPath",
+  "layout": "LAYOUT_SIX_ISLAND_GREEN_PATH",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_GREEN_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SIX_ISLAND_OUTCAST_ISLAND",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_SIX_ISLAND_WATER_PATH",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "23",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "20",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SixIsland_GreenPath_EventScript_1AC517",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 63,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 64,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 45,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 46,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 40,
+      "y": 10,
+      "elevation": 0,
+      "script": "SixIsland_GreenPath_EventScript_168B37"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 69,
+      "y": 10,
+      "elevation": 0,
+      "script": "SixIsland_GreenPath_EventScript_168B2E"
+    },
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "180",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc
new file mode 100644
index 000000000..c2822ccca
--- /dev/null
+++ b/data/maps/SixIsland_GreenPath/scripts.inc
@@ -0,0 +1,10 @@
+SixIsland_GreenPath_MapScripts:: @ 8168B2D
+	.byte 0
+
+SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E
+	msgbox gUnknown_818B84D, 3
+	end
+
+SixIsland_GreenPath_EventScript_168B37:: @ 8168B37
+	msgbox gUnknown_818B86B, 3
+	end
diff --git a/data/maps/SixIsland_GreenPath/text.inc b/data/maps/SixIsland_GreenPath/text.inc
new file mode 100644
index 000000000..97d8bc2c8
--- /dev/null
+++ b/data/maps/SixIsland_GreenPath/text.inc
@@ -0,0 +1,94 @@
+Text_18B400:: @ 818B400
+    .string "I'm having no luck at all.\n"
+    .string "A battle'd be a change of pace!$"
+
+Text_18B43B:: @ 818B43B
+    .string "Nope, no luck at all…$"
+
+Text_18B451:: @ 818B451
+    .string "I can't very well go home without\n"
+    .string "catching something, though.$"
+
+Text_18B48F:: @ 818B48F
+    .string "Gasp… Gasp…\p"
+    .string "I swam here from SIX ISLE PORT\n"
+    .string "in one go.$"
+
+Text_18B4C5:: @ 818B4C5
+    .string "Gasp…\n"
+    .string "Gasp…$"
+
+Text_18B4D1:: @ 818B4D1
+    .string "I'm only at the halfway point…\n"
+    .string "I'm beat…$"
+
+Text_18B4FA:: @ 818B4FA
+    .string "It's not so easy sending POKéMON\n"
+    .string "out while swimming, you know?$"
+
+Text_18B539:: @ 818B539
+    .string "I didn't lose to you at swimming.\n"
+    .string "This doesn't bother me.$"
+
+Text_18B573:: @ 818B573
+    .string "Are you headed for the island up\n"
+    .string "past here?\p"
+    .string "I didn't see anything interesting\n"
+    .string "there.$"
+
+Text_18B5C8:: @ 818B5C8
+    .string "AVA: Let's have a two-on-two\n"
+    .string "marine battle!$"
+
+Text_18B5F4:: @ 818B5F4
+    .string "AVA: Oh, you're amazing!\n"
+    .string "Even better, you're on your own!$"
+
+Text_18B62E:: @ 818B62E
+    .string "AVA: You know, I do prefer the\n"
+    .string "sea over any pool.$"
+
+Text_18B660:: @ 818B660
+    .string "AVA: You're challenging us to\n"
+    .string "a battle?\p"
+    .string "You'll need at least two POKéMON\n"
+    .string "if you want to do that.$"
+
+Text_18B6C1:: @ 818B6C1
+    .string "GEB: Big Sister, help!\n"
+    .string "Please battle with me!$"
+
+Text_18B6EF:: @ 818B6EF
+    .string "GEB: Wow, Big Sister, this person's\n"
+    .string "really good!$"
+
+Text_18B720:: @ 818B720
+    .string "GEB: I'm hanging onto my sister\n"
+    .string "because I can't touch the bottom.$"
+
+Text_18B762:: @ 818B762
+    .string "GEB: Please battle against me and\n"
+    .string "my sister!\p"
+    .string "…Oh, you don't have two POKéMON?$"
+
+Text_18B7B0:: @ 818B7B0
+    .string "…Huh?\p"
+    .string "I was envisioning my house, but\n"
+    .string "this is where I TELEPORT?$"
+
+Text_18B7F0:: @ 818B7F0
+    .string "Big boo-boo!$"
+
+Text_18B7FD:: @ 818B7FD
+    .string "I am so scatterbrained!\p"
+    .string "I need to focus so I can TELEPORT\n"
+    .string "properly to my house!$"
+
+gUnknown_818B84D:: @ 818B84D
+    .string "GREEN PATH\n"
+    .string "PATTERN BUSH AHEAD$"
+
+gUnknown_818B86B:: @ 818B86B
+    .string "GREEN PATH\n"
+    .string "Think Green, Keep Nature Clean!$"
+
diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json
new file mode 100644
index 000000000..4af0b5351
--- /dev/null
+++ b/data/maps/SixIsland_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SIX_ISLAND_HARBOR",
+  "name": "SixIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SIX_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_Harbor_EventScript_171E48",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..1e4e34a16
--- /dev/null
+++ b/data/maps/SixIsland_Harbor/scripts.inc
@@ -0,0 +1,11 @@
+SixIsland_Harbor_MapScripts:: @ 8171E47
+	.byte 0
+
+SixIsland_Harbor_EventScript_171E48:: @ 8171E48
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 6
+	goto EventScript_1A900F
+	end
diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json
new file mode 100644
index 000000000..4444ed8af
--- /dev/null
+++ b/data/maps/SixIsland_House/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SIX_ISLAND_HOUSE",
+  "name": "SixIsland_House",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SIX_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "32",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_House_EventScript_171E5C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc
new file mode 100644
index 000000000..bc6753abb
--- /dev/null
+++ b/data/maps/SixIsland_House/scripts.inc
@@ -0,0 +1,6 @@
+SixIsland_House_MapScripts:: @ 8171E5B
+	.byte 0
+
+SixIsland_House_EventScript_171E5C:: @ 8171E5C
+	msgbox gUnknown_81A412E, 2
+	end
diff --git a/data/maps/SixIsland_House/text.inc b/data/maps/SixIsland_House/text.inc
new file mode 100644
index 000000000..06fd9c274
--- /dev/null
+++ b/data/maps/SixIsland_House/text.inc
@@ -0,0 +1,7 @@
+gUnknown_81A412E:: @ 81A412E
+    .string "There's nothing that young people'd\n"
+    .string "find exciting here on this island.\p"
+    .string "But, this is a good place in terms\n"
+    .string "of nature and history.\p"
+    .string "Relax and enjoy your stay.$"
+
diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json
new file mode 100644
index 000000000..f6e686c5f
--- /dev/null
+++ b/data/maps/SixIsland_Mart/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_SIX_ISLAND_MART",
+  "name": "SixIsland_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SIX_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_Mart_EventScript_171E66",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "35",
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_Mart_EventScript_1ACFEF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_Mart_EventScript_171EA0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc
new file mode 100644
index 000000000..495a0a991
--- /dev/null
+++ b/data/maps/SixIsland_Mart/scripts.inc
@@ -0,0 +1,33 @@
+SixIsland_Mart_MapScripts:: @ 8171E65
+	.byte 0
+
+SixIsland_Mart_EventScript_171E66:: @ 8171E66
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_171E8C
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_171E8C:: @ 8171E8C
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_DREAM_MAIL
+	.2byte ITEM_NONE
+	release
+	end
+
+SixIsland_Mart_EventScript_171EA0:: @ 8171EA0
+	msgbox gUnknown_81A4271, 2
+	end
diff --git a/data/maps/SixIsland_Mart/text.inc b/data/maps/SixIsland_Mart/text.inc
new file mode 100644
index 000000000..34e6275a2
--- /dev/null
+++ b/data/maps/SixIsland_Mart/text.inc
@@ -0,0 +1,12 @@
+Text_1A41CA:: @ 81A41CA
+    .string "Play with POKéMON lots and live\n"
+    .string "a long life!\p"
+    .string "Take AGATHA, for example.\p"
+    .string "She set a record for being the\n"
+    .string "oldest-ever ELITE FOUR member.\p"
+    .string "She spurs me to do bigger things.$"
+
+gUnknown_81A4271:: @ 81A4271
+    .string "I should buy some MAIL and write\n"
+    .string "him a letter…$"
+
diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json
new file mode 100644
index 000000000..459fc1275
--- /dev/null
+++ b/data/maps/SixIsland_OutcastIsland/map.json
@@ -0,0 +1,144 @@
+{
+  "id": "MAP_SIX_ISLAND_OUTCAST_ISLAND",
+  "name": "SixIsland_OutcastIsland",
+  "layout": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_OUTCAST_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SIX_ISLAND_GREEN_PATH",
+      "offset": 0,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "49",
+      "x": 9,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_OutcastIsland_EventScript_168B16",
+      "flag": "136"
+    },
+    {
+      "graphics_id": "57",
+      "x": 12,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_OutcastIsland_EventScript_1AC3D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 13,
+      "y": 34,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_OutcastIsland_EventScript_1AC40F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 14,
+      "y": 61,
+      "elevation": 1,
+      "movement_type": "50",
+      "movement_range_x": 2,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_OutcastIsland_EventScript_1AC44D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 10,
+      "y": 44,
+      "elevation": 1,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_OutcastIsland_EventScript_1AC48B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "36",
+      "x": 11,
+      "y": 44,
+      "elevation": 1,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_OutcastIsland_EventScript_1AC4D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_OutcastIsland_EventScript_1BEC90",
+      "flag": "481"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_ALTERING_CAVE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 23,
+      "elevation": 3,
+      "item": "ITEM_STAR_PIECE",
+      "flag": "178",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 6,
+      "y": 24,
+      "elevation": 3,
+      "item": "ITEM_NET_BALL",
+      "flag": "179",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc
new file mode 100644
index 000000000..9682f1cbe
--- /dev/null
+++ b/data/maps/SixIsland_OutcastIsland/scripts.inc
@@ -0,0 +1,7 @@
+SixIsland_OutcastIsland_MapScripts:: @ 8168B15
+	.byte 0
+
+SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16
+	trainerbattle 0, 540, 0, Text_18B35A, Text_18B3C2
+	msgbox gUnknown_818B3C8, 6
+	end
diff --git a/data/maps/SixIsland_OutcastIsland/text.inc b/data/maps/SixIsland_OutcastIsland/text.inc
new file mode 100644
index 000000000..47b138e41
--- /dev/null
+++ b/data/maps/SixIsland_OutcastIsland/text.inc
@@ -0,0 +1,13 @@
+Text_18B35A:: @ 818B35A
+    .string "There're no rare POKéMON around\n"
+    .string "these parts! Not a one!\p"
+    .string "That burns me up, man.\n"
+    .string "I'll take it out on you!$"
+
+Text_18B3C2:: @ 818B3C2
+    .string "…Huh?$"
+
+gUnknown_818B3C8:: @ 818B3C8
+    .string "So listen, you haven't seen any\n"
+    .string "rare POKéMON, have you?$"
+
diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json
new file mode 100644
index 000000000..8d0953181
--- /dev/null
+++ b/data/maps/SixIsland_PatternBush/map.json
@@ -0,0 +1,219 @@
+{
+  "id": "MAP_SIX_ISLAND_PATTERN_BUSH",
+  "name": "SixIsland_PatternBush",
+  "layout": "LAYOUT_SIX_ISLAND_PATTERN_BUSH",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_PATTERN_BUSH",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 48,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "20",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SixIsland_PatternBush_EventScript_164590",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SixIsland_PatternBush_EventScript_1645A7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 51,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SixIsland_PatternBush_EventScript_1645BE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 12,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SixIsland_PatternBush_EventScript_1645D5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 37,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "51",
+      "movement_range_x": 2,
+      "movement_range_y": 5,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_PatternBush_EventScript_1645EC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 32,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SixIsland_PatternBush_EventScript_164603",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 52,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SixIsland_PatternBush_EventScript_16461A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 8,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "SixIsland_PatternBush_EventScript_164631",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 39,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SixIsland_PatternBush_EventScript_164648",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SixIsland_PatternBush_EventScript_16465F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 19,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "28",
+      "movement_range_x": 5,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_PatternBush_EventScript_164676",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 30,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SixIsland_PatternBush_EventScript_16468D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 54,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_GREEN_PATH",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 55,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_GREEN_PATH",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 56,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_GREEN_PATH",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_GREEN_PATH",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_GREEN_PATH",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_GREEN_PATH",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc
new file mode 100644
index 000000000..0575b4855
--- /dev/null
+++ b/data/maps/SixIsland_PatternBush/scripts.inc
@@ -0,0 +1,80 @@
+SixIsland_PatternBush_MapScripts:: @ 8164559
+	map_script 3, SixIsland_PatternBush_MapScript1_16455F
+	.byte 0
+
+SixIsland_PatternBush_MapScript1_16455F:: @ 816455F
+	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH
+	getplayerxy VAR_0x4001, VAR_0x4002
+	compare_var_to_value VAR_0x4001, 50
+	call_if 4, EventScript_16457E
+	compare_var_to_value VAR_0x4001, 49
+	call_if 3, EventScript_164587
+	end
+
+EventScript_16457E:: @ 816457E
+	setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10
+	return
+
+EventScript_164587:: @ 8164587
+	setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10
+	return
+
+SixIsland_PatternBush_EventScript_164590:: @ 8164590
+	trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66
+	msgbox gUnknown_817BF97, 6
+	end
+
+SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7
+	trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028
+	msgbox gUnknown_817C056, 6
+	end
+
+SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE
+	trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2
+	msgbox gUnknown_817C113, 6
+	end
+
+SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5
+	trainerbattle 0, 612, 0, Text_17C155, Text_17C196
+	msgbox gUnknown_817C1D0, 6
+	end
+
+SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC
+	trainerbattle 0, 613, 0, Text_17C246, Text_17C275
+	msgbox gUnknown_817C2A4, 6
+	end
+
+SixIsland_PatternBush_EventScript_164603:: @ 8164603
+	trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D
+	msgbox gUnknown_817C31C, 6
+	end
+
+SixIsland_PatternBush_EventScript_16461A:: @ 816461A
+	trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5
+	msgbox gUnknown_817C3CE, 6
+	end
+
+SixIsland_PatternBush_EventScript_164631:: @ 8164631
+	trainerbattle 0, 616, 0, Text_17C42B, Text_17C458
+	msgbox gUnknown_817C490, 6
+	end
+
+SixIsland_PatternBush_EventScript_164648:: @ 8164648
+	trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552
+	msgbox gUnknown_817C590, 6
+	end
+
+SixIsland_PatternBush_EventScript_16465F:: @ 816465F
+	trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609
+	msgbox gUnknown_817C615, 6
+	end
+
+SixIsland_PatternBush_EventScript_164676:: @ 8164676
+	trainerbattle 0, 619, 0, Text_17C63E, Text_17C660
+	msgbox gUnknown_817C68E, 6
+	end
+
+SixIsland_PatternBush_EventScript_16468D:: @ 816468D
+	trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB
+	msgbox gUnknown_817C728, 6
+	end
diff --git a/data/maps/SixIsland_PatternBush/text.inc b/data/maps/SixIsland_PatternBush/text.inc
new file mode 100644
index 000000000..eddaf1ed9
--- /dev/null
+++ b/data/maps/SixIsland_PatternBush/text.inc
@@ -0,0 +1,156 @@
+Text_17BF3A:: @ 817BF3A
+    .string "I'm curious, how do you raise your\n"
+    .string "POKéMON?$"
+
+Text_17BF66:: @ 817BF66
+    .string "You raise your POKéMON with a\n"
+    .string "whole lot of love!$"
+
+gUnknown_817BF97:: @ 817BF97
+    .string "In the same way your mother raised\n"
+    .string "you full of love, you should raise\l"
+    .string "your POKéMON.$"
+
+Text_17BFEB:: @ 817BFEB
+    .string "I'm working to preserve the natural\n"
+    .string "ecology of POKéMON here.$"
+
+Text_17C028:: @ 817C028
+    .string "Oh, for someone so young, you are\n"
+    .string "tremendous!$"
+
+gUnknown_817C056:: @ 817C056
+    .string "I'm not saying that you shouldn't\n"
+    .string "catch POKéMON.\p"
+    .string "I just want people to raise their\n"
+    .string "POKéMON responsibly.$"
+
+Text_17C0BE:: @ 817C0BE
+    .string "I caught a BUG POKéMON that lives\n"
+    .string "only around here!$"
+
+Text_17C0F2:: @ 817C0F2
+    .string "Heheh…\n"
+    .string "Isn't my POKéMON awesome?$"
+
+gUnknown_817C113:: @ 817C113
+    .string "There's a girl near the BUSH who\n"
+    .string "measures HERACROSS for TRAINERS.$"
+
+Text_17C155:: @ 817C155
+    .string "You know, it just doesn't feel right\n"
+    .string "if I don't use BUG POKéMON.$"
+
+Text_17C196:: @ 817C196
+    .string "It's okay, losing is a fun part of\n"
+    .string "POKéMON's appeal, too.$"
+
+gUnknown_817C1D0:: @ 817C1D0
+    .string "By the way, “appeal” is a weird\n"
+    .string "word, if you think about it.\p"
+    .string "Like, is it like an orange peel?\n"
+    .string "Or like a ringing bell?$"
+
+Text_17C246:: @ 817C246
+    .string "Yeah, yeah, yeah!\n"
+    .string "Look at all the BUG POKéMON!$"
+
+Text_17C275:: @ 817C275
+    .string "I got beat while I was still busy\n"
+    .string "celebrating!$"
+
+gUnknown_817C2A4:: @ 817C2A4
+    .string "I'm going to bring my little brother\n"
+    .string "here next time.$"
+
+Text_17C2D9:: @ 817C2D9
+    .string "Look, look! There are funny\n"
+    .string "patterns on the ground.$"
+
+Text_17C30D:: @ 817C30D
+    .string "Super awesome!$"
+
+gUnknown_817C31C:: @ 817C31C
+    .string "The funny patterns on the ground…\p"
+    .string "They look like the patterns on my\n"
+    .string "grandpa's clothes.$"
+
+Text_17C373:: @ 817C373
+    .string "I bet you think I'm just some guy,\n"
+    .string "don't you, eh?$"
+
+Text_17C3A5:: @ 817C3A5
+    .string "I bet you think I'm weak,\n"
+    .string "don't you, eh?$"
+
+gUnknown_817C3CE:: @ 817C3CE
+    .string "Ayup, you townies come around all\n"
+    .string "so dandy with a hat that flashy…\p"
+    .string "How about giving me that?$"
+
+Text_17C42B:: @ 817C42B
+    .string "Take a deep breath.\n"
+    .string "Isn't the air delicious?$"
+
+Text_17C458:: @ 817C458
+    .string "If you'd like, I can teach you how\n"
+    .string "to breathe properly.$"
+
+gUnknown_817C490:: @ 817C490
+    .string "First, exhale.\n"
+    .string "Blow everything out.\p"
+    .string "When you can't exhale anymore,\n"
+    .string "inhale the clean air!\p"
+    .string "Isn't it refreshing?$"
+
+Text_17C4FE:: @ 817C4FE
+    .string "I love BUG POKéMON.\n"
+    .string "That's why I'm here all the time.\p"
+    .string "Am I the only girl like that?$"
+
+Text_17C552:: @ 817C552
+    .string "I lost, but I'm still laughing.\n"
+    .string "Am I the only girl like that?$"
+
+gUnknown_817C590:: @ 817C590
+    .string "I'm going to keep on collecting\n"
+    .string "BUG POKéMON.\p"
+    .string "Am I the only girl like that?$"
+
+Text_17C5DB:: @ 817C5DB
+    .string "This is a good spot.\n"
+    .string "I'll pitch my tent here.$"
+
+Text_17C609:: @ 817C609
+    .string "Wimped out…$"
+
+gUnknown_817C615:: @ 817C615
+    .string "I'm going to observe the night sky\n"
+    .string "here.$"
+
+Text_17C63E:: @ 817C63E
+    .string "Oh, yuck!\n"
+    .string "I think a bug stung me!$"
+
+Text_17C660:: @ 817C660
+    .string "It wasn't a bug.\n"
+    .string "I cut my shin on some grass.$"
+
+gUnknown_817C68E:: @ 817C68E
+    .string "A little cut like that…\n"
+    .string "A little spit's enough to cure it!$"
+
+Text_17C6C9:: @ 817C6C9
+    .string "Have you noticed something odd\n"
+    .string "about these parts?$"
+
+Text_17C6FB:: @ 817C6FB
+    .string "Have you taken a good look around\n"
+    .string "your feet?$"
+
+gUnknown_817C728:: @ 817C728
+    .string "There are places here in PATTERN\n"
+    .string "BUSH where grass won't grow.\p"
+    .string "What could be the cause of such\n"
+    .string "a phenomenon?$"
+
diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..5a22c24ba
--- /dev/null
+++ b/data/maps/SixIsland_PokemonCenter_1F/map.json
@@ -0,0 +1,87 @@
+{
+  "id": "MAP_SIX_ISLAND_POKEMON_CENTER_1F",
+  "name": "SixIsland_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SIX_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_PokemonCenter_1F_EventScript_171E05",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "72",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "152"
+    },
+    {
+      "graphics_id": "56",
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_PokemonCenter_1F_EventScript_171E0E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "33",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_PokemonCenter_1F_EventScript_171E17",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..593f9f979
--- /dev/null
+++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,79 @@
+SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A
+	map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A
+	map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C
+	map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D
+	.byte 0
+
+SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A
+	setrespawn SPAWN_SIX_ISLAND
+	compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0
+	call_if 1, EventScript_171D89
+	end
+
+EventScript_171D89:: @ 8171D89
+	clearflag FLAG_0x098
+	return
+
+SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D
+	map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97
+	.2byte 0
+
+EventScript_171D97:: @ 8171D97
+	lockall
+	textcolor 0
+	applymovement 2, Movement_1A75ED
+	waitmovement 0
+	playbgm BGM_FRLG_RIVAL, 0
+	applymovement 2, Movement_1A75DB
+	waitmovement 0
+	applymovement 2, Movement_1A75DD
+	waitmovement 0
+	delay 25
+	applymovement 2, Movement_171DF9
+	waitmovement 0
+	msgbox gUnknown_81A3F30
+	closemessage
+	applymovement 255, Movement_171E02
+	applymovement 2, Movement_171DFE
+	waitmovement 0
+	fadedefaultbgm
+	playse SE_KAIDAN
+	delay 35
+	removeobject 2
+	setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1
+	setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
+	releaseall
+	end
+
+Movement_171DF9:: @ 8171DF9
+	step_13
+	step_13
+	step_10
+	step_10
+	step_end
+
+Movement_171DFE:: @ 8171DFE
+	step_1c
+	step_1a
+	step_10
+	step_end
+
+Movement_171E02:: @ 8171E02
+	step_12
+	step_30
+	step_end
+
+SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E
+	msgbox gUnknown_81A3E02, 2
+	end
+
+SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17
+	msgbox gUnknown_81A3E87, 2
+	end
diff --git a/data/maps/SixIsland_PokemonCenter_1F/text.inc b/data/maps/SixIsland_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..a7b4f3336
--- /dev/null
+++ b/data/maps/SixIsland_PokemonCenter_1F/text.inc
@@ -0,0 +1,36 @@
+gUnknown_81A3E02:: @ 81A3E02
+    .string "For ten years, I've searched for\n"
+    .string "RUINS.\p"
+    .string "No, make that twenty years.\p"
+    .string "I get this feeling that there's\n"
+    .string "something hidden on this island.$"
+
+gUnknown_81A3E87:: @ 81A3E87
+    .string "You know of POKéMON that evolve\n"
+    .string "only upon trading, yes?\p"
+    .string "But did you know that there are\n"
+    .string "still others?\p"
+    .string "Some POKéMON evolve only when\n"
+    .string "traded while holding specific items.$"
+
+gUnknown_81A3F30:: @ 81A3F30
+    .string "{RIVAL}: Hey, {PLAYER}!\n"
+    .string "How's your POKéDEX filling up?\p"
+    .string "It looks like it's impossible to get\n"
+    .string "all the POKéMON by hanging around\l"
+    .string "just these parts.\p"
+    .string "Maybe there are POKéMON we don't\n"
+    .string "know about somewhere far away…\p"
+    .string "… … …  … … …  … … …\p"
+    .string "Well, if I can't do it, there's no\n"
+    .string "way for you to get it done.\p"
+    .string "I'm not going to get all desperate\n"
+    .string "over this.\p"
+    .string "I'll keep collecting POKéMON at my\n"
+    .string "own pace while I train them.\p"
+    .string "That's what I'll do.\n"
+    .string "So there's no point staying here.\l"
+    .string "I may as well leave for home.\p"
+    .string "That's that, then!\n"
+    .string "Smell ya later!$"
+
diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..d5865a28b
--- /dev/null
+++ b/data/maps/SixIsland_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_SIX_ISLAND_POKEMON_CENTER_2F",
+  "name": "SixIsland_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SIX_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..a261c9269
--- /dev/null
+++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20
+	map_script 2, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, SixIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35
+	call EventScript_1BB4A3
+	end
+
+EventScript_171E3B:: @ 8171E3B
+	call EventScript_1BB6AB
+	end
+
+EventScript_171E41:: @ 8171E41
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json
new file mode 100644
index 000000000..8e5fc1b9f
--- /dev/null
+++ b/data/maps/SixIsland_RuinValley/map.json
@@ -0,0 +1,263 @@
+{
+  "id": "MAP_SIX_ISLAND_RUIN_VALLEY",
+  "name": "SixIsland_RuinValley",
+  "layout": "LAYOUT_SIX_ISLAND_RUIN_VALLEY",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_RUIN_VALLEY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SIX_ISLAND_WATER_PATH",
+      "offset": -80,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 24,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_168B6D",
+      "flag": "142"
+    },
+    {
+      "graphics_id": "56",
+      "x": 32,
+      "y": 11,
+      "elevation": 5,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SixIsland_RuinValley_EventScript_1AC717",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 33,
+      "y": 16,
+      "elevation": 5,
+      "movement_type": "14",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SixIsland_RuinValley_EventScript_1AC755",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 31,
+      "y": 24,
+      "elevation": 5,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_RuinValley_EventScript_1AC793",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 14,
+      "y": 10,
+      "elevation": 5,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "SixIsland_RuinValley_EventScript_1AC7D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 21,
+      "y": 29,
+      "elevation": 5,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_RuinValley_EventScript_1AC80F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 17,
+      "y": 10,
+      "elevation": 5,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 17,
+      "y": 12,
+      "elevation": 5,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 18,
+      "y": 11,
+      "elevation": 5,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 6,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 6,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 41,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 41,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 42,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BECC4",
+      "flag": "485"
+    },
+    {
+      "graphics_id": "92",
+      "x": 19,
+      "y": 11,
+      "elevation": 5,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BECB7",
+      "flag": "484"
+    },
+    {
+      "graphics_id": "92",
+      "x": 43,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_RuinValley_EventScript_1BECD1",
+      "flag": "486"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 24,
+      "y": 24,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 24,
+      "y": 24,
+      "elevation": 3,
+      "script": "SixIsland_RuinValley_EventScript_168B94"
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc
new file mode 100644
index 000000000..11c1b730f
--- /dev/null
+++ b/data/maps/SixIsland_RuinValley/scripts.inc
@@ -0,0 +1,46 @@
+SixIsland_RuinValley_MapScripts:: @ 8168B53
+	map_script 1, SixIsland_RuinValley_MapScript1_168B59
+	.byte 0
+
+SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59
+	checkflag FLAG_0x2E3
+	call_if 1, EventScript_168B63
+	end
+
+EventScript_168B63:: @ 8168B63
+	setmetatile 24, 24, 856, 0
+	return
+
+SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D
+	lock
+	msgbox gUnknown_818BD47
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_818BD7A
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+SixIsland_RuinValley_EventScript_168B94:: @ 8168B94
+	lockall
+	checkflag FLAG_0x2E3
+	goto_if_eq EventScript_168BC1
+	msgbox gUnknown_818BDC0, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_168BCB
+	msgbox gUnknown_818BE11
+	braillemessage gUnknown_81A929B
+	waitbuttonpress
+	releaseall
+	end
+
+EventScript_168BC1:: @ 8168BC1
+	msgbox gUnknown_818BE4B
+	releaseall
+	end
+
+EventScript_168BCB:: @ 8168BCB
+	msgbox gUnknown_818BDF9
+	releaseall
+	end
diff --git a/data/maps/SixIsland_RuinValley/text.inc b/data/maps/SixIsland_RuinValley/text.inc
new file mode 100644
index 000000000..14cee7a88
--- /dev/null
+++ b/data/maps/SixIsland_RuinValley/text.inc
@@ -0,0 +1,23 @@
+gUnknown_818BD47:: @ 818BD47
+    .string "I can't figure out how I'm supposed\n"
+    .string "to get inside.$"
+
+gUnknown_818BD7A:: @ 818BD7A
+    .string "Let me tell you, I found this\n"
+    .string "place.\p"
+    .string "Don't look so envious, will you?$"
+
+gUnknown_818BDC0:: @ 818BDC0
+    .string "The door doesn't budge at all.\n"
+    .string "Check it more thoroughly?$"
+
+gUnknown_818BDF9:: @ 818BDF9
+    .string "{PLAYER} left the door alone.$"
+
+gUnknown_818BE11:: @ 818BE11
+    .string "On closer inspection, there are\n"
+    .string "several dots on the door…$"
+
+gUnknown_818BE4B:: @ 818BE4B
+    .string "The door is open.$"
+
diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json
new file mode 100644
index 000000000..2539323d8
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath/map.json
@@ -0,0 +1,210 @@
+{
+  "id": "MAP_SIX_ISLAND_WATER_PATH",
+  "name": "SixIsland_WaterPath",
+  "layout": "LAYOUT_SIX_ISLAND_WATER_PATH",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_WATER_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_SIX_ISLAND_GREEN_PATH",
+      "offset": 0,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_SIX_ISLAND",
+      "offset": 40,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_SIX_ISLAND_RUIN_VALLEY",
+      "offset": 80,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 12,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "19",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SixIsland_WaterPath_EventScript_1AC555",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 11,
+      "y": 52,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "SixIsland_WaterPath_EventScript_1AC593",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "43",
+      "x": 13,
+      "y": 35,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SixIsland_WaterPath_EventScript_1AC5D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 15,
+      "y": 45,
+      "elevation": 1,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_WaterPath_EventScript_1AC60F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 6,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_WaterPath_EventScript_1AC64D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 7,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "SixIsland_WaterPath_EventScript_1AC693",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 11,
+      "y": 76,
+      "elevation": 3,
+      "movement_type": "15",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "SixIsland_WaterPath_EventScript_1AC6D9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 19,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_WaterPath_EventScript_1BEC9D",
+      "flag": "482"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 87,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_WaterPath_EventScript_1BECAA",
+      "flag": "483"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 14,
+      "elevation": 0,
+      "script": "SixIsland_WaterPath_EventScript_168B41"
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 76,
+      "elevation": 3,
+      "item": "ITEM_ASPEAR_BERRY",
+      "flag": "181",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "item": "ITEM_ORAN_BERRY",
+      "flag": "182",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 13,
+      "y": 63,
+      "elevation": 3,
+      "item": "ITEM_PINAP_BERRY",
+      "flag": "183",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 54,
+      "elevation": 0,
+      "script": "SixIsland_WaterPath_EventScript_168B4A"
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc
new file mode 100644
index 000000000..2b410f112
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath/scripts.inc
@@ -0,0 +1,10 @@
+SixIsland_WaterPath_MapScripts:: @ 8168B40
+	.byte 0
+
+SixIsland_WaterPath_EventScript_168B41:: @ 8168B41
+	msgbox gUnknown_818BD0C, 3
+	end
+
+SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A
+	msgbox gUnknown_818BD27, 3
+	end
diff --git a/data/maps/SixIsland_WaterPath/text.inc b/data/maps/SixIsland_WaterPath/text.inc
new file mode 100644
index 000000000..70a8ce017
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath/text.inc
@@ -0,0 +1,102 @@
+Text_18B896:: @ 818B896
+    .string "I let a pleasant breeze lead me\n"
+    .string "all the way here.$"
+
+Text_18B8C8:: @ 818B8C8
+    .string "Giggle… You're so cute when you're\n"
+    .string "determined.$"
+
+Text_18B8F7:: @ 818B8F7
+    .string "I want to go to the woods over\n"
+    .string "there, but…\p"
+    .string "There are lots of BUG POKéMON.\n"
+    .string "They scare me a little.$"
+
+Text_18B959:: @ 818B959
+    .string "I'm practicing in secret so no one\n"
+    .string "can see me.$"
+
+Text_18B988:: @ 818B988
+    .string "Nobody saw me losing, right?$"
+
+Text_18B9A5:: @ 818B9A5
+    .string "As a performer, I don't want people\n"
+    .string "to know about the effort I put in.$"
+
+Text_18B9EC:: @ 818B9EC
+    .string "What, you're suggesting that you're\n"
+    .string "sick of seeing SWIMMERS like me?\p"
+    .string "Aww, don't be hatin'!$"
+
+Text_18BA47:: @ 818BA47
+    .string "Oh, no, no, no.$"
+
+Text_18BA57:: @ 818BA57
+    .string "I couldn't lift the stigma of being\n"
+    .string "a SWIMMER…$"
+
+Text_18BA86:: @ 818BA86
+    .string "My boyfriend's always busy, so I\n"
+    .string "come swimming by myself.$"
+
+Text_18BAC0:: @ 818BAC0
+    .string "Awww, I knew this would happen!$"
+
+Text_18BAE0:: @ 818BAE0
+    .string "When I can't be with my boyfriend,\n"
+    .string "I spend time with the POKéMON he\l"
+    .string "gave me.$"
+
+Text_18BB2D:: @ 818BB2D
+    .string "Tell me, where are the mountains\n"
+    .string "around these parts?$"
+
+Text_18BB62:: @ 818BB62
+    .string "I lost my way while I was busy\n"
+    .string "battling!$"
+
+Text_18BB8B:: @ 818BB8B
+    .string "Aren't there any mountains around\n"
+    .string "these parts?$"
+
+Text_18BBBA:: @ 818BBBA
+    .string "MIU: Hello, POKéMON!\n"
+    .string "It's time to play!$"
+
+Text_18BBE2:: @ 818BBE2
+    .string "MIU: Oh, no!\n"
+    .string "Mommy!$"
+
+Text_18BBF6:: @ 818BBF6
+    .string "MIU: It makes me all sad inside\n"
+    .string "when we lose…$"
+
+Text_18BC24:: @ 818BC24
+    .string "MIU: MIA and I are TWINS.\n"
+    .string "We want to battle together.$"
+
+Text_18BC5A:: @ 818BC5A
+    .string "MIA: Hello, POKéMON!\n"
+    .string "It's time to battle!$"
+
+Text_18BC84:: @ 818BC84
+    .string "MIA: You're mean!\n"
+    .string "You're bad for winning!$"
+
+Text_18BCAE:: @ 818BCAE
+    .string "MIA: Ohh…\n"
+    .string "I'm sorry, my POKéMON…$"
+
+Text_18BCCF:: @ 818BCCF
+    .string "MIA: Oh, you only have one\n"
+    .string "POKéMON?\p"
+    .string "Don't you feel lonesome?$"
+
+gUnknown_818BD0C:: @ 818BD0C
+    .string "Wanted!\n"
+    .string "The Ultimate Horn!$"
+
+gUnknown_818BD27:: @ 818BD27
+    .string "WATER PATH\n"
+    .string "Leads to RUIN VALLEY$"
+
diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json
new file mode 100644
index 000000000..5a446e953
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath_House1/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1",
+  "name": "SixIsland_WaterPath_House1",
+  "layout": "LAYOUT_HOUSE4",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_WATER_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "29",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_WaterPath_House1_EventScript_17206D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_WATER_PATH",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "script": "SixIsland_WaterPath_House1_EventScript_172157"
+    }
+  ]
+}
diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc
new file mode 100644
index 000000000..f9df42396
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc
@@ -0,0 +1,89 @@
+SixIsland_WaterPath_House1_MapScripts:: @ 817206C
+	.byte 0
+
+SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
+	lock
+	faceplayer
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	setvar VAR_0x8004, SPECIES_HERACROSS
+	specialvar VAR_RESULT, sub_80CC48C
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1720E5
+	special sub_80A0918
+	msgbox gUnknown_81A4A3F
+	special sub_80BF8FC
+	waitstate
+	copyvar VAR_RESULT, VAR_0x8004
+	compare_var_to_value VAR_RESULT, 6
+	goto_if 4, EventScript_1720EF
+	special sub_80A0930
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1720F1
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1720FB
+	compare_var_to_value VAR_RESULT, 3
+	goto_if_eq EventScript_172121
+	compare_var_to_value VAR_RESULT, 4
+	goto_if_eq EventScript_17210E
+	release
+	end
+
+EventScript_1720E5:: @ 81720E5
+	msgbox gUnknown_81A49E9
+	release
+	end
+
+EventScript_1720EF:: @ 81720EF
+	release
+	end
+
+EventScript_1720F1:: @ 81720F1
+	msgbox gUnknown_81A4BEF
+	release
+	end
+
+EventScript_1720FB:: @ 81720FB
+	checkflag FLAG_0x2D9
+	goto_if 0, EventScript_172121
+	msgbox gUnknown_81A4B7A
+	release
+	end
+
+EventScript_17210E:: @ 817210E
+	checkflag FLAG_0x2D9
+	goto_if 0, EventScript_172121
+	msgbox gUnknown_81A4B39
+	release
+	end
+
+EventScript_172121:: @ 8172121
+	setflag FLAG_0x2D9
+	msgbox gUnknown_81A4A88
+	giveitem ITEM_NEST_BALL
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_17214D
+	msgbox gUnknown_81A4AD9
+	release
+	end
+
+EventScript_17214D:: @ 817214D
+	msgbox gUnknown_81A4C47
+	release
+	end
+
+SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157
+	lockall
+	checkflag FLAG_0x2D9
+	goto_if_eq EventScript_17216B
+	msgbox gUnknown_81A4CB9
+	releaseall
+	end
+
+EventScript_17216B:: @ 817216B
+	special sub_80A0918
+	msgbox gUnknown_81A4C6E
+	releaseall
+	end
diff --git a/data/maps/SixIsland_WaterPath_House1/text.inc b/data/maps/SixIsland_WaterPath_House1/text.inc
new file mode 100644
index 000000000..71ecedc96
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath_House1/text.inc
@@ -0,0 +1,105 @@
+Text_1A46C6:: @ 81A46C6
+    .string "I perfected the ultimate move of\n"
+    .string "its type…\p"
+    .string "But will no one take it for\n"
+    .string "future use?\p"
+    .string "…Hm? Hmmm!\p"
+    .string "Y-you…\n"
+    .string "Th-that {STR_VAR_1}…$"
+
+Text_1A4737:: @ 81A4737
+    .string "…No…\n"
+    .string "I was just mistaken.$"
+
+Text_1A4751:: @ 81A4751
+    .string "Oh! This is the one!\n"
+    .string "This is the POKéMON!\p"
+    .string "This {STR_VAR_1} is worthy of\n"
+    .string "learning my ultimate move!\p"
+    .string "Will you allow it?\p"
+    .string "Will you allow your {STR_VAR_1} to\n"
+    .string "learn my {STR_VAR_2}?$"
+
+Text_1A47E5:: @ 81A47E5
+    .string "Gaah! You reject it?\n"
+    .string "No, I won't be dissuaded!$"
+
+Text_1A4814:: @ 81A4814
+    .string "You will allow it?\p"
+    .string "Then, let me confer my ultimate\n"
+    .string "{STR_VAR_2} on your {STR_VAR_1}.\p"
+    .string "Ggggrah-awooo!$"
+
+Text_1A4865:: @ 81A4865
+    .string "Gasp, gasp, gasp…\p"
+    .string "I didn't think I could teach that\n"
+    .string "move while I still lived…$"
+
+Text_1A48B3:: @ 81A48B3
+    .string "I implore you to make the best\n"
+    .string "use of that move and gain power!$"
+
+Text_1A48F3:: @ 81A48F3
+    .string "Gasp, gasp, gasp…\p"
+    .string "I have no regrets now.\n"
+    .string "I've passed on everything I know.\p"
+    .string "Now I can live out my life knowing\n"
+    .string "my work is done.$"
+
+Text_1A4972:: @ 81A4972
+    .string "After I passed on my knowledge to\n"
+    .string "you, I felt so much relief.\p"
+    .string "In fact, I feel rejuvenated,\n"
+    .string "as if I were younger again!$"
+
+gUnknown_81A49E9:: @ 81A49E9
+    .string "Hera, hera, HERACROSS!\n"
+    .string "Big and shiny, it's the bug boss!\l"
+    .string "Love it, need it, HERACROSS!$"
+
+gUnknown_81A4A3F:: @ 81A4A3F
+    .string "Eeeeek!\n"
+    .string "That's a HERACROSS!\p"
+    .string "Please, please, may I measure how\n"
+    .string "big it is?$"
+
+gUnknown_81A4A88:: @ 81A4A88
+    .string "Eeeek, it's {STR_VAR_2} inches!\n"
+    .string "I've never seen anything like this!\l"
+    .string "You deserve a reward!$"
+
+gUnknown_81A4AD9:: @ 81A4AD9
+    .string "I want to see a much, much bigger\n"
+    .string "HERACROSS than that one.\p"
+    .string "Oh, how I adore them, big\n"
+    .string "HERACROSS!$"
+
+gUnknown_81A4B39:: @ 81A4B39
+    .string "Huh? This {STR_VAR_2}-inch measurement…\n"
+    .string "Oh, boo! It's the same as before.$"
+
+gUnknown_81A4B7A:: @ 81A4B7A
+    .string "Oh, it's just {STR_VAR_2} inches.\n"
+    .string "The HERACROSS before was bigger.\p"
+    .string "It was {STR_VAR_3} inches, the biggest\n"
+    .string "HERACROSS you've brought me.$"
+
+gUnknown_81A4BEF:: @ 81A4BEF
+    .string "Oh, no! This won't do!\p"
+    .string "HERACROSS looks much more macho\n"
+    .string "and cool, and has a lovely horn!$"
+
+gUnknown_81A4C47:: @ 81A4C47
+    .string "Your BAG is full.\n"
+    .string "My reward won't fit.$"
+
+gUnknown_81A4C6E:: @ 81A4C6E
+    .string "The biggest HERACROSS that I have\n"
+    .string "ever seen measured so far is:\p"
+    .string "{STR_VAR_3} inches!$"
+
+gUnknown_81A4CB9:: @ 81A4CB9
+    .string "It's a blank chart of some sort.\p"
+    .string "It has spaces for writing in\n"
+    .string "records of some kind.$"
+
diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json
new file mode 100644
index 000000000..915052f9f
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath_House2/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2",
+  "name": "SixIsland_WaterPath_House2",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_WATER_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "25",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "15",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SixIsland_WaterPath_House2_EventScript_172179",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SIX_ISLAND_WATER_PATH",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc
new file mode 100644
index 000000000..ed5e24c7f
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc
@@ -0,0 +1,6 @@
+SixIsland_WaterPath_House2_MapScripts:: @ 8172178
+	.byte 0
+
+SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179
+	msgbox gUnknown_81A4D0D, 2
+	end
diff --git a/data/maps/SixIsland_WaterPath_House2/text.inc b/data/maps/SixIsland_WaterPath_House2/text.inc
new file mode 100644
index 000000000..03c8e187b
--- /dev/null
+++ b/data/maps/SixIsland_WaterPath_House2/text.inc
@@ -0,0 +1,6 @@
+gUnknown_81A4D0D:: @ 81A4D0D
+    .string "My height is 67.0 inches on the\n"
+    .string "button.\p"
+    .string "I know it is this precisely because\n"
+    .string "my neighbor measured me.$"
+
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
new file mode 100644
index 000000000..8e45d33fc
--- /dev/null
+++ b/data/maps/ThreeIsland/map.json
@@ -0,0 +1,371 @@
+{
+  "id": "MAP_THREE_ISLAND",
+  "name": "ThreeIsland",
+  "layout": "LAYOUT_THREE_ISLAND",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_THREE_ISLAND_PORT",
+      "offset": 0,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_THREE_ISLAND_BOND_BRIDGE",
+      "offset": 0,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "25",
+      "x": 7,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1677E5",
+      "flag": "126"
+    },
+    {
+      "graphics_id": "25",
+      "x": 8,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_167989",
+      "flag": "126"
+    },
+    {
+      "graphics_id": "53",
+      "x": 8,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1677D8",
+      "flag": "145"
+    },
+    {
+      "graphics_id": "53",
+      "x": 9,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1677D8",
+      "flag": "121"
+    },
+    {
+      "graphics_id": "53",
+      "x": 9,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1677D8",
+      "flag": "121"
+    },
+    {
+      "graphics_id": "53",
+      "x": 10,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1677D8",
+      "flag": "121"
+    },
+    {
+      "graphics_id": "53",
+      "x": 10,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1677D8",
+      "flag": "121"
+    },
+    {
+      "graphics_id": "53",
+      "x": 11,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1677D8",
+      "flag": "121"
+    },
+    {
+      "graphics_id": "95",
+      "x": 20,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "92",
+      "x": 18,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_1BEABC",
+      "flag": "443"
+    },
+    {
+      "graphics_id": "23",
+      "x": 15,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_167C77",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 14,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_167C80",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "132",
+      "x": 15,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_167C89",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 15,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_EventScript_167CA5",
+      "flag": "121"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 31,
+      "elevation": 0,
+      "dest_map": "MAP_THREE_ISLAND_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 27,
+      "elevation": 0,
+      "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_THREE_ISLAND_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_THREE_ISLAND_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_THREE_ISLAND_HOUSE3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_THREE_ISLAND_HOUSE4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_THREE_ISLAND_HOUSE5",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 27,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 2,
+      "script": "ThreeIsland_EventScript_1679B5"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 27,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 2,
+      "script": "ThreeIsland_EventScript_1679B5"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 27,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 2,
+      "script": "ThreeIsland_EventScript_1679B5"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 27,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 2,
+      "script": "ThreeIsland_EventScript_1679B5"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 26,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 3,
+      "script": "ThreeIsland_EventScript_167A1D"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 26,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 3,
+      "script": "ThreeIsland_EventScript_167A29"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 26,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 3,
+      "script": "ThreeIsland_EventScript_167A35"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 27,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 2,
+      "script": "ThreeIsland_EventScript_1679B5"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 26,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 3,
+      "script": "ThreeIsland_EventScript_167A41"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 26,
+      "elevation": 3,
+      "var": "VAR_0x407B",
+      "var_value": 3,
+      "script": "ThreeIsland_EventScript_167A4D"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 12,
+      "y": 31,
+      "elevation": 0,
+      "script": "ThreeIsland_EventScript_167C9C"
+    },
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 13,
+      "elevation": 3,
+      "item": "ITEM_PP_UP",
+      "flag": "164",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc
new file mode 100644
index 000000000..4d6773491
--- /dev/null
+++ b/data/maps/ThreeIsland/scripts.inc
@@ -0,0 +1,410 @@
+ThreeIsland_MapScripts:: @ 81677AD
+	map_script 3, ThreeIsland_MapScript1_1677B3
+	.byte 0
+
+ThreeIsland_MapScript1_1677B3:: @ 81677B3
+	setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND
+	checkflag FLAG_0x2A3
+	call_if 1, EventScript_1677CB
+	compare_var_to_value VAR_0x407B, 4
+	call_if 1, EventScript_1677CF
+	end
+
+EventScript_1677CB:: @ 81677CB
+	setflag FLAG_0x07E
+	return
+
+EventScript_1677CF:: @ 81677CF
+	setobjectmovementtype 1, 1
+	setobjectmovementtype 2, 1
+	return
+
+ThreeIsland_EventScript_1677D8:: @ 81677D8
+	lock
+	setvar VAR_0x4001, 2
+	call EventScript_16786F
+	release
+	end
+
+ThreeIsland_EventScript_1677E5:: @ 81677E5
+	lock
+	checkflag FLAG_0x2FC
+	goto_if_eq EventScript_167806
+	compare_var_to_value VAR_0x407B, 4
+	goto_if_eq EventScript_16781A
+	setvar VAR_0x4001, 0
+	call EventScript_16786F
+	release
+	end
+
+EventScript_167806:: @ 8167806
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_81827F1
+	release
+	end
+
+EventScript_16781A:: @ 816781A
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_818275A
+	checkitemspace ITEM_FULL_RESTORE, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_167865
+	giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE
+	additem ITEM_FULL_RESTORE, 1
+	setflag FLAG_0x2FC
+	msgbox gUnknown_81827F1
+	release
+	end
+
+EventScript_167865:: @ 8167865
+	msgbox gUnknown_81827DB
+	release
+	end
+
+EventScript_16786F:: @ 816786F
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_167947
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_167947
+	applymovement 1, Movement_167A1B
+	waitmovement 0
+	msgbox gUnknown_81820C0
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_167952
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_167952
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16795D
+	applymovement 5, Movement_167A19
+	waitmovement 0
+	msgbox gUnknown_8182125
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_167931
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_167931
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_167973
+	applymovement 2, Movement_167A1B
+	waitmovement 0
+	msgbox gUnknown_81821A9
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_167952
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_167952
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_16795D
+	applymovement 4, Movement_167A19
+	waitmovement 0
+	msgbox gUnknown_81821DC
+	return
+
+EventScript_167931:: @ 8167931
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	return
+
+EventScript_16793C:: @ 816793C
+	applymovement 255, Movement_1A75ED
+	waitmovement 0
+	return
+
+EventScript_167947:: @ 8167947
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	return
+
+EventScript_167952:: @ 8167952
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	return
+
+EventScript_16795D:: @ 816795D
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare_var_to_value VAR_0x8004, 9
+	goto_if 4, EventScript_167931
+	goto EventScript_167952
+	end
+
+EventScript_167973:: @ 8167973
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare_var_to_value VAR_0x8004, 9
+	goto_if 4, EventScript_167947
+	goto EventScript_167931
+	end
+
+ThreeIsland_EventScript_167989:: @ 8167989
+	lock
+	compare_var_to_value VAR_0x407B, 4
+	goto_if_eq EventScript_1679A1
+	setvar VAR_0x4001, 1
+	call EventScript_16786F
+	release
+	end
+
+EventScript_1679A1:: @ 81679A1
+	applymovement 2, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_8182823
+	release
+	end
+
+ThreeIsland_EventScript_1679B5:: @ 81679B5
+	lockall
+	textcolor 0
+	applymovement 1, Movement_167A1B
+	waitmovement 0
+	msgbox gUnknown_81821F1
+	applymovement 3, Movement_167A19
+	waitmovement 0
+	msgbox gUnknown_818221F
+	applymovement 1, Movement_167A1B
+	waitmovement 0
+	msgbox gUnknown_8182275
+	applymovement 3, Movement_167A19
+	waitmovement 0
+	msgbox gUnknown_81822FB
+	applymovement 1, Movement_167A1B
+	waitmovement 0
+	msgbox gUnknown_81823C7
+	setvar VAR_0x407B, 3
+	releaseall
+	end
+
+Movement_167A19:: @ 8167A19
+	step_27
+	step_end
+
+Movement_167A1B:: @ 8167A1B
+	step_28
+	step_end
+
+ThreeIsland_EventScript_167A1D:: @ 8167A1D
+	lockall
+	setvar VAR_0x4001, 0
+	goto EventScript_167A59
+	end
+
+ThreeIsland_EventScript_167A29:: @ 8167A29
+	lockall
+	setvar VAR_0x4001, 1
+	goto EventScript_167A59
+	end
+
+ThreeIsland_EventScript_167A35:: @ 8167A35
+	lockall
+	setvar VAR_0x4001, 2
+	goto EventScript_167A59
+	end
+
+ThreeIsland_EventScript_167A41:: @ 8167A41
+	lockall
+	setvar VAR_0x4001, 3
+	goto EventScript_167A59
+	end
+
+ThreeIsland_EventScript_167A4D:: @ 8167A4D
+	lockall
+	setvar VAR_0x4001, 4
+	goto EventScript_167A59
+	end
+
+EventScript_167A59:: @ 8167A59
+	textcolor 0
+	applymovement 5, Movement_1A75ED
+	waitmovement 0
+	playse SE_PIN
+	applymovement 5, Movement_1A75DB
+	waitmovement 0
+	applymovement 5, Movement_1A75DD
+	waitmovement 0
+	applymovement 5, Movement_167C57
+	waitmovement 0
+	playbgm BGM_FRLG_BOY_EYE, 0
+	msgbox gUnknown_81823ED, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_167C35
+	msgbox gUnknown_818247D
+	setvar VAR_LAST_TALKED, 5
+	trainerbattle 3, 527, 0, Text_1824B7
+	applymovement 5, Movement_167C5C
+	waitmovement 0
+	msgbox gUnknown_81824CF
+	closemessage
+	applymovement 7, Movement_167C57
+	waitmovement 0
+	playbgm BGM_FRLG_BOY_EYE, 0
+	msgbox gUnknown_81824EF
+	setvar VAR_LAST_TALKED, 7
+	trainerbattle 3, 528, 0, Text_182521
+	applymovement 7, Movement_167C5C
+	waitmovement 0
+	msgbox gUnknown_8182536
+	closemessage
+	applymovement 4, Movement_167C57
+	waitmovement 0
+	playbgm BGM_FRLG_BOY_EYE, 0
+	msgbox gUnknown_8182582
+	setvar VAR_LAST_TALKED, 4
+	trainerbattle 3, 529, 0, Text_1825D4
+	applymovement 4, Movement_1A75E7
+	waitmovement 0
+	applymovement 6, Movement_1A75ED
+	applymovement 8, Movement_1A75ED
+	waitmovement 0
+	msgbox gUnknown_81825E2
+	closemessage
+	delay 45
+	compare_var_to_value VAR_0x4001, 0
+	call_if 1, EventScript_167BC6
+	compare_var_to_value VAR_0x4001, 1
+	call_if 1, EventScript_167BD8
+	compare_var_to_value VAR_0x4001, 2
+	call_if 1, EventScript_167BEA
+	compare_var_to_value VAR_0x4001, 3
+	call_if 1, EventScript_167C03
+	compare_var_to_value VAR_0x4001, 4
+	call_if 1, EventScript_167C1C
+	playbgm BGM_FRLG_BOY_EYE, 0
+	msgbox gUnknown_8182623
+	setvar VAR_LAST_TALKED, 3
+	trainerbattle 3, 742, 0, Text_1826B7
+	msgbox gUnknown_818271D
+	closemessage
+	fadescreen 1
+	removeobject 3
+	removeobject 5
+	removeobject 7
+	removeobject 4
+	removeobject 6
+	removeobject 8
+	removeobject 14
+	fadescreen 0
+	setvar VAR_0x407B, 4
+	releaseall
+	end
+
+EventScript_167BC6:: @ 8167BC6
+	applymovement 4, Movement_1A75ED
+	applymovement 3, Movement_167C5E
+	waitmovement 0
+	return
+
+EventScript_167BD8:: @ 8167BD8
+	applymovement 4, Movement_1A75ED
+	applymovement 3, Movement_167C62
+	waitmovement 0
+	return
+
+EventScript_167BEA:: @ 8167BEA
+	applymovement 4, Movement_1A75ED
+	applymovement 3, Movement_167C64
+	applymovement 255, Movement_167C68
+	waitmovement 0
+	return
+
+EventScript_167C03:: @ 8167C03
+	applymovement 4, Movement_1A75ED
+	applymovement 255, Movement_167C68
+	applymovement 3, Movement_167C6C
+	waitmovement 0
+	return
+
+EventScript_167C1C:: @ 8167C1C
+	applymovement 4, Movement_1A75ED
+	applymovement 255, Movement_167C68
+	applymovement 3, Movement_167C71
+	waitmovement 0
+	return
+
+EventScript_167C35:: @ 8167C35
+	msgbox gUnknown_8182453
+	closemessage
+	applymovement 255, Movement_167C55
+	waitmovement 0
+	applymovement 5, Movement_167C59
+	waitmovement 0
+	fadedefaultbgm
+	releaseall
+	end
+
+Movement_167C55:: @ 8167C55
+	step_10
+	step_end
+
+Movement_167C57:: @ 8167C57
+	step_10
+	step_end
+
+Movement_167C59:: @ 8167C59
+	step_11
+	step_2f
+	step_end
+
+Movement_167C5C:: @ 8167C5C
+	step_25
+	step_end
+
+Movement_167C5E:: @ 8167C5E
+	step_10
+	step_12
+	step_2d
+	step_end
+
+Movement_167C62:: @ 8167C62
+	step_10
+	step_end
+
+Movement_167C64:: @ 8167C64
+	step_10
+	step_10
+	step_30
+	step_end
+
+Movement_167C68:: @ 8167C68
+	step_1c
+	step_1c
+	step_2f
+	step_end
+
+Movement_167C6C:: @ 8167C6C
+	step_10
+	step_10
+	step_13
+	step_30
+	step_end
+
+Movement_167C71:: @ 8167C71
+	step_10
+	step_10
+	step_13
+	step_13
+	step_30
+	step_end
+
+ThreeIsland_EventScript_167C77:: @ 8167C77
+	msgbox gUnknown_81828EB, 2
+	end
+
+ThreeIsland_EventScript_167C80:: @ 8167C80
+	msgbox gUnknown_818298A, 2
+	end
+
+ThreeIsland_EventScript_167C89:: @ 8167C89
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_DODUO, 0
+	msgbox gUnknown_81829F4
+	waitmoncry
+	release
+	end
+
+ThreeIsland_EventScript_167C9C:: @ 8167C9C
+	msgbox gUnknown_8182061, 3
+	end
+
+ThreeIsland_EventScript_167CA5:: @ 8167CA5
+	msgbox gUnknown_818208B, 2
+	end
diff --git a/data/maps/ThreeIsland/text.inc b/data/maps/ThreeIsland/text.inc
new file mode 100644
index 000000000..31e058a67
--- /dev/null
+++ b/data/maps/ThreeIsland/text.inc
@@ -0,0 +1,167 @@
+gUnknown_8182061:: @ 8182061
+    .string "THREE ISLAND\n"
+    .string "Kin Island of Family Bonding$"
+
+gUnknown_818208B:: @ 818208B
+    .string "Hyahoo!\p"
+    .string "From this day on, this island\n"
+    .string "belongs to us!$"
+
+gUnknown_81820C0:: @ 81820C0
+    .string "We don't need you people bringing\n"
+    .string "your noise and trouble here!\p"
+    .string "We're asking you to go back to\n"
+    .string "KANTO!$"
+
+gUnknown_8182125:: @ 8182125
+    .string "Hey, go cry somewhere else.\n"
+    .string "Our boss is on his way.\p"
+    .string "When he gets here, we'll give you\n"
+    .string "a k-rad motorbike show you won't\l"
+    .string "soon forget!$"
+
+gUnknown_81821A9:: @ 81821A9
+    .string "W-what!? Not on your life!\n"
+    .string "Get off the island now!$"
+
+gUnknown_81821DC:: @ 81821DC
+    .string "Who's gonna make me?$"
+
+gUnknown_81821F1:: @ 81821F1
+    .string "Are you the boss?\n"
+    .string "Go back to KANTO right now!$"
+
+gUnknown_818221F:: @ 818221F
+    .string "Hah?\p"
+    .string "I just got here, pal.\p"
+    .string "What's with the hostile attitude?\n"
+    .string "It's mighty cold of you!$"
+
+gUnknown_8182275:: @ 8182275
+    .string "Your gang of followers have been\n"
+    .string "raising havoc on their bikes.\p"
+    .string "Do you have any idea how much\n"
+    .string "trouble they've caused us on the\l"
+    .string "island?$"
+
+gUnknown_81822FB:: @ 81822FB
+    .string "No, man, I don't get it at all.\p"
+    .string "Look at this place.\n"
+    .string "What do you do for entertainment?\p"
+    .string "You ought to be thanking us for\n"
+    .string "livening up this sleepy village.\p"
+    .string "But hey, if you insist, you can try\n"
+    .string "making us leave.$"
+
+gUnknown_81823C7:: @ 81823C7
+    .string "Grr… You cowards…\n"
+    .string "So tough in a pack…$"
+
+gUnknown_81823ED:: @ 81823ED
+    .string "You, what are you staring at?\n"
+    .string "Don't you know it's not polite?\p"
+    .string "You wanna make something of it\n"
+    .string "or what?$"
+
+gUnknown_8182453:: @ 8182453
+    .string "That's smart.\n"
+    .string "Keep your nose out of this.$"
+
+gUnknown_818247D:: @ 818247D
+    .string "Heh, I like your guts.\n"
+    .string "You'll be losing money to me, but…$"
+
+Text_1824B7:: @ 81824B7
+    .string "Wha…\n"
+    .string "What is this kid?!$"
+
+gUnknown_81824CF:: @ 81824CF
+    .string "Aww, man…\n"
+    .string "Don't you dare laugh!$"
+
+gUnknown_81824EF:: @ 81824EF
+    .string "Aren't you from KANTO?\n"
+    .string "You should be on our side!$"
+
+Text_182521:: @ 8182521
+    .string "Stop fooling around!$"
+
+gUnknown_8182536:: @ 8182536
+    .string "What's the matter with you,\n"
+    .string "getting all hot like that?\p"
+    .string "Totally uncool, man!$"
+
+gUnknown_8182582:: @ 8182582
+    .string "We invited the boss out here,\n"
+    .string "but you had to mess it up!\p"
+    .string "You embarrassed us, man!$"
+
+Text_1825D4:: @ 81825D4
+    .string "… … …   … … …$"
+
+gUnknown_81825E2:: @ 81825E2
+    .string "Boss, I'm telling you, you've gotta\n"
+    .string "do something about this kid!$"
+
+gUnknown_8182623:: @ 8182623
+    .string "I've been watching you, and I'd say\n"
+    .string "you've done enough.\p"
+    .string "What are you, their friend or\n"
+    .string "something?\p"
+    .string "Then I guess you'll be battling me\n"
+    .string "in their place.$"
+
+Text_1826B7:: @ 81826B7
+    .string "All right, enough!\n"
+    .string "We'll leave like you wanted!\p"
+    .string "We'll be happy to see the last of\n"
+    .string "this boring island!$"
+
+gUnknown_818271D:: @ 818271D
+    .string "Humph! Yeah, go right on hanging\n"
+    .string "around with these hayseeds!$"
+
+gUnknown_818275A:: @ 818275A
+    .string "Thank you! Those goons were\n"
+    .string "nothing but bad trouble.\p"
+    .string "Oh, look, your POKéMON got hurt\n"
+    .string "on my account.$"
+
+gUnknown_81827BE:: @ 81827BE
+    .string "{PLAYER} was given\n"
+    .string "a FULL RESTORE.$"
+
+gUnknown_81827DB:: @ 81827DB
+    .string "Oh?\n"
+    .string "Your BAG is full.$"
+
+gUnknown_81827F1:: @ 81827F1
+    .string "You've got seriously impressive\n"
+    .string "POKéMON with you.$"
+
+gUnknown_8182823:: @ 8182823
+    .string "It'd be fantastic if someone as\n"
+    .string "strong as you lived here.\p"
+    .string "I hope you'll at least stay here\n"
+    .string "a while.\p"
+    .string "…I beg your pardon?\n"
+    .string "You're looking for LOSTELLE?\p"
+    .string "LOSTELLE went off towards BOND\n"
+    .string "BRIDGE a while ago.$"
+
+gUnknown_81828EB:: @ 81828EB
+    .string "THREE ISLAND is actually the most\n"
+    .string "populous of the islands here.\p"
+    .string "Still, it could be less sleepy.\p"
+    .string "But I wouldn't want to see goons\n"
+    .string "like those BIKERS here again.$"
+
+gUnknown_818298A:: @ 818298A
+    .string "I'm going to train my DODUO in the\n"
+    .string "BERRY FOREST.\p"
+    .string "When it evolves, I'm going to play\n"
+    .string "a game on TWO ISLAND.$"
+
+gUnknown_81829F4:: @ 81829F4
+    .string "DODUO: Gigiih!$"
+
diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json
new file mode 100644
index 000000000..9bafdc69d
--- /dev/null
+++ b/data/maps/ThreeIsland_BerryForest/map.json
@@ -0,0 +1,356 @@
+{
+  "id": "MAP_THREE_ISLAND_BERRY_FOREST",
+  "name": "ThreeIsland_BerryForest",
+  "layout": "LAYOUT_THREE_ISLAND_BERRY_FOREST",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_BERRY_FOREST",
+  "requires_flash": false,
+  "weather": "WEATHER_CLOUDY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "17",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_163C83",
+      "flag": "122"
+    },
+    {
+      "graphics_id": "95",
+      "x": 12,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "95",
+      "x": 19,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "95",
+      "x": 23,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "95",
+      "x": 38,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "95",
+      "x": 44,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "95",
+      "x": 44,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "23"
+    },
+    {
+      "graphics_id": "95",
+      "x": 16,
+      "y": 43,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "24"
+    },
+    {
+      "graphics_id": "95",
+      "x": 17,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "25"
+    },
+    {
+      "graphics_id": "95",
+      "x": 14,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "26"
+    },
+    {
+      "graphics_id": "95",
+      "x": 11,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BDF13",
+      "flag": "27"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BED05",
+      "flag": "490"
+    },
+    {
+      "graphics_id": "92",
+      "x": 27,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BED12",
+      "flag": "491"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 43,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_1BED1F",
+      "flag": "492"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 43,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 42,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 44,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 27,
+      "elevation": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_163D31"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 39,
+      "y": 35,
+      "elevation": 0,
+      "script": "ThreeIsland_BerryForest_EventScript_163D28"
+    },
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 25,
+      "elevation": 3,
+      "item": "ITEM_RAZZ_BERRY",
+      "flag": "90",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_BLUK_BERRY",
+      "flag": "91",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 25,
+      "y": 24,
+      "elevation": 3,
+      "item": "ITEM_NANAB_BERRY",
+      "flag": "92",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 24,
+      "elevation": 3,
+      "item": "ITEM_WEPEAR_BERRY",
+      "flag": "93",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 37,
+      "y": 18,
+      "elevation": 3,
+      "item": "ITEM_ORAN_BERRY",
+      "flag": "94",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 23,
+      "elevation": 3,
+      "item": "ITEM_CHERI_BERRY",
+      "flag": "95",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 47,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_CHESTO_BERRY",
+      "flag": "96",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 7,
+      "y": 30,
+      "elevation": 3,
+      "item": "ITEM_PECHA_BERRY",
+      "flag": "97",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_RAWST_BERRY",
+      "flag": "98",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 25,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_ASPEAR_BERRY",
+      "flag": "99",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 46,
+      "y": 32,
+      "elevation": 3,
+      "item": "ITEM_PERSIM_BERRY",
+      "flag": "100",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 43,
+      "y": 16,
+      "elevation": 3,
+      "item": "ITEM_PINAP_BERRY",
+      "flag": "101",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_LUM_BERRY",
+      "flag": "102",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc
new file mode 100644
index 000000000..ec85582ef
--- /dev/null
+++ b/data/maps/ThreeIsland_BerryForest/scripts.inc
@@ -0,0 +1,65 @@
+ThreeIsland_BerryForest_MapScripts:: @ 8163C71
+	map_script 3, ThreeIsland_BerryForest_MapScript1_163C77
+	.byte 0
+
+ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77
+	setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST
+	setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6
+	end
+
+ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
+	lock
+	faceplayer
+	msgbox gUnknown_817ADD6
+	playse SE_PIN
+	applymovement 1, Movement_1A75DB
+	waitmovement 0
+	applymovement 1, Movement_163D22
+	waitmovement 0
+	msgbox gUnknown_817AE8E
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	waitse
+	playmoncry SPECIES_HYPNO, 2
+	waitmoncry
+	setwildbattle SPECIES_HYPNO, 30, ITEM_NONE
+	dowildbattle
+	special sub_8112364
+	applymovement 1, Movement_1A75E1
+	waitmovement 0
+	msgbox gUnknown_817AEE1
+	giveitem ITEM_IAPAPA_BERRY
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, EventScript_163D19
+	special sub_80CA6DC
+	msgbox gUnknown_817AF3B
+	closemessage
+	setflag FLAG_0x2A3
+	setflag FLAG_0x07A
+	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2
+	clearflag FLAG_0x075
+	warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6
+	waitstate
+	release
+	end
+
+EventScript_163D19:: @ 8163D19
+	msgbox gUnknown_817AF9F
+	return
+
+Movement_163D22:: @ 8163D22
+	step_2f
+	step_1c
+	step_30
+	step_1b
+	step_2f
+	step_end
+
+ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28
+	msgbox gUnknown_817AFD6, 3
+	end
+
+ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31
+	msgbox gUnknown_817B029, 3
+	end
diff --git a/data/maps/ThreeIsland_BerryForest/text.inc b/data/maps/ThreeIsland_BerryForest/text.inc
new file mode 100644
index 000000000..807df9c30
--- /dev/null
+++ b/data/maps/ThreeIsland_BerryForest/text.inc
@@ -0,0 +1,43 @@
+gUnknown_817ADD6:: @ 817ADD6
+    .string "LOSTELLE: Whimper… Sniff…\n"
+    .string "Oh! Please, help!\p"
+    .string "A scary POKéMON appeared there\n"
+    .string "a little while ago.\p"
+    .string "It kept scaring.\n"
+    .string "It made LOSTELLE scared.\p"
+    .string "I'm too scared to move!\n"
+    .string "But I want to go home…$"
+
+gUnknown_817AE8E:: @ 817AE8E
+    .string "Oh! Here it comes again!\n"
+    .string "No! Go away! It's scaring me!\p"
+    .string "Waaaaaaah!\n"
+    .string "I want my daddy!$"
+
+gUnknown_817AEE1:: @ 817AEE1
+    .string "Ohh! That was so scary!\n"
+    .string "Thank you!\p"
+    .string "LOSTELLE came to pick some\n"
+    .string "BERRIES.\p"
+    .string "You can have this!$"
+
+gUnknown_817AF3B:: @ 817AF3B
+    .string "What's your name?\p"
+    .string "LOSTELLE's scared, so can I go\n"
+    .string "with you to my daddy's house?\p"
+    .string "Okay!\n"
+    .string "Let's go home!$"
+
+gUnknown_817AF9F:: @ 817AF9F
+    .string "Your BERRY POUCH is full.\n"
+    .string "I guess you don't want this.$"
+
+gUnknown_817AFD6:: @ 817AFD6
+    .string "Welcome to the BERRY FOREST\p"
+    .string "Be friendly and share BERRIES with\n"
+    .string "others and POKéMON.$"
+
+gUnknown_817B029:: @ 817B029
+    .string "Beware of wild, BERRY-loving\n"
+    .string "POKéMON!$"
+
diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json
new file mode 100644
index 000000000..904817c10
--- /dev/null
+++ b/data/maps/ThreeIsland_BondBridge/map.json
@@ -0,0 +1,200 @@
+{
+  "id": "MAP_THREE_ISLAND_BOND_BRIDGE",
+  "name": "ThreeIsland_BondBridge",
+  "layout": "LAYOUT_THREE_ISLAND_BOND_BRIDGE",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_BOND_BRIDGE",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_THREE_ISLAND",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 27,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "ThreeIsland_BondBridge_EventScript_1ABF65",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "28",
+      "x": 68,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "ThreeIsland_BondBridge_EventScript_1ABFA3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "37",
+      "x": 33,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "ThreeIsland_BondBridge_EventScript_1ABFE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "37",
+      "x": 50,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "27",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "ThreeIsland_BondBridge_EventScript_1AC01F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "44",
+      "x": 36,
+      "y": 4,
+      "elevation": 1,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "ThreeIsland_BondBridge_EventScript_1AC05D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 77,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "ThreeIsland_BondBridge_EventScript_1AC09B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 78,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "ThreeIsland_BondBridge_EventScript_1AC0E1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 72,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BondBridge_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "95",
+      "x": 86,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_BondBridge_EventScript_1BDF13",
+      "flag": "19"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_BERRY_FOREST",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_BERRY_FOREST",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 7,
+      "elevation": 0,
+      "script": "ThreeIsland_BondBridge_EventScript_168777"
+    },
+    {
+      "type": "hidden_item",
+      "x": 61,
+      "y": 5,
+      "elevation": 0,
+      "item": "ITEM_MAX_REPEL",
+      "flag": "165",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 44,
+      "y": 12,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "166",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 33,
+      "y": 7,
+      "elevation": 3,
+      "item": "ITEM_STARDUST",
+      "flag": "167",
+      "unknown": 1
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 91,
+      "y": 9,
+      "elevation": 0,
+      "script": "ThreeIsland_BondBridge_EventScript_168780"
+    }
+  ]
+}
diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc
new file mode 100644
index 000000000..008e748d7
--- /dev/null
+++ b/data/maps/ThreeIsland_BondBridge/scripts.inc
@@ -0,0 +1,10 @@
+ThreeIsland_BondBridge_MapScripts:: @ 8168776
+	.byte 0
+
+ThreeIsland_BondBridge_EventScript_168777:: @ 8168777
+	msgbox gUnknown_818A210, 3
+	end
+
+ThreeIsland_BondBridge_EventScript_168780:: @ 8168780
+	msgbox gUnknown_818A223, 3
+	end
diff --git a/data/maps/ThreeIsland_BondBridge/text.inc b/data/maps/ThreeIsland_BondBridge/text.inc
new file mode 100644
index 000000000..dbf984c85
--- /dev/null
+++ b/data/maps/ThreeIsland_BondBridge/text.inc
@@ -0,0 +1,101 @@
+Text_189E42:: @ 8189E42
+    .string "The salty tang of the sea…\n"
+    .string "It tickles my heart.$"
+
+Text_189E72:: @ 8189E72
+    .string "…Sniff, sniff…\n"
+    .string "Something smells unpleasant…$"
+
+Text_189E9E:: @ 8189E9E
+    .string "Perhaps that reek is your sweaty\n"
+    .string "POKéMON's body odor…$"
+
+Text_189ED4:: @ 8189ED4
+    .string "Where are you off to in such\n"
+    .string "a hurry?$"
+
+Text_189EFA:: @ 8189EFA
+    .string "You're raising some wonderful\n"
+    .string "POKéMON.$"
+
+Text_189F21:: @ 8189F21
+    .string "If you keep going this way, you'll\n"
+    .string "eventually reach BERRY FOREST.$"
+
+Text_189F63:: @ 8189F63
+    .string "My mommy said that I can't swim\n"
+    .string "without my float ring.$"
+
+Text_189F9A:: @ 8189F9A
+    .string "Waaah!\n"
+    .string "Waaah!$"
+
+Text_189FA8:: @ 8189FA8
+    .string "This year, I'm going to finally\n"
+    .string "learn how to swim!$"
+
+Text_189FDB:: @ 8189FDB
+    .string "Yay, yay!\n"
+    .string "POKéMON!$"
+
+Text_189FEE:: @ 8189FEE
+    .string "What happens now?$"
+
+Text_18A000:: @ 818A000
+    .string "Did I just win?\n"
+    .string "Or did I lose?$"
+
+Text_18A01F:: @ 818A01F
+    .string "Oh, no, don't come here!\n"
+    .string "Please, stay away from me!$"
+
+Text_18A053:: @ 818A053
+    .string "Okay, you've won!\n"
+    .string "Now will you please go away?$"
+
+Text_18A082:: @ 818A082
+    .string "A POKéMON bit through my \n"
+    .string "swimsuit.\p"
+    .string "I can't get out of the water!$"
+
+Text_18A0C4:: @ 818A0C4
+    .string "JOY: We'll teach you what our\n"
+    .string "favorite POKéMON is!$"
+
+Text_18A0F7:: @ 818A0F7
+    .string "JOY: Ohh…\n"
+    .string "MEG!$"
+
+Text_18A106:: @ 818A106
+    .string "JOY: Wasn't that fun?\n"
+    .string "I hope we can battle again!$"
+
+Text_18A138:: @ 818A138
+    .string "JOY: I really want to battle with\n"
+    .string "MEG.\p"
+    .string "One POKéMON isn't enough.$"
+
+Text_18A179:: @ 818A179
+    .string "MEG: We'll show you our favorite\n"
+    .string "POKéMON.$"
+
+Text_18A1A3:: @ 818A1A3
+    .string "MEG: Ohh…\n"
+    .string "JOY!$"
+
+Text_18A1B2:: @ 818A1B2
+    .string "MEG: JOY, wasn't that fun?$"
+
+Text_18A1CD:: @ 818A1CD
+    .string "MEG: I want to battle together\n"
+    .string "with JOY.\p"
+    .string "One POKéMON isn't enough.$"
+
+gUnknown_818A210:: @ 818A210
+    .string "BERRY FOREST AHEAD$"
+
+gUnknown_818A223:: @ 818A223
+    .string "BOND BRIDGE\n"
+    .string "Please be quiet when crossing.\p"
+    .string "BERRY FOREST AHEAD$"
+
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json
new file mode 100644
index 000000000..3f22711d1
--- /dev/null
+++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json
@@ -0,0 +1,58 @@
+{
+  "id": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL",
+  "name": "ThreeIsland_DunsparceTunnel",
+  "layout": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_THREE_ISLE_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "27",
+      "x": 23,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_PORT",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 25,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_PORT",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 21,
+      "y": 3,
+      "elevation": 0,
+      "item": "ITEM_NUGGET",
+      "flag": "163",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
new file mode 100644
index 000000000..9fc141070
--- /dev/null
+++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
@@ -0,0 +1,56 @@
+ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26
+	map_script 3, ThreeIsland_DunsparceTunnel_MapScript1_164D2C
+	.byte 0
+
+ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C
+	setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL
+	specialvar VAR_RESULT, sub_806E25C
+	copyvar VAR_0x8008, VAR_RESULT
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_164D50
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, EventScript_164D54
+	end
+
+EventScript_164D50:: @ 8164D50
+	setmaplayoutindex LAYOUT_UNUSED_LAYOUT_83453C0
+	return
+
+EventScript_164D54:: @ 8164D54
+	setobjectxyperm 1, 6, 3
+	setobjectmovementtype 1, 10
+	return
+
+ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60
+	lock
+	faceplayer
+	checkflag FLAG_0x2E2
+	goto_if_eq EventScript_164DC2
+	specialvar VAR_RESULT, sub_806E25C
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_164D90
+	msgbox gUnknown_817D13B
+	closemessage
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_164D90:: @ 8164D90
+	msgbox gUnknown_817D1C9
+	giveitem ITEM_NUGGET
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_164DB8
+	setflag FLAG_0x2E2
+	goto EventScript_164DC2
+	end
+
+EventScript_164DB8:: @ 8164DB8
+	msgbox gUnknown_817D2DC
+	release
+	end
+
+EventScript_164DC2:: @ 8164DC2
+	msgbox gUnknown_817D28C
+	release
+	end
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/text.inc b/data/maps/ThreeIsland_DunsparceTunnel/text.inc
new file mode 100644
index 000000000..e8c5269dd
--- /dev/null
+++ b/data/maps/ThreeIsland_DunsparceTunnel/text.inc
@@ -0,0 +1,27 @@
+gUnknown_817D13B:: @ 817D13B
+    .string "Hey, there!\n"
+    .string "How's it going?\p"
+    .string "What am I doing here, you ask?\n"
+    .string "Why, I'm prospecting for gold!\p"
+    .string "When I strike it rich, I'm buying\n"
+    .string "a house in KANTO.$"
+
+gUnknown_817D1C9:: @ 817D1C9
+    .string "Hey, there! How's it going?\n"
+    .string "Did you hear? I've struck gold!\p"
+    .string "You remembered that I was\n"
+    .string "prospecting, didn't you?\p"
+    .string "You can't begin to imagine just\n"
+    .string "how happy I am.\p"
+    .string "So, I'll show you!\n"
+    .string "This is for you!$"
+
+gUnknown_817D28C:: @ 817D28C
+    .string "That's a NUGGET!\p"
+    .string "I can't give you any nuggets of\n"
+    .string "wisdom, so that'll have to do!$"
+
+gUnknown_817D2DC:: @ 817D2DC
+    .string "Whoops, your BAG is crammed full!\n"
+    .string "I'll give this to you later.$"
+
diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json
new file mode 100644
index 000000000..cd5781ee7
--- /dev/null
+++ b/data/maps/ThreeIsland_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_THREE_ISLAND_HARBOR",
+  "name": "ThreeIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_THREE_ISLE_PORT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_Harbor_EventScript_171EAA",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_PORT",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..3678385c0
--- /dev/null
+++ b/data/maps/ThreeIsland_Harbor/scripts.inc
@@ -0,0 +1,11 @@
+ThreeIsland_Harbor_MapScripts:: @ 8171EA9
+	.byte 0
+
+ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 3
+	goto EventScript_1A900F
+	end
diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json
new file mode 100644
index 000000000..b25e6eeb5
--- /dev/null
+++ b/data/maps/ThreeIsland_House1/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_THREE_ISLAND_HOUSE1",
+  "name": "ThreeIsland_House1",
+  "layout": "LAYOUT_THREE_ISLAND_HOUSE1",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "17",
+      "x": 3,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_House1_EventScript_17181A",
+      "flag": "118"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "script": "ThreeIsland_House1_EventScript_171829"
+    }
+  ]
+}
diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc
new file mode 100644
index 000000000..29952137a
--- /dev/null
+++ b/data/maps/ThreeIsland_House1/scripts.inc
@@ -0,0 +1,14 @@
+ThreeIsland_House1_MapScripts:: @ 8171819
+	.byte 0
+
+ThreeIsland_House1_EventScript_17181A:: @ 817181A
+	lock
+	faceplayer
+	special sub_80CA6DC
+	msgbox gUnknown_81A2F3E
+	release
+	end
+
+ThreeIsland_House1_EventScript_171829:: @ 8171829
+	msgbox gUnknown_81A2F92, 3
+	end
diff --git a/data/maps/ThreeIsland_House1/text.inc b/data/maps/ThreeIsland_House1/text.inc
new file mode 100644
index 000000000..250671619
--- /dev/null
+++ b/data/maps/ThreeIsland_House1/text.inc
@@ -0,0 +1,9 @@
+gUnknown_81A2F3E:: @ 81A2F3E
+    .string "LOSTELLE: Hi, {PLAYER}!\n"
+    .string "You're always so cool!\p"
+    .string "I'll make lunch for you, too, one\n"
+    .string "day, {PLAYER}.$"
+
+gUnknown_81A2F92:: @ 81A2F92
+    .string "Rare rocks and gems are displayed.$"
+
diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json
new file mode 100644
index 000000000..b8102556b
--- /dev/null
+++ b/data/maps/ThreeIsland_House2/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_THREE_ISLAND_HOUSE2",
+  "name": "ThreeIsland_House2",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "26",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_House2_EventScript_1718F9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_House2_EventScript_1718E0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc
new file mode 100644
index 000000000..297f6e3dc
--- /dev/null
+++ b/data/maps/ThreeIsland_House2/scripts.inc
@@ -0,0 +1,16 @@
+ThreeIsland_House2_MapScripts:: @ 81718DF
+	.byte 0
+
+ThreeIsland_House2_EventScript_1718E0:: @ 81718E0
+	lock
+	faceplayer
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_81A32CA
+	release
+	end
+
+ThreeIsland_House2_EventScript_1718F9:: @ 81718F9
+	msgbox gUnknown_81A3245, 2
+	end
diff --git a/data/maps/ThreeIsland_House2/text.inc b/data/maps/ThreeIsland_House2/text.inc
new file mode 100644
index 000000000..cae2b9055
--- /dev/null
+++ b/data/maps/ThreeIsland_House2/text.inc
@@ -0,0 +1,17 @@
+gUnknown_81A3245:: @ 81A3245
+    .string "Urrrrrrrrgggghhhh…\n"
+    .string "Kwaaaaah!\p"
+    .string "…It's useless! I can't make this\n"
+    .string "spoon bend with my mind.\p"
+    .string "Maybe I really don't have any\n"
+    .string "psychic powers.$"
+
+gUnknown_81A32CA:: @ 81A32CA
+    .string "You know about a girl GYM LEADER\n"
+    .string "in SAFFRON CITY?\p"
+    .string "She uses PSYCHIC-type POKéMON,\n"
+    .string "right?\p"
+    .string "I admire her, I really do.\p"
+    .string "I've heard that she's one cool\n"
+    .string "customer and beautiful, too.$"
+
diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json
new file mode 100644
index 000000000..6f4b8c555
--- /dev/null
+++ b/data/maps/ThreeIsland_House3/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_THREE_ISLAND_HOUSE3",
+  "name": "ThreeIsland_House3",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "29",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_House3_EventScript_171903",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc
new file mode 100644
index 000000000..7ad4b0da0
--- /dev/null
+++ b/data/maps/ThreeIsland_House3/scripts.inc
@@ -0,0 +1,6 @@
+ThreeIsland_House3_MapScripts:: @ 8171902
+	.byte 0
+
+ThreeIsland_House3_EventScript_171903:: @ 8171903
+	msgbox gUnknown_81A3379, 2
+	end
diff --git a/data/maps/ThreeIsland_House3/text.inc b/data/maps/ThreeIsland_House3/text.inc
new file mode 100644
index 000000000..24b2c86c9
--- /dev/null
+++ b/data/maps/ThreeIsland_House3/text.inc
@@ -0,0 +1,5 @@
+gUnknown_81A3379:: @ 81A3379
+    .string "I bought this house because I\n"
+    .string "wanted to live somewhere quiet.\p"
+    .string "Today, I think I'll go out fishing.$"
+
diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json
new file mode 100644
index 000000000..277a4bdc5
--- /dev/null
+++ b/data/maps/ThreeIsland_House4/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_THREE_ISLAND_HOUSE4",
+  "name": "ThreeIsland_House4",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_House4_EventScript_17190D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "16",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_House4_EventScript_171916",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc
new file mode 100644
index 000000000..6bb77d0bc
--- /dev/null
+++ b/data/maps/ThreeIsland_House4/scripts.inc
@@ -0,0 +1,10 @@
+ThreeIsland_House4_MapScripts:: @ 817190C
+	.byte 0
+
+ThreeIsland_House4_EventScript_17190D:: @ 817190D
+	msgbox gUnknown_81A33DB, 2
+	end
+
+ThreeIsland_House4_EventScript_171916:: @ 8171916
+	msgbox gUnknown_81A342F, 2
+	end
diff --git a/data/maps/ThreeIsland_House4/text.inc b/data/maps/ThreeIsland_House4/text.inc
new file mode 100644
index 000000000..a32fb6a5f
--- /dev/null
+++ b/data/maps/ThreeIsland_House4/text.inc
@@ -0,0 +1,10 @@
+gUnknown_81A33DB:: @ 81A33DB
+    .string "You must never, ever go out to\n"
+    .string "the BERRY FOREST alone.\p"
+    .string "Why?\n"
+    .string "There are ghosts there.$"
+
+gUnknown_81A342F:: @ 81A342F
+    .string "Papa keeps lying to me, and won't\n"
+    .string "let me go out and play!$"
+
diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json
new file mode 100644
index 000000000..264b6cbcb
--- /dev/null
+++ b/data/maps/ThreeIsland_House5/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_THREE_ISLAND_HOUSE5",
+  "name": "ThreeIsland_House5",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "17",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_House5_EventScript_171920",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc
new file mode 100644
index 000000000..d93696c0a
--- /dev/null
+++ b/data/maps/ThreeIsland_House5/scripts.inc
@@ -0,0 +1,16 @@
+ThreeIsland_House5_MapScripts:: @ 817191F
+	.byte 0
+
+ThreeIsland_House5_EventScript_171920:: @ 8171920
+	lock
+	faceplayer
+	checkflag FLAG_0x2A3
+	goto_if_eq EventScript_171935
+	msgbox gUnknown_81A3469
+	release
+	end
+
+EventScript_171935:: @ 8171935
+	msgbox gUnknown_81A34DB
+	release
+	end
diff --git a/data/maps/ThreeIsland_House5/text.inc b/data/maps/ThreeIsland_House5/text.inc
new file mode 100644
index 000000000..16a034922
--- /dev/null
+++ b/data/maps/ThreeIsland_House5/text.inc
@@ -0,0 +1,12 @@
+gUnknown_81A3469:: @ 81A3469
+    .string "Me?\n"
+    .string "I'm not LOSTELLE.\p"
+    .string "She's probably gone to the\n"
+    .string "BERRY FOREST, I think.\p"
+    .string "She picks BERRIES there for making\n"
+    .string "lunch.$"
+
+gUnknown_81A34DB:: @ 81A34DB
+    .string "I think I'll go play with LOSTELLE\n"
+    .string "today.$"
+
diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json
new file mode 100644
index 000000000..f8cd93f18
--- /dev/null
+++ b/data/maps/ThreeIsland_Mart/map.json
@@ -0,0 +1,80 @@
+{
+  "id": "MAP_THREE_ISLAND_MART",
+  "name": "ThreeIsland_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_Mart_EventScript_17188D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_Mart_EventScript_1718C4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_Mart_EventScript_1718CD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_Mart_EventScript_1718D6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc
new file mode 100644
index 000000000..6986607e3
--- /dev/null
+++ b/data/maps/ThreeIsland_Mart/scripts.inc
@@ -0,0 +1,39 @@
+ThreeIsland_Mart_MapScripts:: @ 817188C
+	.byte 0
+
+ThreeIsland_Mart_EventScript_17188D:: @ 817188D
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_1718B4
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_1718B4:: @ 81718B4
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4
+	msgbox gUnknown_81A3114, 2
+	end
+
+ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD
+	msgbox gUnknown_81A315C, 2
+	end
+
+ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6
+	msgbox gUnknown_81A31F0, 2
+	end
diff --git a/data/maps/ThreeIsland_Mart/text.inc b/data/maps/ThreeIsland_Mart/text.inc
new file mode 100644
index 000000000..2618bf28e
--- /dev/null
+++ b/data/maps/ThreeIsland_Mart/text.inc
@@ -0,0 +1,17 @@
+gUnknown_81A3114:: @ 81A3114
+    .string "Is it true?\p"
+    .string "CELADON DEPT. STORE is several\n"
+    .string "times bigger than this shop?$"
+
+gUnknown_81A315C:: @ 81A315C
+    .string "I sometimes buy medicine here.\p"
+    .string "But a lot of people heal POKéMON\n"
+    .string "with BERRIES from BERRY FOREST.\p"
+    .string "After all, BERRIES are free and\n"
+    .string "they never run out.$"
+
+gUnknown_81A31F0:: @ 81A31F0
+    .string "Those BIKERS were about to trash\n"
+    .string "this POKéMON MART.\p"
+    .string "Am I glad they decided to leave!$"
+
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..603c14528
--- /dev/null
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
@@ -0,0 +1,87 @@
+{
+  "id": "MAP_THREE_ISLAND_POKEMON_CENTER_1F",
+  "name": "ThreeIsland_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_PokemonCenter_1F_EventScript_171841",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_PokemonCenter_1F_EventScript_17185C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_PokemonCenter_1F_EventScript_171853",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_PokemonCenter_1F_EventScript_17184A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..559b2a03c
--- /dev/null
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,27 @@
+ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832
+	map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D
+	map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D
+	setrespawn SPAWN_THREE_ISLAND
+	end
+
+ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A
+	msgbox gUnknown_81A303B, 2
+	end
+
+ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853
+	msgbox gUnknown_81A30A3, 2
+	end
+
+ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C
+	msgbox gUnknown_81A2FB5, 2
+	end
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..449f80d70
--- /dev/null
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc
@@ -0,0 +1,19 @@
+gUnknown_81A2FB5:: @ 81A2FB5
+    .string "Hey, did you hear the news?\p"
+    .string "The PC network here can now link\n"
+    .string "with PCs in KANTO.\p"
+    .string "I don't know how that came about,\n"
+    .string "but it's fantastic!$"
+
+gUnknown_81A303B:: @ 81A303B
+    .string "It's impossible to SURF between the\n"
+    .string "islands around these parts.\p"
+    .string "The tides are too fast and\n"
+    .string "treacherous.$"
+
+gUnknown_81A30A3:: @ 81A30A3
+    .string "Let's crush BERRIES!\n"
+    .string "…That'd be wasting BERRIES?\p"
+    .string "You can always find some BERRIES\n"
+    .string "on the ground in BERRY FOREST.$"
+
diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..70b900e08
--- /dev/null
+++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_THREE_ISLAND_POKEMON_CENTER_2F",
+  "name": "ThreeIsland_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_THREE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..dfb7db871
--- /dev/null
+++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865
+	map_script 2, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A
+	call EventScript_1BB4A3
+	end
+
+EventScript_171880:: @ 8171880
+	call EventScript_1BB6AB
+	end
+
+EventScript_171886:: @ 8171886
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json
new file mode 100644
index 000000000..c40740fee
--- /dev/null
+++ b/data/maps/ThreeIsland_Port/map.json
@@ -0,0 +1,87 @@
+{
+  "id": "MAP_THREE_ISLAND_PORT",
+  "name": "ThreeIsland_Port",
+  "layout": "LAYOUT_THREE_ISLAND_PORT",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_THREE_ISLE_PORT",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_THREE_ISLAND",
+      "offset": 0,
+      "direction": "up"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "31",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_Port_EventScript_168796",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "28",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_Port_EventScript_1687CC",
+      "flag": "121"
+    },
+    {
+      "graphics_id": "53",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "49",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ThreeIsland_Port_EventScript_1687D5",
+      "flag": "121"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 38,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_THREE_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc
new file mode 100644
index 000000000..8fb20ce26
--- /dev/null
+++ b/data/maps/ThreeIsland_Port/scripts.inc
@@ -0,0 +1,39 @@
+ThreeIsland_Port_MapScripts:: @ 8168789
+	map_script 3, ThreeIsland_Port_MapScript1_16878F
+	.byte 0
+
+ThreeIsland_Port_MapScript1_16878F:: @ 816878F
+	clearflag FLAG_0x841
+	setflag FLAG_0x2A1
+	end
+
+ThreeIsland_Port_EventScript_168796:: @ 8168796
+	lock
+	faceplayer
+	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2
+	goto_if 4, EventScript_1687B8
+	compare_var_to_value VAR_0x407B, 4
+	goto_if 4, EventScript_1687C2
+	msgbox gUnknown_818A307
+	release
+	end
+
+EventScript_1687B8:: @ 81687B8
+	msgbox gUnknown_818A38B
+	release
+	end
+
+EventScript_1687C2:: @ 81687C2
+	msgbox gUnknown_818A339
+	release
+	end
+
+ThreeIsland_Port_EventScript_1687CC:: @ 81687CC
+	msgbox gUnknown_818A261, 2
+	end
+
+ThreeIsland_Port_EventScript_1687D5:: @ 81687D5
+	lock
+	msgbox gUnknown_818A2D8
+	release
+	end
diff --git a/data/maps/ThreeIsland_Port/text.inc b/data/maps/ThreeIsland_Port/text.inc
new file mode 100644
index 000000000..e98d5f53c
--- /dev/null
+++ b/data/maps/ThreeIsland_Port/text.inc
@@ -0,0 +1,26 @@
+gUnknown_818A261:: @ 818A261
+    .string "We're the KANTO RIDER FEDERATION!\n"
+    .string "Vroom! Vavavavooom! Vroom!\p"
+    .string "My bike's wimpy, so I have to\n"
+    .string "make exhaust noises myself!$"
+
+gUnknown_818A2D8:: @ 818A2D8
+    .string "Hey, hey, lady!\n"
+    .string "Fork over some spending money!$"
+
+gUnknown_818A307:: @ 818A307
+    .string "Aiyeeh!\p"
+    .string "Wh-who are you?!\n"
+    .string "I… I'll call the police!$"
+
+gUnknown_818A339:: @ 818A339
+    .string "Those BIKERS…\n"
+    .string "Are they gone?\p"
+    .string "Oh, thank goodness!\n"
+    .string "They certainly had me terrified!$"
+
+gUnknown_818A38B:: @ 818A38B
+    .string "Those BIKERS ran off, and\n"
+    .string "LOSTELLE was found safe.\p"
+    .string "Everything turned out for the best!$"
+
diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
new file mode 100644
index 000000000..17826d8fd
--- /dev/null
+++ b/data/maps/TwoIsland/map.json
@@ -0,0 +1,194 @@
+{
+  "id": "MAP_TWO_ISLAND",
+  "name": "TwoIsland",
+  "layout": "LAYOUT_TWO_ISLAND",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_TWO_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_TWO_ISLAND_CAPE_BRINK",
+      "offset": 24,
+      "direction": "up"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 28,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_16760F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 31,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_167755",
+      "flag": "123"
+    },
+    {
+      "graphics_id": "29",
+      "x": 30,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_16775E",
+      "flag": "124"
+    },
+    {
+      "graphics_id": "62",
+      "x": 26,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_16774C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 27,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_167777",
+      "flag": "125"
+    },
+    {
+      "graphics_id": "95",
+      "x": 30,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "92",
+      "x": 39,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_1BEAAF",
+      "flag": "442"
+    },
+    {
+      "graphics_id": "16",
+      "x": 37,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_167789",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 24,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_167780",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 39,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 33,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_TWO_ISLAND_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 21,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_TWO_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 8,
+      "elevation": 0,
+      "script": "TwoIsland_EventScript_167792"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 40,
+      "y": 10,
+      "elevation": 0,
+      "script": "TwoIsland_EventScript_16779B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 3,
+      "elevation": 0,
+      "script": "TwoIsland_EventScript_1677A4"
+    }
+  ]
+}
diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc
new file mode 100644
index 000000000..a9a42eda5
--- /dev/null
+++ b/data/maps/TwoIsland/scripts.inc
@@ -0,0 +1,241 @@
+TwoIsland_MapScripts:: @ 8167564
+	map_script 3, TwoIsland_MapScript1_16756A
+	.byte 0
+
+TwoIsland_MapScript1_16756A:: @ 816756A
+	setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND
+	setflag FLAG_0x2A2
+	call EventScript_167576
+	end
+
+EventScript_167576:: @ 8167576
+	checkflag FLAG_0x844
+	goto_if_eq EventScript_167597
+	checkflag FLAG_0x82C
+	goto_if_eq EventScript_1675B8
+	checkflag FLAG_0x2A3
+	goto_if_eq EventScript_1675D9
+	goto EventScript_1675E8
+	end
+
+EventScript_167597:: @ 8167597
+	checkflag FLAG_0x29D
+	goto_if 0, EventScript_1675EE
+	checkflag FLAG_0x29E
+	goto_if 0, EventScript_1675F4
+	checkflag FLAG_0x29F
+	goto_if 0, EventScript_1675FD
+	goto EventScript_167606
+	end
+
+EventScript_1675B8:: @ 81675B8
+	checkflag FLAG_0x29D
+	goto_if 0, EventScript_1675EE
+	checkflag FLAG_0x2A3
+	goto_if 0, EventScript_1675EE
+	checkflag FLAG_0x29E
+	goto_if 0, EventScript_1675F4
+	goto EventScript_1675FD
+	end
+
+EventScript_1675D9:: @ 81675D9
+	checkflag FLAG_0x29D
+	goto_if 0, EventScript_1675EE
+	goto EventScript_1675F4
+	end
+
+EventScript_1675E8:: @ 81675E8
+	goto EventScript_1675EE
+	end
+
+EventScript_1675EE:: @ 81675EE
+	setvar VAR_0x4078, 1
+	return
+
+EventScript_1675F4:: @ 81675F4
+	setvar VAR_0x4078, 2
+	clearflag FLAG_0x07B
+	return
+
+EventScript_1675FD:: @ 81675FD
+	setvar VAR_0x4078, 3
+	clearflag FLAG_0x07C
+	return
+
+EventScript_167606:: @ 8167606
+	setvar VAR_0x4078, 4
+	clearflag FLAG_0x07D
+	return
+
+TwoIsland_EventScript_16760F:: @ 816760F
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4078, 4
+	goto_if_eq EventScript_167646
+	compare_var_to_value VAR_0x4078, 3
+	goto_if_eq EventScript_16765E
+	compare_var_to_value VAR_0x4078, 2
+	goto_if_eq EventScript_167676
+	goto EventScript_16768E
+	end
+
+EventScript_167646:: @ 8167646
+	checkflag FLAG_0x2A0
+	goto_if_eq EventScript_1676A6
+	setflag FLAG_0x2A0
+	message Text_181CAE
+	waitmessage
+	goto EventScript_167728
+	end
+
+EventScript_16765E:: @ 816765E
+	checkflag FLAG_0x29F
+	goto_if_eq EventScript_1676A6
+	setflag FLAG_0x29F
+	message Text_181C77
+	waitmessage
+	goto EventScript_167708
+	end
+
+EventScript_167676:: @ 8167676
+	checkflag FLAG_0x29E
+	goto_if_eq EventScript_1676A6
+	setflag FLAG_0x29E
+	message Text_181B7C
+	waitmessage
+	goto EventScript_1676EC
+	end
+
+EventScript_16768E:: @ 816768E
+	checkflag FLAG_0x29D
+	goto_if_eq EventScript_1676A6
+	setflag FLAG_0x29D
+	message Text_181AFE
+	waitmessage
+	goto EventScript_1676D3
+	end
+
+EventScript_1676A6:: @ 81676A6
+	message Text_1A6211
+	waitmessage
+	compare_var_to_value VAR_0x4078, 4
+	goto_if_eq EventScript_167728
+	compare_var_to_value VAR_0x4078, 3
+	goto_if_eq EventScript_167708
+	compare_var_to_value VAR_0x4078, 2
+	goto_if_eq EventScript_1676EC
+	goto EventScript_1676D3
+	end
+
+EventScript_1676D3:: @ 81676D3
+	pokemart Items_1676E4
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_1676E4:: @ 81676E4
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_FRESH_WATER
+	.2byte ITEM_NONE
+	release
+	end
+
+EventScript_1676EC:: @ 81676EC
+	pokemart Items_1676FC
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_1676FC:: @ 81676FC
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_SODA_POP
+	.2byte ITEM_FRESH_WATER
+	.2byte ITEM_NONE
+	release
+	end
+
+EventScript_167708:: @ 8167708
+	pokemart Items_167718
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_167718:: @ 8167718
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_LEMONADE
+	.2byte ITEM_SODA_POP
+	.2byte ITEM_FRESH_WATER
+	.2byte ITEM_MOOMOO_MILK
+	.2byte ITEM_NONE
+	release
+	end
+
+EventScript_167728:: @ 8167728
+	pokemart Items_167738
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_167738:: @ 8167738
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_REPEAT_BALL
+	.2byte ITEM_TIMER_BALL
+	.2byte ITEM_LEMONADE
+	.2byte ITEM_SODA_POP
+	.2byte ITEM_FRESH_WATER
+	.2byte ITEM_MOOMOO_MILK
+	.2byte ITEM_LAVA_COOKIE
+	.2byte ITEM_NONE
+	release
+	end
+
+TwoIsland_EventScript_16774C:: @ 816774C
+	msgbox gUnknown_8181D2F, 2
+	end
+
+TwoIsland_EventScript_167755:: @ 8167755
+	msgbox gUnknown_8181DCA, 2
+	end
+
+TwoIsland_EventScript_16775E:: @ 816775E
+	lock
+	faceplayer
+	setvar VAR_0x8004, 10
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8181E47
+	release
+	end
+
+TwoIsland_EventScript_167777:: @ 8167777
+	msgbox gUnknown_8181F28, 2
+	end
+
+TwoIsland_EventScript_167780:: @ 8167780
+	msgbox gUnknown_8181F5D, 2
+	end
+
+TwoIsland_EventScript_167789:: @ 8167789
+	msgbox gUnknown_8181FCE, 2
+	end
+
+TwoIsland_EventScript_167792:: @ 8167792
+	msgbox gUnknown_8181A88, 3
+	end
+
+TwoIsland_EventScript_16779B:: @ 816779B
+	msgbox gUnknown_8181AA7, 3
+	end
+
+TwoIsland_EventScript_1677A4:: @ 81677A4
+	msgbox gUnknown_8181AC8, 3
+	end
diff --git a/data/maps/TwoIsland/text.inc b/data/maps/TwoIsland/text.inc
new file mode 100644
index 000000000..fca7d80ee
--- /dev/null
+++ b/data/maps/TwoIsland/text.inc
@@ -0,0 +1,86 @@
+gUnknown_8181A88:: @ 8181A88
+    .string "TWO ISLAND\n"
+    .string "Boon Island for Two$"
+
+gUnknown_8181AA7:: @ 8181AA7
+    .string "Skip & Chomp!\n"
+    .string "Joyful GAME CORNER$"
+
+gUnknown_8181AC8:: @ 8181AC8
+    .string "DANGER! FAST CURRENT!\n"
+    .string "Fishing and surfing prohibited!$"
+
+Text_181AFE:: @ 8181AFE
+    .string "Oh!\n"
+    .string "Hello, welcome to my shop!\p"
+    .string "We've only opened up recently.\p"
+    .string "Our merchandise is limited, but I\n"
+    .string "hope we can serve your needs.$"
+
+Text_181B7C:: @ 8181B7C
+    .string "I can't tell you how grateful I am\n"
+    .string "for your rescue of LOSTELLE.\p"
+    .string "Thanks to your feat, the people of\n"
+    .string "THREE ISLAND have changed their\l"
+    .string "attitudes about KANTO people.\p"
+    .string "And, I'm from KANTO, you see.\p"
+    .string "The people of THREE ISLAND\n"
+    .string "helped me add to my merchandise.$"
+
+Text_181C77:: @ 8181C77
+    .string "Hi! I'm giving it my best here.\n"
+    .string "I hope you do too, {PLAYER}.$"
+
+Text_181CAE:: @ 8181CAE
+    .string "Oh, hello, {PLAYER}!\n"
+    .string "Welcome!\p"
+    .string "I've started bringing in items from\n"
+    .string "distant lands.\p"
+    .string "I've got some rare items in, too.\n"
+    .string "Please have a look!$"
+
+gUnknown_8181D2F:: @ 8181D2F
+    .string "That fellow there, he moved here\n"
+    .string "from CELADON CITY.\p"
+    .string "He started up a shop with his\n"
+    .string "younger brother.\p"
+    .string "You have to wonder if he knew what\n"
+    .string "he was getting into.$"
+
+gUnknown_8181DCA:: @ 8181DCA
+    .string "The shopkeeper's brother took\n"
+    .string "a job at the GAME CORNER.\p"
+    .string "He's trying to pull together money\n"
+    .string "so they can buy more merchandise.$"
+
+gUnknown_8181E47:: @ 8181E47
+    .string "Listen, listen.\n"
+    .string "Did you know?\p"
+    .string "A famous TRAINER came to the\n"
+    .string "ISLAND a little while back.\p"
+    .string "He's one of the ELITE FOUR.\n"
+    .string "His name is BRUNO.\p"
+    .string "He went away disappointed when he\n"
+    .string "found out that they were all sold\l"
+    .string "out of Rage Candybars.$"
+
+gUnknown_8181F28:: @ 8181F28
+    .string "The discerning TRAINER knows to\n"
+    .string "buy rare items here!$"
+
+gUnknown_8181F5D:: @ 8181F5D
+    .string "There's an old woman who lives in\n"
+    .string "a cottage out on the cape.\p"
+    .string "She gives the eye to POKéMON.\n"
+    .string "It's a bit unnerving.$"
+
+gUnknown_8181FCE:: @ 8181FCE
+    .string "Boing! Boing!\n"
+    .string "Have you tried the jumping game?\p"
+    .string "The POKéMON you can enter…\n"
+    .string "Boing!\p"
+    .string "Some go boing!\p"
+    .string "And some go boooooooing!\p"
+    .string "Did you know that?\n"
+    .string "Boing!$"
+
diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json
new file mode 100644
index 000000000..1661ef953
--- /dev/null
+++ b/data/maps/TwoIsland_CapeBrink/map.json
@@ -0,0 +1,52 @@
+{
+  "id": "MAP_TWO_ISLAND_CAPE_BRINK",
+  "name": "TwoIsland_CapeBrink",
+  "layout": "LAYOUT_TWO_ISLAND_CAPE_BRINK",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_CAPE_BRINK",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_TWO_ISLAND",
+      "offset": -24,
+      "direction": "down"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 28,
+      "elevation": 3,
+      "item": "ITEM_PP_MAX",
+      "flag": "161",
+      "unknown": 129
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "111",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/TwoIsland_CapeBrink/scripts.inc b/data/maps/TwoIsland_CapeBrink/scripts.inc
new file mode 100644
index 000000000..243c440da
--- /dev/null
+++ b/data/maps/TwoIsland_CapeBrink/scripts.inc
@@ -0,0 +1,2 @@
+TwoIsland_CapeBrink_MapScripts:: @ 8168775
+	.byte 0
diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json
new file mode 100644
index 000000000..12c9ff372
--- /dev/null
+++ b/data/maps/TwoIsland_CapeBrink_House/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE",
+  "name": "TwoIsland_CapeBrink_House",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_CAPE_BRINK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "58",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_CapeBrink_House_EventScript_1C4DEC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_TWO_ISLAND_CAPE_BRINK",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/TwoIsland_CapeBrink_House/scripts.inc b/data/maps/TwoIsland_CapeBrink_House/scripts.inc
new file mode 100644
index 000000000..efba30945
--- /dev/null
+++ b/data/maps/TwoIsland_CapeBrink_House/scripts.inc
@@ -0,0 +1,2 @@
+TwoIsland_CapeBrink_House_MapScripts:: @ 817206B
+	.byte 0
diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json
new file mode 100644
index 000000000..29fe94fc7
--- /dev/null
+++ b/data/maps/TwoIsland_Harbor/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_TWO_ISLAND_HARBOR",
+  "name": "TwoIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_TWO_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "108",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_Harbor_EventScript_171806",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_TWO_ISLAND",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..0fd4e9789
--- /dev/null
+++ b/data/maps/TwoIsland_Harbor/scripts.inc
@@ -0,0 +1,11 @@
+TwoIsland_Harbor_MapScripts:: @ 8171805
+	.byte 0
+
+TwoIsland_Harbor_EventScript_171806:: @ 8171806
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, 2
+	goto EventScript_1A8F54
+	end
diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json
new file mode 100644
index 000000000..9289eb6b1
--- /dev/null
+++ b/data/maps/TwoIsland_House/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_TWO_ISLAND_HOUSE",
+  "name": "TwoIsland_House",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_TWO_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "27",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_House_EventScript_171619",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_TWO_ISLAND",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc
new file mode 100644
index 000000000..0f940dd39
--- /dev/null
+++ b/data/maps/TwoIsland_House/scripts.inc
@@ -0,0 +1,132 @@
+TwoIsland_House_MapScripts:: @ 8171618
+	.byte 0
+
+TwoIsland_House_EventScript_171619:: @ 8171619
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	lock
+	faceplayer
+	clearflag FLAG_0x002
+	clearflag FLAG_0x003
+	clearflag FLAG_0x004
+	checkflag FLAG_0x001
+	goto_if_eq EventScript_17164F
+	msgbox gUnknown_81A2B88
+	setflag FLAG_0x001
+	goto EventScript_17164F
+	end
+
+EventScript_17164F:: @ 817164F
+	checkitem ITEM_BIG_MUSHROOM, 1
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_1717A8
+	checkitem ITEM_TINY_MUSHROOM, 2
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, EventScript_1717AC
+	checkflag FLAG_0x002
+	goto_if_eq EventScript_171687
+	checkflag FLAG_0x003
+	goto_if_eq EventScript_171696
+	goto EventScript_17179E
+	end
+
+EventScript_171687:: @ 8171687
+	checkflag FLAG_0x003
+	call_if 1, EventScript_1717B0
+	goto EventScript_1716A5
+	end
+
+EventScript_171696:: @ 8171696
+	checkflag FLAG_0x002
+	call_if 1, EventScript_1717B0
+	goto EventScript_1716A5
+	end
+
+EventScript_1716A5:: @ 81716A5
+	msgbox gUnknown_81A2C63, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_17179E
+	goto EventScript_1716BE
+	end
+
+EventScript_1716BE:: @ 81716BE
+	msgbox gUnknown_81A2CC3
+	special sub_80BF93C
+	waitstate
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_17179E
+	special sub_80BFC14
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_171790
+	compare_var_to_value VAR_0x8005, 0
+	goto_if_eq EventScript_171782
+	goto EventScript_1716F4
+	end
+
+EventScript_1716F4:: @ 81716F4
+	msgbox gUnknown_81A2CE1
+	special sub_80E4634
+	waitstate
+	compare_var_to_value VAR_0x8004, 0
+	goto_if_eq EventScript_1716BE
+	checkflag FLAG_0x004
+	goto_if_eq EventScript_17175B
+	checkflag FLAG_0x002
+	goto_if_eq EventScript_171727
+	checkflag FLAG_0x003
+	goto_if_eq EventScript_171741
+	end
+
+EventScript_171727:: @ 8171727
+	removeitem ITEM_BIG_MUSHROOM, 1
+	textcolor 3
+	msgbox gUnknown_81A2DB3
+	call EventScript_1A6675
+	goto EventScript_17179E
+	end
+
+EventScript_171741:: @ 8171741
+	removeitem ITEM_TINY_MUSHROOM, 2
+	textcolor 3
+	msgbox gUnknown_81A2D85
+	call EventScript_1A6675
+	goto EventScript_17179E
+	end
+
+EventScript_17175B:: @ 817175B
+	message Text_1A2D43
+	waitmessage
+	multichoice 0, 0, 51, 1
+	switch VAR_RESULT
+	case 0, EventScript_171741
+	case 1, EventScript_171727
+	end
+
+EventScript_171782:: @ 8171782
+	msgbox gUnknown_81A2CFC
+	goto EventScript_1716BE
+	end
+
+EventScript_171790:: @ 8171790
+	msgbox gUnknown_81A2E20
+	goto EventScript_1716BE
+	end
+
+EventScript_17179E:: @ 817179E
+	msgbox gUnknown_81A2DE0
+	release
+	end
+
+EventScript_1717A8:: @ 81717A8
+	setflag FLAG_0x002
+	return
+
+EventScript_1717AC:: @ 81717AC
+	setflag FLAG_0x003
+	return
+
+EventScript_1717B0:: @ 81717B0
+	setflag FLAG_0x004
+	return
diff --git a/data/maps/TwoIsland_House/text.inc b/data/maps/TwoIsland_House/text.inc
new file mode 100644
index 000000000..0f0aeda5e
--- /dev/null
+++ b/data/maps/TwoIsland_House/text.inc
@@ -0,0 +1,47 @@
+gUnknown_81A2B88:: @ 81A2B88
+    .string "I'm the POKéMON MOVE MANIAC.\p"
+    .string "I know every single move that\n"
+    .string "POKéMON learn growing up.\p"
+    .string "I'm also a mushroom maniac.\p"
+    .string "Bring me two TINYMUSHROOMS,\n"
+    .string "or one BIG MUSHROOM.\p"
+    .string "If you do that for me, I'll teach\n"
+    .string "a move to one POKéMON.$"
+
+gUnknown_81A2C63:: @ 81A2C63
+    .string "Sniff, sniff…\n"
+    .string "Hm! You smell of MUSHROOMS!\p"
+    .string "Do you want me to teach a move\n"
+    .string "to a POKéMON of yours?$"
+
+gUnknown_81A2CC3:: @ 81A2CC3
+    .string "Which POKéMON needs tutoring?$"
+
+gUnknown_81A2CE1:: @ 81A2CE1
+    .string "Which move should I teach?$"
+
+gUnknown_81A2CFC:: @ 81A2CFC
+    .string "Sorry…\p"
+    .string "It doesn't appear as if I have a\n"
+    .string "move I can teach that POKéMON.$"
+
+Text_1A2D43:: @ 81A2D43
+    .string "Then, I'll need a MUSHROOM or two.\n"
+    .string "What are you going to give me?$"
+
+gUnknown_81A2D85:: @ 81A2D85
+    .string "{PLAYER} handed over two\n"
+    .string "TINYMUSHROOMS in exchange.$"
+
+gUnknown_81A2DB3:: @ 81A2DB3
+    .string "{PLAYER} handed over one\n"
+    .string "BIG MUSHROOM in exchange.$"
+
+gUnknown_81A2DE0:: @ 81A2DE0
+    .string "If your POKéMON need to learn a\n"
+    .string "move, I need a MUSHROOM or two.$"
+
+gUnknown_81A2E20:: @ 81A2E20
+    .string "Hunh? There isn't a single move\n"
+    .string "that I can teach an EGG.$"
+
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json
new file mode 100644
index 000000000..1017feaef
--- /dev/null
+++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER",
+  "name": "TwoIsland_JoyfulGameCorner",
+  "layout": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER",
+  "music": "BGM_FRLG_GAMECORNER",
+  "region_map_section": "MAPSEC_TWO_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 5,
+      "y": 5,
+      "elevation": 1,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_17155F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "116"
+    },
+    {
+      "graphics_id": "17",
+      "x": 6,
+      "y": 5,
+      "elevation": 1,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C",
+      "flag": "117"
+    },
+    {
+      "graphics_id": "25",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_171535",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_TWO_ISLAND",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2E7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 0,
+      "y": 1,
+      "elevation": 0,
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC"
+    }
+  ]
+}
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
new file mode 100644
index 000000000..f478de107
--- /dev/null
+++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
@@ -0,0 +1,196 @@
+TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
+	map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5
+	map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404
+	map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B
+	map_script 1, TwoIsland_JoyfulGameCorner_MapScript4_1BB237
+	.byte 0
+
+TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5
+	checkflag FLAG_0x2FB
+	call_if 1, EventScript_1713EF
+	end
+
+EventScript_1713EF:: @ 81713EF
+	setobjectxyperm 1, 6, 2
+	setobjectmovementtype 1, 8
+	setobjectmovementtype 3, 1
+	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
+	return
+
+TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416
+	map_script_2 VAR_0x406F, 8, EventScript_1BB227
+	.2byte 0
+
+EventScript_171416:: @ 8171416
+	turnobject 255, 2
+	end
+
+TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435
+	map_script_2 VAR_0x406F, 8, EventScript_1BB2FD
+	.2byte 0
+
+EventScript_171435:: @ 8171435
+	lockall
+	textcolor 0
+	msgbox gUnknown_81A28B2
+	textcolor 1
+	special sub_80CA6DC
+	msgbox gUnknown_81A2931
+	closemessage
+	applymovement 3, Movement_1A75ED
+	waitmovement 0
+	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
+	releaseall
+	end
+
+EventScript_17145F:: @ 817145F
+	lockall
+	textcolor 0
+	applymovement 1, Movement_171520
+	waitmovement 0
+	msgbox gUnknown_81A2408
+	closemessage
+	applymovement 1, Movement_1A75ED
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Movement_1A75DB
+	waitmovement 0
+	applymovement 1, Movement_1A75DD
+	waitmovement 0
+	applymovement 1, Movement_171527
+	waitmovement 0
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	msgbox gUnknown_81A2465
+	closemessage
+	playse SE_DOOR
+	waitse
+	applymovement 255, Movement_17152C
+	waitmovement 0
+	playbgm BGM_FRLG_BOY_EYE, 0
+	addobject 2
+	applymovement 2, Movement_17152F
+	waitmovement 0
+	msgbox gUnknown_81A259A
+	applymovement 2, Movement_1A75EB
+	waitmovement 0
+	msgbox gUnknown_81A2658
+	msgbox gUnknown_81A26D5
+	closemessage
+	applymovement 2, Movement_1A75ED
+	waitmovement 0
+	playse SE_KAIDAN
+	removeobject 2
+	fadedefaultbgm
+	delay 60
+	msgbox gUnknown_81A270C
+	clearflag FLAG_0x091
+	setvar VAR_0x407B, 2
+	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1
+	releaseall
+	end
+
+Movement_171520:: @ 8171520
+	step_12
+	step_13
+	step_13
+	step_1b
+	step_2e
+	step_1c
+	step_end
+
+Movement_171527:: @ 8171527
+	step_10
+	step_10
+	step_10
+	step_2f
+	step_end
+
+Movement_17152C:: @ 817152C
+	step_12
+	step_30
+	step_end
+
+Movement_17152F:: @ 817152F
+	step_2f
+	step_1b
+	step_30
+	step_1b
+	step_2e
+	step_end
+
+TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535
+	lock
+	faceplayer
+	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
+	goto_if_eq EventScript_1BC060
+	checkflag FLAG_0x2A3
+	goto_if_eq EventScript_171555
+	msgbox gUnknown_81A285C
+	release
+	end
+
+EventScript_171555:: @ 8171555
+	msgbox gUnknown_81A288A
+	release
+	end
+
+TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F
+	lock
+	faceplayer
+	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
+	goto_if_eq EventScript_1BC0CE
+	checkflag FLAG_0x2FB
+	goto_if_eq EventScript_1715F5
+	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
+	goto_if_eq EventScript_17158A
+	msgbox gUnknown_81A2743
+	release
+	end
+
+EventScript_17158A:: @ 817158A
+	checkflag FLAG_0x2FE
+	goto_if_eq EventScript_1715C4
+	msgbox gUnknown_81A296A
+	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
+	textcolor 3
+	playfanfare MUS_ME_WAZA
+	message Text_1A29F7
+	waitmessage
+	waitfanfare
+	call EventScript_1A6675
+	removeitem ITEM_METEORITE, 1
+	msgbox gUnknown_81A2A24
+	goto EventScript_1715C4
+	end
+
+EventScript_1715C4:: @ 81715C4
+	checkitemspace ITEM_MOON_STONE, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1715FF
+	additem ITEM_MOON_STONE, 1
+	setflag FLAG_0x2FB
+	giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE
+	release
+	end
+
+EventScript_1715F5:: @ 81715F5
+	msgbox gUnknown_81A2AF5
+	release
+	end
+
+EventScript_1715FF:: @ 81715FF
+	setflag FLAG_0x2FE
+	msgbox gUnknown_81A2ACA
+	release
+	end
+
+TwoIsland_JoyfulGameCorner_EventScript_17160C:: @ 817160C
+	lock
+	faceplayer
+	msgbox gUnknown_81A2B53
+	release
+	end
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/text.inc b/data/maps/TwoIsland_JoyfulGameCorner/text.inc
new file mode 100644
index 000000000..21f6dd8ec
--- /dev/null
+++ b/data/maps/TwoIsland_JoyfulGameCorner/text.inc
@@ -0,0 +1,113 @@
+gUnknown_81A2408:: @ 81A2408
+    .string "Now, where's LOSTELLE gotten to\n"
+    .string "today?\p"
+    .string "She always brings me lunch every\n"
+    .string "day right about now…$"
+
+gUnknown_81A2465:: @ 81A2465
+    .string "Hm? You, there!\n"
+    .string "Are you a friend of LOSTELLE's?\p"
+    .string "Have you seen LOSTELLE around?\n"
+    .string "I don't know where she might be.\l"
+    .string "She should've been here long ago.\p"
+    .string "LOSTELLE's a cutie - she got my\n"
+    .string "looks - so what if someone…\p"
+    .string "What if something's happened to\n"
+    .string "my LOSTELLE?!\p"
+    .string "Please, help me find her!\n"
+    .string "Please go search THREE ISLAND!$"
+
+gUnknown_81A259A:: @ 81A259A
+    .string "Hah? What is this GAME CORNER?\n"
+    .string "How much sadder can this get?\p"
+    .string "Those clowns…\p"
+    .string "They said they'd be waiting on the\n"
+    .string "island, so where are they?\p"
+    .string "Hey, you! Is this the only THREE\n"
+    .string "ISLAND around here?$"
+
+gUnknown_81A2658:: @ 81A2658
+    .string "Try waking up before you crawl out\n"
+    .string "of bed, you punk.\p"
+    .string "This is TWO ISLAND!\p"
+    .string "Move it! Get your filthy motorbike\n"
+    .string "out of my place!$"
+
+gUnknown_81A26D5:: @ 81A26D5
+    .string "Huh…\n"
+    .string "Oh, oh, gotcha.\p"
+    .string "Tch…\n"
+    .string "These islands are confusing…$"
+
+gUnknown_81A270C:: @ 81A270C
+    .string "Would you look at that?\n"
+    .string "That punk scuffed up my floor.$"
+
+gUnknown_81A2743:: @ 81A2743
+    .string "Hey, but listen! I'm begging you,\n"
+    .string "you have to go to THREE ISLAND.\p"
+    .string "If anything were to happen to my\n"
+    .string "LOSTELLE…\p"
+    .string "My place is the house with the red\n"
+    .string "roof on THREE ISLAND.\p"
+    .string "She may just show up late here,\n"
+    .string "so I can't run off anywhere.\p"
+    .string "That's why I have to get you to do\n"
+    .string "me this big favor.$"
+
+gUnknown_81A285C:: @ 81A285C
+    .string "I'm sorry.\n"
+    .string "We're not running any games today.$"
+
+gUnknown_81A288A:: @ 81A288A
+    .string "We'll get the games going soon\n"
+    .string "for you!$"
+
+gUnknown_81A28B2:: @ 81A28B2
+    .string "So you rescued LOSTELLE?\n"
+    .string "How can I thank you?\p"
+    .string "LOSTELLE, darling, forgive me!\p"
+    .string "Daddy didn't know you were scared\n"
+    .string "and in trouble!$"
+
+gUnknown_81A2931:: @ 81A2931
+    .string "LOSTELLE: It's okay, Daddy.\n"
+    .string "I got to be friends with {PLAYER}!$"
+
+gUnknown_81A296A:: @ 81A296A
+    .string "Oh, what's that?\n"
+    .string "You're saying that this is for me?\p"
+    .string "How did you know that I love rare\n"
+    .string "rocks and gems?\p"
+    .string "You sure know how to make a guy\n"
+    .string "happy.$"
+
+Text_1A29F7:: @ 81A29F7
+    .string "{PLAYER} handed the METEORITE\n"
+    .string "to LOSTELLE's daddy.$"
+
+gUnknown_81A2A24:: @ 81A2A24
+    .string "Oh, I see, this is from BILL!\n"
+    .string "You have to thank him for me!\p"
+    .string "You know, you've been fantastic.\n"
+    .string "I want you to have this.$"
+
+gUnknown_81A2A9A:: @ 81A2A9A
+    .string "{PLAYER} received a MOON STONE\n"
+    .string "from LOSTELLE's daddy.$"
+
+gUnknown_81A2ACA:: @ 81A2ACA
+    .string "Your BAG's not going to fit another\n"
+    .string "thing…$"
+
+gUnknown_81A2AF5:: @ 81A2AF5
+    .string "All right, I'll get the GAME CORNER\n"
+    .string "running right away.\p"
+    .string "You have to come visit with a\n"
+    .string "friend.$"
+
+gUnknown_81A2B53:: @ 81A2B53
+    .string "Listen, listen!\p"
+    .string "Please show me you being cool\n"
+    .string "again!$"
+
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..f9bb96a3d
--- /dev/null
+++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json
@@ -0,0 +1,74 @@
+{
+  "id": "MAP_TWO_ISLAND_POKEMON_CENTER_1F",
+  "name": "TwoIsland_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_TWO_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717C3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "51",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717CC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717D5",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_TWO_ISLAND",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..813b5d595
--- /dev/null
+++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,23 @@
+TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4
+	map_script 3, TwoIsland_PokemonCenter_1F_MapScript1_1717BF
+	map_script 5, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF
+	setrespawn SPAWN_TWO_ISLAND
+	end
+
+TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC
+	msgbox gUnknown_81A2E59, 2
+	end
+
+TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5
+	msgbox gUnknown_81A2EBE, 2
+	end
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/text.inc b/data/maps/TwoIsland_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..514825cdf
--- /dev/null
+++ b/data/maps/TwoIsland_PokemonCenter_1F/text.inc
@@ -0,0 +1,14 @@
+gUnknown_81A2E59:: @ 81A2E59
+    .string "Have you visited the GAME CORNER\n"
+    .string "already?\p"
+    .string "It's no good to go alone.\n"
+    .string "You have to take a friend along.$"
+
+gUnknown_81A2EBE:: @ 81A2EBE
+    .string "Not many people live on\n"
+    .string "TWO ISLAND.\p"
+    .string "There is this old lady who lives\n"
+    .string "out on the cape.\p"
+    .string "She's been there since I don't know\n"
+    .string "when.$"
+
diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..719f84889
--- /dev/null
+++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_TWO_ISLAND_POKEMON_CENTER_2F",
+  "name": "TwoIsland_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_TWO_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..01954808c
--- /dev/null
+++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE
+	map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3
+	call EventScript_1BB4A3
+	end
+
+EventScript_1717F9:: @ 81717F9
+	call EventScript_1BB6AB
+	end
+
+EventScript_1717FF:: @ 81717FF
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json
new file mode 100644
index 000000000..0b2af8aab
--- /dev/null
+++ b/data/maps/UndergroundPath_EastEntrance/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE",
+  "name": "UndergroundPath_EastEntrance",
+  "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_UNDERGROUND_PATH_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UndergroundPath_EastEntrance_EventScript_160EDE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE8",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE8",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE8",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UndergroundPath_EastEntrance/scripts.inc b/data/maps/UndergroundPath_EastEntrance/scripts.inc
new file mode 100644
index 000000000..31ee9f7af
--- /dev/null
+++ b/data/maps/UndergroundPath_EastEntrance/scripts.inc
@@ -0,0 +1,6 @@
+UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD
+	.byte 0
+
+UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE
+	msgbox gUnknown_81745D9, 2
+	end
diff --git a/data/maps/UndergroundPath_EastEntrance/text.inc b/data/maps/UndergroundPath_EastEntrance/text.inc
new file mode 100644
index 000000000..f44fb5a21
--- /dev/null
+++ b/data/maps/UndergroundPath_EastEntrance/text.inc
@@ -0,0 +1,5 @@
+gUnknown_81745D9:: @ 81745D9
+    .string "The DEPARTMENT STORE in CELADON\n"
+    .string "has a great selection.\p"
+    .string "Do you go there very often?$"
+
diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json
new file mode 100644
index 000000000..8797f8e3f
--- /dev/null
+++ b/data/maps/UndergroundPath_EastWestTunnel/map.json
@@ -0,0 +1,98 @@
+{
+  "id": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL",
+  "name": "UndergroundPath_EastWestTunnel",
+  "layout": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL",
+  "music": "BGM_FRLG_ROUTE_1",
+  "region_map_section": "MAPSEC_UNDERGROUND_PATH_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 76,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_POTION",
+      "flag": "77",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_PARALYZE_HEAL",
+      "flag": "79",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 4,
+      "elevation": 3,
+      "item": "ITEM_AWAKENING",
+      "flag": "80",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 45,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_BURN_HEAL",
+      "flag": "81",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 70,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_ICE_HEAL",
+      "flag": "82",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 55,
+      "y": 2,
+      "elevation": 3,
+      "item": "ITEM_ETHER",
+      "flag": "83",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 62,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_ANTIDOTE",
+      "flag": "78",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc
new file mode 100644
index 000000000..9137a8ad1
--- /dev/null
+++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc
@@ -0,0 +1,7 @@
+UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3
+	map_script 3, UndergroundPath_EastWestTunnel_MapScript1_160ED9
+	.byte 0
+
+UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9
+	setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL
+	end
diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json
new file mode 100644
index 000000000..36ce0da5c
--- /dev/null
+++ b/data/maps/UndergroundPath_NorthEntrance/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE",
+  "name": "UndergroundPath_NorthEntrance",
+  "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_UNDERGROUND_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "17",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UndergroundPath_NorthEntrance_EventScript_160E39",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc
new file mode 100644
index 000000000..a88b1a55c
--- /dev/null
+++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc
@@ -0,0 +1,40 @@
+UndergroundPath_NorthEntrance_MapScripts:: @ 8160E38
+	.byte 0
+
+UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39
+	lock
+	faceplayer
+	setvar VAR_0x8008, 2
+	call EventScript_1A8CAD
+	checkflag FLAG_0x24B
+	goto_if_eq EventScript_160EAB
+	msgbox gUnknown_81A5AD6, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_160E93
+	call EventScript_1A8CBD
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_160E93
+	call EventScript_1A8CC9
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_160E9D
+	call EventScript_1A8CD9
+	msgbox gUnknown_81A5B4A
+	setflag FLAG_0x24B
+	release
+	end
+
+EventScript_160E93:: @ 8160E93
+	msgbox gUnknown_81A5B08
+	release
+	end
+
+EventScript_160E9D:: @ 8160E9D
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_81A5B18
+	release
+	end
+
+EventScript_160EAB:: @ 8160EAB
+	msgbox gUnknown_81A5B60
+	release
+	end
diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json
new file mode 100644
index 000000000..238b408ea
--- /dev/null
+++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json
@@ -0,0 +1,98 @@
+{
+  "id": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL",
+  "name": "UndergroundPath_NorthSouthTunnel",
+  "layout": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL",
+  "music": "BGM_FRLG_ROUTE_1",
+  "region_map_section": "MAPSEC_UNDERGROUND_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 3,
+      "y": 60,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 30,
+      "elevation": 3,
+      "item": "ITEM_POTION",
+      "flag": "70",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_ANTIDOTE",
+      "flag": "71",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 2,
+      "y": 57,
+      "elevation": 3,
+      "item": "ITEM_BURN_HEAL",
+      "flag": "74",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 1,
+      "y": 24,
+      "elevation": 3,
+      "item": "ITEM_AWAKENING",
+      "flag": "73",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 6,
+      "y": 53,
+      "elevation": 3,
+      "item": "ITEM_ICE_HEAL",
+      "flag": "75",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_PARALYZE_HEAL",
+      "flag": "72",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 39,
+      "elevation": 3,
+      "item": "ITEM_ETHER",
+      "flag": "76",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc
new file mode 100644
index 000000000..408a60fee
--- /dev/null
+++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc
@@ -0,0 +1,7 @@
+UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5
+	map_script 3, UndergroundPath_NorthSouthTunnel_MapScript1_160EBB
+	.byte 0
+
+UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB
+	setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL
+	end
diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json
new file mode 100644
index 000000000..5e48882a8
--- /dev/null
+++ b/data/maps/UndergroundPath_SouthEntrance/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE",
+  "name": "UndergroundPath_SouthEntrance",
+  "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_UNDERGROUND_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UndergroundPath_SouthEntrance_EventScript_160EC0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UndergroundPath_SouthEntrance/scripts.inc b/data/maps/UndergroundPath_SouthEntrance/scripts.inc
new file mode 100644
index 000000000..1e3d2e6e3
--- /dev/null
+++ b/data/maps/UndergroundPath_SouthEntrance/scripts.inc
@@ -0,0 +1,6 @@
+UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF
+	.byte 0
+
+UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0
+	msgbox gUnknown_8174559, 2
+	end
diff --git a/data/maps/UndergroundPath_SouthEntrance/text.inc b/data/maps/UndergroundPath_SouthEntrance/text.inc
new file mode 100644
index 000000000..07e9c0368
--- /dev/null
+++ b/data/maps/UndergroundPath_SouthEntrance/text.inc
@@ -0,0 +1,4 @@
+gUnknown_8174559:: @ 8174559
+    .string "People often lose things in the\n"
+    .string "darkness of the UNDERGROUND PATH.$"
+
diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json
new file mode 100644
index 000000000..54a036c06
--- /dev/null
+++ b/data/maps/UndergroundPath_WestEntrance/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE",
+  "name": "UndergroundPath_WestEntrance",
+  "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_UNDERGROUND_PATH_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UndergroundPath_WestEntrance_EventScript_160ECA",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE7",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE7",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE7",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UndergroundPath_WestEntrance/scripts.inc b/data/maps/UndergroundPath_WestEntrance/scripts.inc
new file mode 100644
index 000000000..f56217bce
--- /dev/null
+++ b/data/maps/UndergroundPath_WestEntrance/scripts.inc
@@ -0,0 +1,6 @@
+UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9
+	.byte 0
+
+UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA
+	msgbox gUnknown_817459B, 2
+	end
diff --git a/data/maps/UndergroundPath_WestEntrance/text.inc b/data/maps/UndergroundPath_WestEntrance/text.inc
new file mode 100644
index 000000000..5447a5206
--- /dev/null
+++ b/data/maps/UndergroundPath_WestEntrance/text.inc
@@ -0,0 +1,4 @@
+gUnknown_817459B:: @ 817459B
+    .string "I heard a sleepy POKéMON appeared\n"
+    .string "out near CELADON CITY, too.$"
+
diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json
new file mode 100644
index 000000000..edf3c52b7
--- /dev/null
+++ b/data/maps/UnknownMap_00_00/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_UNKNOWN_MAP_00_00",
+  "name": "UnknownMap_00_00",
+  "layout": "LAYOUT_UNKNOWN_MAP_00_00",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SPECIAL_AREA",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_8",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "66",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_00_EventScript_1BB9AF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_00_EventScript_1BB8C3"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_00_EventScript_1BB8CF"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_00_00/scripts.inc b/data/maps/UnknownMap_00_00/scripts.inc
new file mode 100644
index 000000000..bd155a889
--- /dev/null
+++ b/data/maps/UnknownMap_00_00/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_00_00_MapScripts:: @ 8160478
+	.byte 0
diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json
new file mode 100644
index 000000000..ad1ec4084
--- /dev/null
+++ b/data/maps/UnknownMap_00_01/map.json
@@ -0,0 +1,67 @@
+{
+  "id": "MAP_UNKNOWN_MAP_00_01",
+  "name": "UnknownMap_00_01",
+  "layout": "LAYOUT_UNKNOWN_MAP_00_01",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SPECIAL_AREA",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "66",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_01_EventScript_1BB9C1",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_01_EventScript_1BB950"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_01_EventScript_1BB95C"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_00_01/scripts.inc b/data/maps/UnknownMap_00_01/scripts.inc
new file mode 100644
index 000000000..0c05ea80d
--- /dev/null
+++ b/data/maps/UnknownMap_00_01/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_00_01_MapScripts:: @ 8160479
+	.byte 0
diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json
new file mode 100644
index 000000000..76294433e
--- /dev/null
+++ b/data/maps/UnknownMap_00_02/map.json
@@ -0,0 +1,99 @@
+{
+  "id": "MAP_UNKNOWN_MAP_00_02",
+  "name": "UnknownMap_00_02",
+  "layout": "LAYOUT_UNKNOWN_MAP_00_02",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SPECIAL_AREA",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "66",
+      "x": 10,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_02_EventScript_1BB9D3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_02_EventScript_1BB980"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_02_EventScript_1BB980"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_02_EventScript_1BB980"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_02_EventScript_1BB980"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_00_02/scripts.inc b/data/maps/UnknownMap_00_02/scripts.inc
new file mode 100644
index 000000000..d12ac4304
--- /dev/null
+++ b/data/maps/UnknownMap_00_02/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_00_02_MapScripts:: @ 816047A
+	.byte 0
diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json
new file mode 100644
index 000000000..05301e782
--- /dev/null
+++ b/data/maps/UnknownMap_00_03/map.json
@@ -0,0 +1,85 @@
+{
+  "id": "MAP_UNKNOWN_MAP_00_03",
+  "name": "UnknownMap_00_03",
+  "layout": "LAYOUT_UNKNOWN_MAP_00_03",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_SPECIAL_AREA",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_8",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_03_EventScript_1BB8DB"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_03_EventScript_1BB915"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_03_EventScript_1BB8F8"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4000",
+      "var_value": 0,
+      "script": "UnknownMap_00_03_EventScript_1BB932"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_00_03/scripts.inc b/data/maps/UnknownMap_00_03/scripts.inc
new file mode 100644
index 000000000..60c25bf54
--- /dev/null
+++ b/data/maps/UnknownMap_00_03/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_00_03_MapScripts:: @ 816047B
+	.byte 0
diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json
new file mode 100644
index 000000000..851ad7f1d
--- /dev/null
+++ b/data/maps/UnknownMap_00_04/map.json
@@ -0,0 +1,145 @@
+{
+  "id": "MAP_UNKNOWN_MAP_00_04",
+  "name": "UnknownMap_00_04",
+  "layout": "LAYOUT_UNKNOWN_MAP_00_04",
+  "music": "BGM_FRLG_UNION_ROOM",
+  "region_map_section": "MAPSEC_SPECIAL_AREA",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_8",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "66",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_16050C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "243",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_1604DA",
+      "flag": "102"
+    },
+    {
+      "graphics_id": "247",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_160502",
+      "flag": "106"
+    },
+    {
+      "graphics_id": "246",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_1604F8",
+      "flag": "105"
+    },
+    {
+      "graphics_id": "245",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_1604EE",
+      "flag": "104"
+    },
+    {
+      "graphics_id": "244",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_1604E4",
+      "flag": "103"
+    },
+    {
+      "graphics_id": "242",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_1604D0",
+      "flag": "101"
+    },
+    {
+      "graphics_id": "241",
+      "x": 13,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_1604C6",
+      "flag": "100"
+    },
+    {
+      "graphics_id": "240",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "UnknownMap_00_04_EventScript_1604BC",
+      "flag": "99"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnknownMap_00_04/scripts.inc
new file mode 100644
index 000000000..94056b155
--- /dev/null
+++ b/data/maps/UnknownMap_00_04/scripts.inc
@@ -0,0 +1,106 @@
+UnknownMap_00_04_MapScripts:: @ 816047C
+	map_script 5, UnknownMap_00_04_MapScript1_160487
+	map_script 3, UnknownMap_00_04_MapScript2_1604BB
+	.byte 0
+
+UnknownMap_00_04_MapScript1_160487:: @ 8160487
+	setflag FLAG_0x063
+	setflag FLAG_0x064
+	setflag FLAG_0x065
+	setflag FLAG_0x066
+	setflag FLAG_0x067
+	setflag FLAG_0x068
+	setflag FLAG_0x069
+	setflag FLAG_0x06A
+	removeobject 9
+	removeobject 8
+	removeobject 7
+	removeobject 2
+	removeobject 6
+	removeobject 5
+	removeobject 4
+	removeobject 3
+	special UnionRoomSpecial
+	end
+
+UnknownMap_00_04_MapScript2_1604BB:: @ 81604BB
+	end
+
+UnknownMap_00_04_EventScript_1604BC:: @ 81604BC
+	lock
+	faceplayer
+	setvar VAR_RESULT, 1
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_1604C6:: @ 81604C6
+	lock
+	faceplayer
+	setvar VAR_RESULT, 2
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_1604D0:: @ 81604D0
+	lock
+	faceplayer
+	setvar VAR_RESULT, 3
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_1604DA:: @ 81604DA
+	lock
+	faceplayer
+	setvar VAR_RESULT, 4
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_1604E4:: @ 81604E4
+	lock
+	faceplayer
+	setvar VAR_RESULT, 5
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_1604EE:: @ 81604EE
+	lock
+	faceplayer
+	setvar VAR_RESULT, 6
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_1604F8:: @ 81604F8
+	lock
+	faceplayer
+	setvar VAR_RESULT, 7
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_160502:: @ 8160502
+	lock
+	faceplayer
+	setvar VAR_RESULT, 8
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_16050C:: @ 816050C
+	lock
+	faceplayer
+	setvar VAR_RESULT, 9
+	waitstate
+	release
+	end
+
+UnknownMap_00_04_EventScript_160516:: @ 8160516
+	lockall
+	setvar VAR_RESULT, 10
+	waitstate
+	releaseall
+	end
diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json
new file mode 100644
index 000000000..e3a542b51
--- /dev/null
+++ b/data/maps/UnknownMap_03_50/map.json
@@ -0,0 +1,25 @@
+{
+  "id": "MAP_UNKNOWN_MAP_03_50",
+  "name": "UnknownMap_03_50",
+  "layout": "LAYOUT_UNKNOWN_MAP_03_50",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_SEVII_ISLE_6",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_THREE_ISLAND",
+      "offset": 0,
+      "direction": "up"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_03_50/scripts.inc b/data/maps/UnknownMap_03_50/scripts.inc
new file mode 100644
index 000000000..4e136faae
--- /dev/null
+++ b/data/maps/UnknownMap_03_50/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_03_50_MapScripts:: @ 81687E0
+	.byte 0
diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json
new file mode 100644
index 000000000..80d857ec6
--- /dev/null
+++ b/data/maps/UnknownMap_03_51/map.json
@@ -0,0 +1,25 @@
+{
+  "id": "MAP_UNKNOWN_MAP_03_51",
+  "name": "UnknownMap_03_51",
+  "layout": "LAYOUT_UNKNOWN_MAP_03_51",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_SEVII_ISLE_7",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_THREE_ISLAND",
+      "offset": 0,
+      "direction": "up"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_03_51/scripts.inc b/data/maps/UnknownMap_03_51/scripts.inc
new file mode 100644
index 000000000..7398062d8
--- /dev/null
+++ b/data/maps/UnknownMap_03_51/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_03_51_MapScripts:: @ 81687E1
+	.byte 0
diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json
new file mode 100644
index 000000000..23b9a845d
--- /dev/null
+++ b/data/maps/UnknownMap_03_52/map.json
@@ -0,0 +1,19 @@
+{
+  "id": "MAP_UNKNOWN_MAP_03_52",
+  "name": "UnknownMap_03_52",
+  "layout": "LAYOUT_UNKNOWN_MAP_03_52",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_SEVII_ISLE_8",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_03_52/scripts.inc b/data/maps/UnknownMap_03_52/scripts.inc
new file mode 100644
index 000000000..2e48ca113
--- /dev/null
+++ b/data/maps/UnknownMap_03_52/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_03_52_MapScripts:: @ 81687E2
+	.byte 0
diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json
new file mode 100644
index 000000000..f92091f77
--- /dev/null
+++ b/data/maps/UnknownMap_03_53/map.json
@@ -0,0 +1,19 @@
+{
+  "id": "MAP_UNKNOWN_MAP_03_53",
+  "name": "UnknownMap_03_53",
+  "layout": "LAYOUT_UNKNOWN_MAP_03_53",
+  "music": "BGM_FRLG_SEVII_ISLANDS",
+  "region_map_section": "MAPSEC_SEVII_ISLE_9",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_03_53/scripts.inc b/data/maps/UnknownMap_03_53/scripts.inc
new file mode 100644
index 000000000..2dec9650e
--- /dev/null
+++ b/data/maps/UnknownMap_03_53/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_03_53_MapScripts:: @ 81687E3
+	.byte 0
diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json
new file mode 100644
index 000000000..5d21e06d1
--- /dev/null
+++ b/data/maps/UnknownMap_18_01/map.json
@@ -0,0 +1,19 @@
+{
+  "id": "MAP_UNKNOWN_MAP_18_01",
+  "name": "UnknownMap_18_01",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_6",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnknownMap_18_01/scripts.inc b/data/maps/UnknownMap_18_01/scripts.inc
new file mode 100644
index 000000000..15459c3a9
--- /dev/null
+++ b/data/maps/UnknownMap_18_01/scripts.inc
@@ -0,0 +1,2 @@
+UnknownMap_18_01_MapScripts:: @ 816FA8C
+	.byte 0
diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json
new file mode 100644
index 000000000..afa2d0b7a
--- /dev/null
+++ b/data/maps/UnusedHouse_27_00/map.json
@@ -0,0 +1,19 @@
+{
+  "id": "MAP_UNUSED_HOUSE_27_00",
+  "name": "UnusedHouse_27_00",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_19",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnusedHouse_27_00/scripts.inc b/data/maps/UnusedHouse_27_00/scripts.inc
new file mode 100644
index 000000000..973665fa1
--- /dev/null
+++ b/data/maps/UnusedHouse_27_00/scripts.inc
@@ -0,0 +1,2 @@
+UnusedHouse_27_00_MapScripts:: @ 81704FA
+	.byte 0
diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json
new file mode 100644
index 000000000..34ef0104b
--- /dev/null
+++ b/data/maps/UnusedHouse_29_00/map.json
@@ -0,0 +1,19 @@
+{
+  "id": "MAP_UNUSED_HOUSE_29_00",
+  "name": "UnusedHouse_29_00",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "BGM_FRLG_INDIGO_PLATEAU",
+  "region_map_section": "MAPSEC_ROUTE_23",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnusedHouse_29_00/scripts.inc b/data/maps/UnusedHouse_29_00/scripts.inc
new file mode 100644
index 000000000..d0a4cc1a8
--- /dev/null
+++ b/data/maps/UnusedHouse_29_00/scripts.inc
@@ -0,0 +1,2 @@
+UnusedHouse_29_00_MapScripts:: @ 8170522
+	.byte 0
diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json
new file mode 100644
index 000000000..3445b9f56
--- /dev/null
+++ b/data/maps/UnusedHouse_31_05/map.json
@@ -0,0 +1,19 @@
+{
+  "id": "MAP_UNUSED_HOUSE_31_05",
+  "name": "UnusedHouse_31_05",
+  "layout": "LAYOUT_HOUSE4",
+  "music": "BGM_FRLG_ISLAND_SIX",
+  "region_map_section": "MAPSEC_SEVEN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/UnusedHouse_31_05/scripts.inc b/data/maps/UnusedHouse_31_05/scripts.inc
new file mode 100644
index 000000000..ee5cfa2cb
--- /dev/null
+++ b/data/maps/UnusedHouse_31_05/scripts.inc
@@ -0,0 +1,2 @@
+UnusedHouse_31_05_MapScripts:: @ 8170BE3
+	.byte 0
diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json
new file mode 100644
index 000000000..d041e9157
--- /dev/null
+++ b/data/maps/VermilionCity/map.json
@@ -0,0 +1,288 @@
+{
+  "id": "MAP_VERMILION_CITY",
+  "name": "VermilionCity",
+  "layout": "LAYOUT_VERMILION_CITY",
+  "music": "BGM_FRLG_VERMILION_CITY",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE6",
+      "offset": 12,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE11",
+      "offset": 10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "23",
+      "x": 22,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_EventScript_166917",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 17,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_EventScript_166920",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "33",
+      "x": 36,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_EventScript_166C2F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "130",
+      "x": 35,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_EventScript_166C38",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 31,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_EventScript_166C17",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 24,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_EventScript_166941",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 19,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "55",
+      "x": 25,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_EventScript_166C20",
+      "flag": "161"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_EXTERIOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 23,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_EXTERIOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 24,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_EXTERIOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_VERMILION_CITY_HOUSE1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 19,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_VERMILION_CITY_HOUSE2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 29,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_VERMILION_CITY_MART",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 28,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_VERMILION_CITY_HOUSE3",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_VERMILION_CITY_GYM",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 33,
+      "elevation": 0,
+      "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
+      "var_value": 0,
+      "script": "VermilionCity_EventScript_166B8A"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 33,
+      "elevation": 0,
+      "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
+      "var_value": 0,
+      "script": "VermilionCity_EventScript_166B91"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 32,
+      "elevation": 0,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "VermilionCity_EventScript_166B98"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 32,
+      "elevation": 0,
+      "var": "VAR_0x4001",
+      "var_value": 0,
+      "script": "VermilionCity_EventScript_166B98"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 33,
+      "y": 6,
+      "elevation": 0,
+      "script": "VermilionCity_EventScript_166C53"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 17,
+      "elevation": 3,
+      "script": "VermilionCity_EventScript_166C65"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 10,
+      "y": 24,
+      "elevation": 0,
+      "script": "VermilionCity_EventScript_166C6E"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 34,
+      "y": 18,
+      "elevation": 0,
+      "script": "VermilionCity_EventScript_166C86"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 45,
+      "y": 17,
+      "elevation": 3,
+      "script": "VermilionCity_EventScript_166C5C"
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_MAX_ETHER",
+      "flag": "48",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc
new file mode 100644
index 000000000..c809fd7bd
--- /dev/null
+++ b/data/maps/VermilionCity/scripts.inc
@@ -0,0 +1,289 @@
+VermilionCity_MapScripts:: @ 81668DC
+	map_script 3, VermilionCity_MapScript1_166906
+	map_script 2, VermilionCity_MapScript2_1668E7
+	.byte 0
+
+VermilionCity_MapScript2_1668E7:: @ 81668E7
+	map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, EventScript_1668F1
+	.2byte 0
+
+EventScript_1668F1:: @ 81668F1
+	lockall
+	applymovement 255, Movement_166903
+	waitmovement 0
+	setvar VAR_MAP_SCENE_VERMILION_CITY, 3
+	releaseall
+	end
+
+Movement_166903:: @ 8166903
+	step_11
+	step_11
+	step_end
+
+VermilionCity_MapScript1_166906:: @ 8166906
+	setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY
+	checkflag FLAG_0x2F9
+	call_if 1, EventScript_166913
+	end
+
+EventScript_166913:: @ 8166913
+	setflag FLAG_0x0A1
+	return
+
+VermilionCity_EventScript_166917:: @ 8166917
+	msgbox gUnknown_817F723, 2
+	end
+
+VermilionCity_EventScript_166920:: @ 8166920
+	lock
+	faceplayer
+	compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3
+	goto_if_eq EventScript_166937
+	msgbox gUnknown_817F776
+	release
+	end
+
+EventScript_166937:: @ 8166937
+	msgbox gUnknown_817F7A6
+	release
+	end
+
+VermilionCity_EventScript_166941:: @ 8166941
+	lock
+	faceplayer
+	compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3
+	goto_if_eq EventScript_166996
+	msgbox gUnknown_817FA22
+	release
+	end
+
+EventScript_166958:: @ 8166958
+	checkflag FLAG_0x84A
+	goto_if 0, EventScript_1A77B0
+	checkitem ITEM_MYSTIC_TICKET, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A77B0
+	goto EventScript_1A77AA
+	end
+
+EventScript_166977:: @ 8166977
+	checkflag FLAG_0x84B
+	goto_if 0, EventScript_1A77B0
+	checkitem ITEM_AURORA_TICKET, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_1A77B0
+	goto EventScript_1A77AA
+	end
+
+EventScript_166996:: @ 8166996
+	setvar VAR_0x8004, 0
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	goto_if 4, EventScript_1669BB
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
+	goto_if 4, EventScript_166B3B
+	msgbox gUnknown_817FB10
+	release
+	end
+
+EventScript_1669BB:: @ 81669BB
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	call EventScript_166958
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_1669FD
+	call EventScript_166977
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_166A5F
+	setvar VAR_0x8004, 0
+	message Text_17FBB8
+	waitmessage
+	goto EventScript_1A911E
+	end
+
+EventScript_1669FD:: @ 81669FD
+	call EventScript_166977
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_166AB1
+	checkflag FLAG_0x2F0
+	call_if 0, EventScript_166A53
+	message Text_17FCC1
+	waitmessage
+	multichoice 17, 6, 54, 0
+	switch VAR_RESULT
+	case 0, EventScript_1A911E
+	case 1, EventScript_166B0B
+	case 2, EventScript_1A90F6
+	case 127, EventScript_1A90F6
+	end
+
+EventScript_166A53:: @ 8166A53
+	setflag FLAG_0x2F0
+	msgbox gUnknown_817FC00
+	return
+
+EventScript_166A5F:: @ 8166A5F
+	checkflag FLAG_0x2F1
+	call_if 0, EventScript_166AA5
+	message Text_17FCC1
+	waitmessage
+	multichoice 13, 6, 55, 0
+	switch VAR_RESULT
+	case 0, EventScript_1A911E
+	case 1, EventScript_166B23
+	case 2, EventScript_1A90F6
+	case 127, EventScript_1A90F6
+	end
+
+EventScript_166AA5:: @ 8166AA5
+	setflag FLAG_0x2F1
+	msgbox gUnknown_817FC5F
+	return
+
+EventScript_166AB1:: @ 8166AB1
+	checkflag FLAG_0x2F0
+	call_if 0, EventScript_166A53
+	checkflag FLAG_0x2F1
+	call_if 0, EventScript_166AA5
+	message Text_17FCC1
+	waitmessage
+	multichoice 13, 5, 56, 0
+	switch VAR_RESULT
+	case 0, EventScript_1A911E
+	case 1, EventScript_166B0B
+	case 2, EventScript_166B23
+	case 3, EventScript_1A90F6
+	case 127, EventScript_1A90F6
+	end
+
+EventScript_166B0B:: @ 8166B0B
+	msgbox gUnknown_817FCEC
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8006, 9
+	goto EventScript_1A90DA
+	end
+
+EventScript_166B23:: @ 8166B23
+	msgbox gUnknown_817FD5F
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8006, 10
+	goto EventScript_1A90DA
+	end
+
+EventScript_166B3B:: @ 8166B3B
+	message Text_17FB23
+	waitmessage
+	setvar VAR_0x8004, 0
+	multichoice 19, 5, 57, 0
+	switch VAR_RESULT
+	case 0, EventScript_1A8FEE
+	case 1, EventScript_1A8FF9
+	case 2, EventScript_1A9004
+	case 3, EventScript_1A90F6
+	case 127, EventScript_1A90F6
+	end
+
+EventScript_166B88:: @ 8166B88
+	release
+	end
+
+VermilionCity_EventScript_166B8A:: @ 8166B8A
+	lockall
+	goto EventScript_166BA0
+	end
+
+VermilionCity_EventScript_166B91:: @ 8166B91
+	lockall
+	goto EventScript_166BA0
+	end
+
+VermilionCity_EventScript_166B98:: @ 8166B98
+	lockall
+	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
+	releaseall
+	end
+
+EventScript_166BA0:: @ 8166BA0
+	textcolor 0
+	applymovement 6, Movement_1A75E7
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3
+	goto_if_eq EventScript_166BED
+	msgbox gUnknown_817FA3C
+	checkflag FLAG_0x234
+	goto_if 0, EventScript_166BDE
+	msgbox gUnknown_817FA77
+	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1
+	releaseall
+	end
+
+EventScript_166BDE:: @ 8166BDE
+	msgbox gUnknown_817FABA
+	closemessage
+	goto EventScript_1A9108
+	end
+
+EventScript_166BED:: @ 8166BED
+	setvar VAR_0x8004, 0
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
+	goto_if 4, EventScript_1669BB
+	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
+	goto_if 4, EventScript_166B3B
+	msgbox gUnknown_817FB10
+	closemessage
+	goto EventScript_1A9108
+	end
+
+VermilionCity_EventScript_166C17:: @ 8166C17
+	msgbox gUnknown_817F8AC, 2
+	end
+
+VermilionCity_EventScript_166C20:: @ 8166C20
+	lock
+	faceplayer
+	setflag FLAG_0x2F9
+	msgbox gUnknown_817FDD2
+	release
+	end
+
+VermilionCity_EventScript_166C2F:: @ 8166C2F
+	msgbox gUnknown_817F7FD, 2
+	end
+
+VermilionCity_EventScript_166C38:: @ 8166C38
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_MACHOP, 0
+	msgbox gUnknown_817F871
+	waitmoncry
+	msgbox gUnknown_817F888
+	release
+	end
+
+VermilionCity_EventScript_166C53:: @ 8166C53
+	msgbox gUnknown_817F8FB, 3
+	end
+
+VermilionCity_EventScript_166C5C:: @ 8166C5C
+	msgbox gUnknown_817F928, 3
+	end
+
+VermilionCity_EventScript_166C65:: @ 8166C65
+	msgbox gUnknown_817F9A1, 3
+	end
+
+VermilionCity_EventScript_166C6E:: @ 8166C6E
+	lockall
+	setvar VAR_0x8004, 4
+	setvar VAR_0x8005, 0
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_817F9CC
+	releaseall
+	end
+
+VermilionCity_EventScript_166C86:: @ 8166C86
+	msgbox gUnknown_817FA11, 3
+	end
diff --git a/data/maps/VermilionCity/text.inc b/data/maps/VermilionCity/text.inc
new file mode 100644
index 000000000..bce18d9fb
--- /dev/null
+++ b/data/maps/VermilionCity/text.inc
@@ -0,0 +1,131 @@
+gUnknown_817F723:: @ 817F723
+    .string "We're careful about pollution here.\p"
+    .string "We've heard GRIMER multiplies in\n"
+    .string "toxic sludge.$"
+
+gUnknown_817F776:: @ 817F776
+    .string "Did you see the S.S. ANNE moored\n"
+    .string "in the harbor?$"
+
+gUnknown_817F7A6:: @ 817F7A6
+    .string "So, the S.S. ANNE has departed?\p"
+    .string "She'll be back in VERMILION about\n"
+    .string "this time next year.$"
+
+gUnknown_817F7FD:: @ 817F7FD
+    .string "I'm putting up a building on this\n"
+    .string "plot of land. I own it all.\p"
+    .string "My POKéMON is tamping the land\n"
+    .string "to lay the foundation.$"
+
+gUnknown_817F871:: @ 817F871
+    .string "MACHOP: Guoh! Gogogoh!$"
+
+gUnknown_817F888:: @ 817F888
+    .string "A MACHOP is stomping the land flat.$"
+
+gUnknown_817F8AC:: @ 817F8AC
+    .string "The S.S. ANNE is a famous luxury\n"
+    .string "cruise ship.\p"
+    .string "It visits VERMILION once a year.$"
+
+gUnknown_817F8FB:: @ 817F8FB
+    .string "VERMILION CITY\n"
+    .string "The Port of Exquisite Sunsets$"
+
+gUnknown_817F928:: @ 817F928
+    .string "NOTICE!\p"
+    .string "ROUTE 12 may be blocked off by a\n"
+    .string "sleeping POKéMON.\p"
+    .string "Detour through ROCK TUNNEL to\n"
+    .string "LAVENDER TOWN.\p"
+    .string "VERMILION POLICE$"
+
+gUnknown_817F9A1:: @ 817F9A1
+    .string "POKéMON FAN CLUB\n"
+    .string "All POKéMON fans welcome!$"
+
+gUnknown_817F9CC:: @ 817F9CC
+    .string "VERMILION CITY POKéMON GYM\n"
+    .string "LEADER: LT. SURGE\l"
+    .string "The Lightning American!$"
+
+gUnknown_817FA11:: @ 817FA11
+    .string "VERMILION HARBOR$"
+
+gUnknown_817FA22:: @ 817FA22
+    .string "Welcome to the S.S. ANNE!$"
+
+gUnknown_817FA3C:: @ 817FA3C
+    .string "Welcome to the S.S. ANNE!\p"
+    .string "Excuse me, do you have a ticket?$"
+
+gUnknown_817FA77:: @ 817FA77
+    .string "{SIZE}Á{PLAYER} flashed the S.S. TICKET!\p"
+    .string "{SIZE}ÇGreat!\n"
+    .string "Welcome to the S.S. ANNE!$"
+
+gUnknown_817FABA:: @ 817FABA
+    .string "{SIZE}Á{PLAYER} doesn't have the needed\n"
+    .string "S.S. TICKET.\p"
+    .string "{SIZE}ÇSorry!\p"
+    .string "You need a ticket to get aboard.$"
+
+gUnknown_817FB10:: @ 817FB10
+    .string "The ship set sail.$"
+
+Text_17FB23:: @ 817FB23
+    .string "Ah, you have a TRI-PASS.\p"
+    .string "Would you like to board\n"
+    .string "a SEAGALLOP ferry?$"
+
+Text_17FB67:: @ 817FB67
+    .string "Okay, everything's in order.\p"
+    .string "SEAGALLOP HI-SPEED 7 will be\n"
+    .string "departing immediately.$"
+
+Text_17FBB8:: @ 817FBB8
+    .string "Ah, you have a RAINBOW PASS.\p"
+    .string "Would you like to board\n"
+    .string "a SEAGALLOP ferry?$"
+
+gUnknown_817FC00:: @ 817FC00
+    .string "Oh! That's a MYSTICTICKET!\n"
+    .string "Now that is rare.\p"
+    .string "We'll be happy to take you to\n"
+    .string "NAVEL ROCK anytime.$"
+
+gUnknown_817FC5F:: @ 817FC5F
+    .string "Oh! That's an AURORATICKET!\n"
+    .string "Now that is rare.\p"
+    .string "We'll be happy to take you to\n"
+    .string "BIRTH ISLAND anytime.$"
+
+Text_17FCC1:: @ 817FCC1
+    .string "Would you like to board\n"
+    .string "a SEAGALLOP ferry?$"
+
+gUnknown_817FCEC:: @ 817FCEC
+    .string "Okay, everything's in order for you\n"
+    .string "to board a special ferry.\p"
+    .string "SEAGALLOP HI-SPEED 10 will be\n"
+    .string "departing immediately.$"
+
+gUnknown_817FD5F:: @ 817FD5F
+    .string "Okay, everything's in order for you\n"
+    .string "to board a special ferry.\p"
+    .string "SEAGALLOP HI-SPEED 12 will be\n"
+    .string "departing immediately.$"
+
+gUnknown_817FDD2:: @ 817FDD2
+    .string "Oh, hello, {PLAYER}!\n"
+    .string "How are you doing?\p"
+    .string "It's me, one of PROF. OAK's AIDES.\p"
+    .string "Did you meet the other AIDE?\p"
+    .string "He had a package from PROF. OAK\n"
+    .string "for you, {PLAYER}.\p"
+    .string "He said he'd look for you around\n"
+    .string "ROUTE 2, {PLAYER}.\p"
+    .string "If you're in the ROUTE 2 area,\n"
+    .string "please look for him.$"
+
diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json
new file mode 100644
index 000000000..9545fed01
--- /dev/null
+++ b/data/maps/VermilionCity_Gym/map.json
@@ -0,0 +1,227 @@
+{
+  "id": "MAP_VERMILION_CITY_GYM",
+  "name": "VermilionCity_Gym",
+  "layout": "LAYOUT_VERMILION_CITY_GYM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "82",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_Gym_EventScript_16B94A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 2,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "VermilionCity_Gym_EventScript_16BA1E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "62",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "VermilionCity_Gym_EventScript_16B9FA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 4,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_Gym_EventScript_16BA6C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "VermilionCity_Gym_EventScript_16BA35",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 5,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 6,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 17,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16BA8B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 17,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16BA8B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 10,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B78F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 10,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B79B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B7A7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 10,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B7B3"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 10,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B7BF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 12,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B7CB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 12,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B7D7"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 12,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B7E3"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 12,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B7EF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 12,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B7FB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 1,
+      "y": 14,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B807"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 3,
+      "y": 14,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B813"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 14,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B81F"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 14,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B82B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 14,
+      "elevation": 0,
+      "script": "VermilionCity_Gym_EventScript_16B837"
+    }
+  ]
+}
diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc
new file mode 100644
index 000000000..bd49a6955
--- /dev/null
+++ b/data/maps/VermilionCity_Gym/scripts.inc
@@ -0,0 +1,309 @@
+VermilionCity_Gym_MapScripts:: @ 816B69E
+	map_script 1, VermilionCity_Gym_MapScript1_16B6A9
+	map_script 3, VermilionCity_Gym_MapScript2_16B772
+	.byte 0
+
+VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9
+	checkflag FLAG_0x001
+	call_if 1, EventScript_16B6BC
+	checkflag FLAG_0x264
+	call_if 1, EventScript_16B717
+	end
+
+EventScript_16B6BC:: @ 816B6BC
+	setmetatile 3, 6, 699, 1
+	setmetatile 4, 6, 700, 1
+	setmetatile 5, 6, 701, 1
+	setmetatile 6, 6, 702, 1
+	setmetatile 7, 6, 703, 1
+	setmetatile 3, 7, 707, 1
+	setmetatile 4, 7, 708, 1
+	setmetatile 5, 7, 709, 1
+	setmetatile 6, 7, 710, 1
+	setmetatile 7, 7, 711, 1
+	return
+
+EventScript_16B717:: @ 816B717
+	setmetatile 3, 6, 659, 1
+	setmetatile 4, 6, 660, 0
+	setmetatile 5, 6, 641, 0
+	setmetatile 6, 6, 661, 0
+	setmetatile 7, 6, 662, 1
+	setmetatile 3, 7, 667, 1
+	setmetatile 4, 7, 668, 0
+	setmetatile 5, 7, 641, 0
+	setmetatile 6, 7, 669, 0
+	setmetatile 7, 7, 670, 1
+	return
+
+VermilionCity_Gym_MapScript2_16B772:: @ 816B772
+	call EventScript_16B778
+	end
+
+EventScript_16B778:: @ 816B778
+	checkflag FLAG_0x264
+	goto_if_eq EventScript_1A77A9
+	special sub_80CADEC
+	copyvar VAR_0x4000, VAR_0x8004
+	copyvar VAR_0x4001, VAR_0x8005
+	return
+
+VermilionCity_Gym_EventScript_16B78F:: @ 816B78F
+	lockall
+	setvar VAR_0x8008, 1
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B79B:: @ 816B79B
+	lockall
+	setvar VAR_0x8008, 2
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B7A7:: @ 816B7A7
+	lockall
+	setvar VAR_0x8008, 3
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B7B3:: @ 816B7B3
+	lockall
+	setvar VAR_0x8008, 4
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B7BF:: @ 816B7BF
+	lockall
+	setvar VAR_0x8008, 5
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B7CB:: @ 816B7CB
+	lockall
+	setvar VAR_0x8008, 6
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B7D7:: @ 816B7D7
+	lockall
+	setvar VAR_0x8008, 7
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B7E3:: @ 816B7E3
+	lockall
+	setvar VAR_0x8008, 8
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B7EF:: @ 816B7EF
+	lockall
+	setvar VAR_0x8008, 9
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B7FB:: @ 816B7FB
+	lockall
+	setvar VAR_0x8008, 10
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B807:: @ 816B807
+	lockall
+	setvar VAR_0x8008, 11
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B813:: @ 816B813
+	lockall
+	setvar VAR_0x8008, 12
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B81F:: @ 816B81F
+	lockall
+	setvar VAR_0x8008, 13
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B82B:: @ 816B82B
+	lockall
+	setvar VAR_0x8008, 14
+	goto EventScript_16B843
+	end
+
+VermilionCity_Gym_EventScript_16B837:: @ 816B837
+	lockall
+	setvar VAR_0x8008, 15
+	goto EventScript_16B843
+	end
+
+EventScript_16B843:: @ 816B843
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	copyvar VAR_0x8004, VAR_0x4000
+	copyvar VAR_0x8005, VAR_0x4001
+	checkflag FLAG_0x264
+	goto_if_eq EventScript_16B8E5
+	checkflag FLAG_0x001
+	goto_if_eq EventScript_16B89E
+	compare_var_to_var VAR_0x8004, VAR_0x8008
+	goto_if_eq EventScript_16B885
+	msgbox gUnknown_8195289
+	releaseall
+	end
+
+EventScript_16B885:: @ 816B885
+	msgbox gUnknown_81952A8
+	playse SE_PIN
+	waitse
+	call EventScript_16B6BC
+	special DrawWholeMapView
+	setflag FLAG_0x001
+	releaseall
+	end
+
+EventScript_16B89E:: @ 816B89E
+	compare_var_to_var VAR_0x8005, VAR_0x8008
+	goto_if_eq EventScript_16B8CB
+	msgbox gUnknown_819536C
+	clearflag FLAG_0x001
+	special sub_80CADEC
+	copyvar VAR_0x4000, VAR_0x8004
+	copyvar VAR_0x4001, VAR_0x8005
+	call EventScript_16B8EF
+	special DrawWholeMapView
+	releaseall
+	end
+
+EventScript_16B8CB:: @ 816B8CB
+	msgbox gUnknown_8195330
+	closemessage
+	call EventScript_16B717
+	special DrawWholeMapView
+	playse SE_FU_ZAKU2
+	waitse
+	setflag FLAG_0x264
+	releaseall
+	end
+
+EventScript_16B8E5:: @ 816B8E5
+	msgbox gUnknown_8195289
+	releaseall
+	end
+
+EventScript_16B8EF:: @ 816B8EF
+	setmetatile 3, 6, 681, 1
+	setmetatile 4, 6, 682, 1
+	setmetatile 5, 6, 645, 1
+	setmetatile 6, 6, 683, 1
+	setmetatile 7, 6, 684, 1
+	setmetatile 3, 7, 689, 1
+	setmetatile 4, 7, 690, 1
+	setmetatile 5, 7, 653, 1
+	setmetatile 6, 7, 691, 1
+	setmetatile 7, 7, 692, 1
+	return
+
+VermilionCity_Gym_EventScript_16B94A:: @ 816B94A
+	setvar VAR_0x8004, 4
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, 416, 0, Text_194BA4, Text_194E03, EventScript_16B97C
+	checkflag FLAG_0x231
+	goto_if 0, EventScript_16B9AF
+	msgbox gUnknown_8194C8E
+	release
+	end
+
+EventScript_16B97C:: @ 816B97C
+	setvar VAR_0x8004, 4
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	checkflag FLAG_0x23B
+	call_if 0, EventScript_16B9AB
+	clearflag FLAG_0x0A0
+	setflag FLAG_0x4B2
+	setflag FLAG_0x822
+	setvar VAR_0x8008, 3
+	call EventScript_1A6B18
+	goto EventScript_16B9AF
+	end
+
+EventScript_16B9AB:: @ 816B9AB
+	clearflag FLAG_0x0A1
+	return
+
+EventScript_16B9AF:: @ 816B9AF
+	msgbox gUnknown_8194CFA
+	checkitemspace ITEM_TM34, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B9F0
+	additem ITEM_TM34, 1
+	giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34
+	setflag FLAG_0x231
+	msgbox gUnknown_8194DA8
+	release
+	end
+
+EventScript_16B9F0:: @ 816B9F0
+	msgbox gUnknown_8194DE3
+	release
+	end
+
+VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA
+	trainerbattle 0, 141, 0, Text_194FBD, Text_194FF1
+	setvar VAR_0x8004, 4
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8195004, 6
+	end
+
+VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E
+	trainerbattle 0, 220, 0, Text_194F1F, Text_194F6F
+	msgbox gUnknown_8194F76, 6
+	end
+
+VermilionCity_Gym_EventScript_16BA35:: @ 816BA35
+	trainerbattle 2, 423, 0, Text_194E57, Text_194EA5, EventScript_16BA5D
+	setvar VAR_0x8004, 4
+	setvar VAR_0x8005, 3
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8194EBD, 6
+	end
+
+EventScript_16BA5D:: @ 816BA5D
+	setvar VAR_0x8004, 4
+	setvar VAR_0x8005, 2
+	special SetFlavorTextFlagFromSpecialVars
+	release
+	end
+
+VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C
+	lock
+	faceplayer
+	checkflag FLAG_0x4B2
+	goto_if_eq EventScript_16BA81
+	msgbox gUnknown_81950B4
+	release
+	end
+
+EventScript_16BA81:: @ 816BA81
+	msgbox gUnknown_81951EC
+	release
+	end
+
+VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B
+	lockall
+	checkflag FLAG_0x822
+	goto_if_eq EventScript_16BA9F
+	msgbox gUnknown_819520B
+	releaseall
+	end
+
+EventScript_16BA9F:: @ 816BA9F
+	msgbox gUnknown_8195248
+	releaseall
+	end
diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc
new file mode 100644
index 000000000..6d05aaf99
--- /dev/null
+++ b/data/maps/VermilionCity_Gym/text.inc
@@ -0,0 +1,140 @@
+Text_194BA4:: @ 8194BA4
+    .string "Hey, kid! What do you think you're\n"
+    .string "doing here?\p"
+    .string "You won't live long in combat!\n"
+    .string "Not with your puny power!\p"
+    .string "I tell you, kid, electric POKéMON\n"
+    .string "saved me during the war!\p"
+    .string "They zapped my enemies into\n"
+    .string "paralysis!\p"
+    .string "The same as I'll do to you!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$"
+
+gUnknown_8194C8E:: @ 8194C8E
+    .string "A little word of advice, kid!\p"
+    .string "Electricity is sure powerful!\p"
+    .string "But, it's useless against GROUND-\n"
+    .string "type POKéMON!$"
+
+gUnknown_8194CFA:: @ 8194CFA
+    .string "The THUNDERBADGE cranks up your\n"
+    .string "POKéMON's SPEED!\p"
+    .string "It also lets your POKéMON FLY\n"
+    .string "lightning-quick anytime, kid!\p"
+    .string "You're special, kid!\n"
+    .string "Take this!$"
+
+gUnknown_8194D87:: @ 8194D87
+    .string "{PLAYER} received TM34\n"
+    .string "from LT. SURGE.$"
+
+gUnknown_8194DA8:: @ 8194DA8
+    .string "TM34 contains SHOCK WAVE!\p"
+    .string "Teach it to an ELECTRIC POKéMON!$"
+
+gUnknown_8194DE3:: @ 8194DE3
+    .string "Yo, kid, make room in your BAG!$"
+
+Text_194E03:: @ 8194E03
+    .string "Now that's a shocker!\p"
+    .string "You're the real deal, kid!\p"
+    .string "Fine, then, take the THUNDERBADGE!$"
+
+Text_194E57:: @ 8194E57
+    .string "When I was in the Army, LT. SURGE\n"
+    .string "was my strict CO.\p"
+    .string "He was a hard taskmaster.$"
+
+Text_194EA5:: @ 8194EA5
+    .string "Stop!\n"
+    .string "You're very good!$"
+
+gUnknown_8194EBD:: @ 8194EBD
+    .string "It's not easy opening that door.\p"
+    .string "LT. SURGE was always famous for\n"
+    .string "his cautious nature in the Army.$"
+
+Text_194F1F:: @ 8194F1F
+    .string "I'm a lightweight, but I'm good\n"
+    .string "with electricity!\p"
+    .string "That's why I joined this GYM.$"
+
+Text_194F6F:: @ 8194F6F
+    .string "Fried!$"
+
+gUnknown_8194F76:: @ 8194F76
+    .string "Okay, I'll talk!\p"
+    .string "LT. SURGE said he hid door\n"
+    .string "switches inside something.$"
+
+Text_194FBD:: @ 8194FBD
+    .string "This is no place for kids!\n"
+    .string "Not even if you're good!$"
+
+Text_194FF1:: @ 8194FF1
+    .string "Wow!\n"
+    .string "Surprised me!$"
+
+gUnknown_8195004:: @ 8195004
+    .string "LT. SURGE installed the traps in\n"
+    .string "the GYM himself.\p"
+    .string "He set up double locks everywhere.\n"
+    .string "Let me give you a hint.\p"
+    .string "When you open the first lock, the\n"
+    .string "second lock is right next to it.$"
+
+gUnknown_81950B4:: @ 81950B4
+    .string "Yo!\n"
+    .string "Champ in the making!\p"
+    .string "LT. SURGE has a nickname.\p"
+    .string "People refer to him as the\n"
+    .string "Lightning American!\p"
+    .string "He's an expert on electric\n"
+    .string "POKéMON.\p"
+    .string "BIRD/WATER-type POKéMON match\n"
+    .string "poorly against the ELECTRIC type.\p"
+    .string "Beware of paralysis, too.\p"
+    .string "LT. SURGE is very cautious.\p"
+    .string "He's locked himself in, so it won't\n"
+    .string "be easy getting to him.$"
+
+gUnknown_81951EC:: @ 81951EC
+    .string "Whew!\n"
+    .string "That match was electric!$"
+
+gUnknown_819520B:: @ 819520B
+    .string "VERMILION POKéMON GYM\n"
+    .string "LEADER: LT. SURGE\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}$"
+
+gUnknown_8195248:: @ 8195248
+    .string "VERMILION POKéMON GYM\n"
+    .string "LEADER: LT. SURGE\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}, {PLAYER}$"
+
+gUnknown_8195289:: @ 8195289
+    .string "Nope!\n"
+    .string "There's only trash here.$"
+
+gUnknown_81952A8:: @ 81952A8
+    .string "Hey! There's a switch under the\n"
+    .string "trash! Turn it on!\p"
+    .string "The first electric lock opened!$"
+
+Text_1952FB:: @ 81952FB
+    .string "ガサゴソ‥！\n"
+    .string "おっと！　ゴミばこの　そこに\l"
+    .string "また　スイッチが　あった！\l"
+    .string "おして　みよう！　‥　ポチッとな$"
+
+gUnknown_8195330:: @ 8195330
+    .string "The second electric lock opened!\n"
+    .string "The motorized door opened!$"
+
+gUnknown_819536C:: @ 819536C
+    .string "Nope!\n"
+    .string "There's only trash here.\p"
+    .string "Hey!\n"
+    .string "The electric locks were reset!$"
+
diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json
new file mode 100644
index 000000000..73b782e11
--- /dev/null
+++ b/data/maps/VermilionCity_House1/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_VERMILION_CITY_HOUSE1",
+  "name": "VermilionCity_House1",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "BGM_FRLG_CERULEAN_CITY",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "57",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_House1_EventScript_16B3A7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc
new file mode 100644
index 000000000..a7de85e8f
--- /dev/null
+++ b/data/maps/VermilionCity_House1/scripts.inc
@@ -0,0 +1,36 @@
+VermilionCity_House1_MapScripts:: @ 816B3A6
+	.byte 0
+
+VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7
+	lock
+	faceplayer
+	checkflag FLAG_0x240
+	goto_if_eq EventScript_16B3CF
+	msgbox gUnknown_8193EC1, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16B3D9
+	msgbox gUnknown_8194028
+	release
+	end
+
+EventScript_16B3CF:: @ 816B3CF
+	msgbox gUnknown_8194045
+	release
+	end
+
+EventScript_16B3D9:: @ 816B3D9
+	checkitemspace ITEM_OLD_ROD, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B41A
+	additem ITEM_OLD_ROD, 1
+	msgbox gUnknown_8193F2A
+	giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD
+	setflag FLAG_0x240
+	msgbox gUnknown_8193FAF
+	release
+	end
+
+EventScript_16B41A:: @ 816B41A
+	msgbox gUnknown_819406F
+	release
+	end
diff --git a/data/maps/VermilionCity_House1/text.inc b/data/maps/VermilionCity_House1/text.inc
new file mode 100644
index 000000000..66ea21646
--- /dev/null
+++ b/data/maps/VermilionCity_House1/text.inc
@@ -0,0 +1,40 @@
+Text_193E82:: @ 8193E82
+    .string "この　あいだ　やまおくで\n"
+    .string "きんのたまを　ひろい　ましてね！\p"
+    .string "つかえない　しなもの　ですが\n"
+    .string "うったら　なんと　5000¥でした$"
+
+gUnknown_8193EC1:: @ 8193EC1
+    .string "I'm the FISHING GURU!\p"
+    .string "I simply looove fishing!\n"
+    .string "I can't bear to go without.\p"
+    .string "Tell me, do you like to fish?$"
+
+gUnknown_8193F2A:: @ 8193F2A
+    .string "Grand! I like your style.\n"
+    .string "I think we can be friends.\p"
+    .string "Take this and fish, young friend!$"
+
+gUnknown_8193F81:: @ 8193F81
+    .string "{PLAYER} received an OLD ROD from\n"
+    .string "the FISHING GURU.$"
+
+gUnknown_8193FAF:: @ 8193FAF
+    .string "Fishing is a way of life!\n"
+    .string "It is like the finest poetry.\p"
+    .string "From the seas to rivers, go out\n"
+    .string "and land the big one, my friend.$"
+
+gUnknown_8194028:: @ 8194028
+    .string "Oh…\n"
+    .string "That's so disappointing…$"
+
+gUnknown_8194045:: @ 8194045
+    .string "Hello there, {PLAYER}!\p"
+    .string "How are the fish biting?$"
+
+gUnknown_819406F:: @ 819406F
+    .string "Oh, no!\p"
+    .string "I had a nice gift for you, but you\n"
+    .string "have no room for it!$"
+
diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json
new file mode 100644
index 000000000..a4daf98d6
--- /dev/null
+++ b/data/maps/VermilionCity_House2/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_VERMILION_CITY_HOUSE2",
+  "name": "VermilionCity_House2",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "BGM_FRLG_VERMILION_CITY",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "17",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_House2_EventScript_16B5D7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc
new file mode 100644
index 000000000..9179fa716
--- /dev/null
+++ b/data/maps/VermilionCity_House2/scripts.inc
@@ -0,0 +1 @@
+@	.include "data/maps/VermilionCity_House2/scripts.inc"
diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json
new file mode 100644
index 000000000..da5d4b82a
--- /dev/null
+++ b/data/maps/VermilionCity_House3/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_VERMILION_CITY_HOUSE3",
+  "name": "VermilionCity_House3",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "BGM_FRLG_VERMILION_CITY",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "19",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_House3_EventScript_16BAAA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "116",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_House3_EventScript_16BABC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "105",
+      "x": 6,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_House3_EventScript_16BAB3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "script": "VermilionCity_House3_EventScript_16BACF"
+    }
+  ]
+}
diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc
new file mode 100644
index 000000000..1344aac52
--- /dev/null
+++ b/data/maps/VermilionCity_House3/scripts.inc
@@ -0,0 +1,24 @@
+VermilionCity_House3_MapScripts:: @ 816BAA9
+	.byte 0
+
+VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA
+	msgbox gUnknown_81953AF, 2
+	end
+
+VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3
+	msgbox gUnknown_8195471, 2
+	end
+
+VermilionCity_House3_EventScript_16BABC:: @ 816BABC
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_PIDGEY, 0
+	msgbox gUnknown_81953EE
+	waitmoncry
+	release
+	end
+
+VermilionCity_House3_EventScript_16BACF:: @ 816BACF
+	msgbox gUnknown_8195400, 3
+	end
diff --git a/data/maps/VermilionCity_House3/text.inc b/data/maps/VermilionCity_House3/text.inc
new file mode 100644
index 000000000..99ea3e49e
--- /dev/null
+++ b/data/maps/VermilionCity_House3/text.inc
@@ -0,0 +1,20 @@
+gUnknown_81953AF:: @ 81953AF
+    .string "I'm getting my PIDGEY to fly a\n"
+    .string "letter to SAFFRON in the north.$"
+
+gUnknown_81953EE:: @ 81953EE
+    .string "PIDGEY: Kurukkoo!$"
+
+gUnknown_8195400:: @ 8195400
+    .string "Dear PIPPI,\n"
+    .string "I hope to see you soon.\p"
+    .string "I heard SAFFRON has problems with\n"
+    .string "TEAM ROCKET.\p"
+    .string "VERMILION appears to be safe.$"
+
+gUnknown_8195471:: @ 8195471
+    .string "I want to exchange MAIL with all\n"
+    .string "sorts of people.\p"
+    .string "I send my PIDGEY to a UNION ROOM\n"
+    .string "to exchange MAIL for me.$"
+
diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json
new file mode 100644
index 000000000..2dcf37084
--- /dev/null
+++ b/data/maps/VermilionCity_Mart/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_VERMILION_CITY_MART",
+  "name": "VermilionCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_Mart_EventScript_16B666",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_Mart_EventScript_16B654",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_Mart_EventScript_16B65D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc
new file mode 100644
index 000000000..c83e239d9
--- /dev/null
+++ b/data/maps/VermilionCity_Mart/scripts.inc
@@ -0,0 +1,36 @@
+VermilionCity_Mart_MapScripts:: @ 816B653
+	.byte 0
+
+VermilionCity_Mart_EventScript_16B654:: @ 816B654
+	msgbox gUnknown_8194B65, 2
+	end
+
+VermilionCity_Mart_EventScript_16B65D:: @ 816B65D
+	msgbox gUnknown_8194A77, 2
+	end
+
+VermilionCity_Mart_EventScript_16B666:: @ 816B666
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	lock
+	faceplayer
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16B68C
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16B68C:: @ 816B68C
+	.2byte ITEM_POKE_BALL
+	.2byte ITEM_SUPER_POTION
+	.2byte ITEM_ANTIDOTE
+	.2byte ITEM_PARALYZE_HEAL
+	.2byte ITEM_AWAKENING
+	.2byte ITEM_ICE_HEAL
+	.2byte ITEM_REPEL
+	.2byte ITEM_NONE
+	release
+	end
diff --git a/data/maps/VermilionCity_Mart/text.inc b/data/maps/VermilionCity_Mart/text.inc
new file mode 100644
index 000000000..2d85d941f
--- /dev/null
+++ b/data/maps/VermilionCity_Mart/text.inc
@@ -0,0 +1,14 @@
+gUnknown_8194A77:: @ 8194A77
+    .string "There are wicked people who will\n"
+    .string "use POKéMON for criminal acts.\p"
+    .string "TEAM ROCKET traffics in rare\n"
+    .string "POKéMON, for example.\p"
+    .string "They also abandon POKéMON that\n"
+    .string "they consider unpopular or useless.\p"
+    .string "That's the sort of horrid people\n"
+    .string "they are, TEAM ROCKET.$"
+
+gUnknown_8194B65:: @ 8194B65
+    .string "I think POKéMON can be good or\n"
+    .string "bad. It depends on the TRAINER.$"
+
diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..47d4a391e
--- /dev/null
+++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json
@@ -0,0 +1,140 @@
+{
+  "id": "MAP_VERMILION_CITY_POKEMON_CENTER_1F",
+  "name": "VermilionCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_16B433",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_16B43C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_16B445",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 14,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_16B44E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_1A8D08",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83",
+      "flag": "160"
+    },
+    {
+      "graphics_id": "0",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "76",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83",
+      "flag": "160"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..f65681dc3
--- /dev/null
+++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,27 @@
+VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424
+	map_script 3, VermilionCity_PokemonCenter_1F_MapScript1_16B42F
+	map_script 5, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F
+	setrespawn SPAWN_VERMILION_CITY
+	end
+
+VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C
+	msgbox gUnknown_8194145, 2
+	end
+
+VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445
+	msgbox gUnknown_81940AF, 2
+	end
+
+VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E
+	msgbox gUnknown_8194180, 2
+	end
diff --git a/data/maps/VermilionCity_PokemonCenter_1F/text.inc b/data/maps/VermilionCity_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..811f01edf
--- /dev/null
+++ b/data/maps/VermilionCity_PokemonCenter_1F/text.inc
@@ -0,0 +1,19 @@
+gUnknown_81940AF:: @ 81940AF
+    .string "Even if they are the same level,\n"
+    .string "POKéMON can have very different\l"
+    .string "stats and abilities.\p"
+    .string "A POKéMON raised by a TRAINER is\n"
+    .string "stronger than one in the wild.$"
+
+gUnknown_8194145:: @ 8194145
+    .string "My POKéMON was poisoned!\n"
+    .string "It fainted while we were walking!$"
+
+gUnknown_8194180:: @ 8194180
+    .string "It is true that a higher-level\n"
+    .string "POKéMON will be more powerful…\p"
+    .string "But, all POKéMON will have weak\n"
+    .string "points against specific types.\p"
+    .string "So, there appears to be no\n"
+    .string "universally strong POKéMON.$"
+
diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..5d077ec8f
--- /dev/null
+++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_VERMILION_CITY_POKEMON_CENTER_2F",
+  "name": "VermilionCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..b64ac0660
--- /dev/null
+++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457
+	map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, VermilionCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C
+	call EventScript_1BB4A3
+	end
+
+EventScript_16B472:: @ 816B472
+	call EventScript_1BB6AB
+	end
+
+EventScript_16B478:: @ 816B478
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json
new file mode 100644
index 000000000..2f9255233
--- /dev/null
+++ b/data/maps/VermilionCity_PokemonFanClub/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB",
+  "name": "VermilionCity_PokemonFanClub",
+  "layout": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB",
+  "music": "BGM_FRLG_VERMILION_CITY",
+  "region_map_section": "MAPSEC_VERMILION_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 5,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonFanClub_EventScript_16B47F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "48",
+      "x": 6,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonFanClub_EventScript_16B4FC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "120",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonFanClub_EventScript_16B59E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "126",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonFanClub_EventScript_16B5B1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonFanClub_EventScript_16B528",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "27",
+      "x": 7,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VermilionCity_PokemonFanClub_EventScript_16B563",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_VERMILION_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "script": "VermilionCity_PokemonFanClub_EventScript_16B5C4"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "script": "VermilionCity_PokemonFanClub_EventScript_16B5CD"
+    }
+  ]
+}
diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
new file mode 100644
index 000000000..60d983af0
--- /dev/null
+++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
@@ -0,0 +1,166 @@
+VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E
+	.byte 0
+
+VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F
+	lock
+	faceplayer
+	checkflag FLAG_0x241
+	goto_if_eq EventScript_16B4A7
+	msgbox gUnknown_819457E, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16B4B1
+	msgbox gUnknown_8194860
+	release
+	end
+
+EventScript_16B4A7:: @ 816B4A7
+	msgbox gUnknown_819488E
+	release
+	end
+
+EventScript_16B4B1:: @ 816B4B1
+	msgbox gUnknown_8194628
+	checkitemspace ITEM_BIKE_VOUCHER, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B4F2
+	setflag FLAG_0x241
+	additem ITEM_BIKE_VOUCHER, 1
+	giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, BGM_FRLG_ME_KEYITEM
+	msgbox gUnknown_819477C
+	release
+	end
+
+EventScript_16B4F2:: @ 816B4F2
+	msgbox gUnknown_81948D2
+	release
+	end
+
+VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC
+	lock
+	faceplayer
+	checkflag FLAG_0x82C
+	goto_if_eq EventScript_16B511
+	msgbox gUnknown_81948E6
+	release
+	end
+
+EventScript_16B511:: @ 816B511
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_8194960
+	release
+	end
+
+VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528
+	lock
+	faceplayer
+	checkflag FLAG_0x003
+	goto_if_eq EventScript_16B54B
+	msgbox gUnknown_81944CC
+	closemessage
+	applymovement 5, Movement_1A75E5
+	waitmovement 0
+	setflag FLAG_0x002
+	release
+	end
+
+EventScript_16B54B:: @ 816B54B
+	msgbox gUnknown_8194518
+	closemessage
+	applymovement 5, Movement_1A75E5
+	waitmovement 0
+	clearflag FLAG_0x003
+	release
+	end
+
+VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563
+	lock
+	faceplayer
+	checkflag FLAG_0x002
+	goto_if_eq EventScript_16B586
+	msgbox gUnknown_819446F
+	closemessage
+	applymovement 6, Movement_1A75E5
+	waitmovement 0
+	setflag FLAG_0x003
+	release
+	end
+
+EventScript_16B586:: @ 816B586
+	msgbox gUnknown_819449C
+	closemessage
+	applymovement 6, Movement_1A75E5
+	waitmovement 0
+	clearflag FLAG_0x002
+	release
+	end
+
+VermilionCity_PokemonFanClub_EventScript_16B59E:: @ 816B59E
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_PIKACHU, 0
+	msgbox gUnknown_819455A
+	waitmoncry
+	release
+	end
+
+VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_SEEL, 0
+	msgbox gUnknown_8194571
+	waitmoncry
+	release
+	end
+
+VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4
+	msgbox gUnknown_8194910, 3
+	end
+
+VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD
+	msgbox gUnknown_819493D, 3
+	end
+
+VermilionCity_House2_MapScripts:: @ 816B5D6
+	.byte 0
+
+VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7
+	lock
+	faceplayer
+	setvar VAR_0x8008, 3
+	call EventScript_1A8CAD
+	checkflag FLAG_0x24D
+	goto_if_eq EventScript_16B649
+	msgbox gUnknown_81949CB, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16B631
+	call EventScript_1A8CBD
+	compare_var_to_value VAR_0x8004, 6
+	goto_if 4, EventScript_16B631
+	call EventScript_1A8CC9
+	compare_var_to_var VAR_RESULT, VAR_0x8009
+	goto_if 5, EventScript_16B63B
+	call EventScript_1A8CD9
+	msgbox gUnknown_8194A44
+	setflag FLAG_0x24D
+	release
+	end
+
+EventScript_16B631:: @ 816B631
+	msgbox gUnknown_81949FD
+	release
+	end
+
+EventScript_16B63B:: @ 816B63B
+	getspeciesname 0, VAR_0x8009
+	msgbox gUnknown_8194A0D
+	release
+	end
+
+EventScript_16B649:: @ 816B649
+	msgbox gUnknown_8194A4F
+	release
+	end
diff --git a/data/maps/VermilionCity_PokemonFanClub/text.inc b/data/maps/VermilionCity_PokemonFanClub/text.inc
new file mode 100644
index 000000000..1264be24d
--- /dev/null
+++ b/data/maps/VermilionCity_PokemonFanClub/text.inc
@@ -0,0 +1,144 @@
+Text_194234:: @ 8194234
+    .string "The urge to battle with someone\n"
+    .string "you've tangled with before…\p"
+    .string "Have you ever had that urge?\n"
+    .string "I'm sure you have.\p"
+    .string "I wanted to battle certain people\n"
+    .string "again over and over, too.\p"
+    .string "So, I've been giving these away.\n"
+    .string "Please, take one!$"
+
+Text_19430F:: @ 819430F
+    .string "Use that device and you'll find\n"
+    .string "TRAINERS looking for a rematch.\p"
+    .string "You have to charge its battery to\n"
+    .string "use it, though.$"
+
+Text_194381:: @ 8194381
+    .string "How do you use the VS SEEKER?\n"
+    .string "There's nothing to it.\p"
+    .string "Use it like beep-beep-beep, and\n"
+    .string "TRAINERS around you will notice.\p"
+    .string "If any TRAINER wants a rematch,\n"
+    .string "it will let you know immediately.\p"
+    .string "Charge its battery and use it\n"
+    .string "while you're on a road.$"
+
+gUnknown_819446F:: @ 819446F
+    .string "Won't you admire my PIKACHU's\n"
+    .string "adorable tail?$"
+
+gUnknown_819449C:: @ 819449C
+    .string "Humph!\p"
+    .string "My PIKACHU is twice as cute as\n"
+    .string "that one!$"
+
+gUnknown_81944CC:: @ 81944CC
+    .string "I just adore my SEEL!\n"
+    .string "It's so lovable!\p"
+    .string "It squeals, “Kyuuuh,” when I\n"
+    .string "hug it!$"
+
+gUnknown_8194518:: @ 8194518
+    .string "Oh, dear!\p"
+    .string "My SEEL is far more attractive.\n"
+    .string "By double, I would say.$"
+
+gUnknown_819455A:: @ 819455A
+    .string "PIKACHU: Chu! Pikachu!$"
+
+gUnknown_8194571:: @ 8194571
+    .string "SEEL: Kyuoo!$"
+
+gUnknown_819457E:: @ 819457E
+    .string "I chair the POKéMON Fan Club!\p"
+    .string "I raise more than a hundred\n"
+    .string "POKéMON!\p"
+    .string "I'm very fussy when it comes to\n"
+    .string "POKéMON! I surely am!\p"
+    .string "So…\p"
+    .string "Did you come visit to hear about\n"
+    .string "my POKéMON?$"
+
+gUnknown_8194628:: @ 8194628
+    .string "Good!\n"
+    .string "Then listen up!\p"
+    .string "My favorite RAPIDASH…\p"
+    .string "It's…cute…lovely…smart… \n"
+    .string "plus…amazing…you think so?…\l"
+    .string "oh yes…it's…stunning…\l"
+    .string "kindly…love it!\p"
+    .string "Hug it…when…sleeping…warm\n"
+    .string "and cuddly…spectacular…\l"
+    .string "ravishing…\l"
+    .string "…Oops! Look at the time!\l"
+    .string "I kept you too long!\p"
+    .string "Thanks for hearing me out!\n"
+    .string "I want you to have this!$"
+
+gUnknown_819474E:: @ 819474E
+    .string "{PLAYER} received a BIKE VOUCHER\n"
+    .string "from the CHAIRMAN.$"
+
+gUnknown_819477C:: @ 819477C
+    .string "Take that BIKE VOUCHER to the\n"
+    .string "BIKE SHOP in CERULEAN CITY.\p"
+    .string "Exchange that for a BICYCLE\n"
+    .string "free of charge!\p"
+    .string "Don't worry, my favorite FEAROW\n"
+    .string "will FLY me anywhere I need to go.\p"
+    .string "So, I have no need for a BICYCLE.\p"
+    .string "I hope you like cycling!$"
+
+gUnknown_8194860:: @ 8194860
+    .string "Oh. Come back when you want to\n"
+    .string "hear my story!$"
+
+gUnknown_819488E:: @ 819488E
+    .string "Hello, {PLAYER}!\p"
+    .string "Did you come see me about my\n"
+    .string "POKéMON again?\p"
+    .string "No?\n"
+    .string "Too bad!$"
+
+gUnknown_81948D2:: @ 81948D2
+    .string "Make room for this!$"
+
+gUnknown_81948E6:: @ 81948E6
+    .string "Our CHAIRMAN is very vocal about\n"
+    .string "POKéMON.$"
+
+gUnknown_8194910:: @ 8194910
+    .string "Let's all listen politely to other\n"
+    .string "TRAINERS!$"
+
+gUnknown_819493D:: @ 819493D
+    .string "If someone brags, brag right back!$"
+
+gUnknown_8194960:: @ 8194960
+    .string "Our CHAIRMAN really does adore his\n"
+    .string "POKéMON.\p"
+    .string "But the person who is most liked by\n"
+    .string "POKéMON is DAISY, I think.$"
+
+gUnknown_81949CB:: @ 81949CB
+    .string "Hi!\n"
+    .string "Do you have a {STR_VAR_1}?\p"
+    .string "Want to trade it for my\n"
+    .string "{STR_VAR_2}?$"
+
+gUnknown_81949FD:: @ 81949FD
+    .string "That's too bad.$"
+
+gUnknown_8194A0D:: @ 8194A0D
+    .string "…This is no {STR_VAR_1}.\p"
+    .string "If you get one, please trade it\n"
+    .string "to me!$"
+
+gUnknown_8194A44:: @ 8194A44
+    .string "Thank you!$"
+
+gUnknown_8194A4F:: @ 8194A4F
+    .string "How is my old {STR_VAR_2}?\p"
+    .string "My {STR_VAR_1} is doing great!$"
+
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
new file mode 100644
index 000000000..a62dd427d
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -0,0 +1,155 @@
+{
+  "id": "MAP_VICTORY_ROAD_1F",
+  "name": "VictoryRoad_1F",
+  "layout": "LAYOUT_VICTORY_ROAD_1F",
+  "music": "BGM_FRLG_MT_MOON",
+  "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "41",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "VictoryRoad_1F_EventScript_160F7B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 14,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "VictoryRoad_1F_EventScript_160F64",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_1F_EventScript_1BE9D2",
+      "flag": "425"
+    },
+    {
+      "graphics_id": "92",
+      "x": 14,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_1F_EventScript_1BE9DF",
+      "flag": "426"
+    },
+    {
+      "graphics_id": "97",
+      "x": 7,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_1F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_1F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 16,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_1F_EventScript_1BE11D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE23",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 20,
+      "y": 16,
+      "elevation": 3,
+      "var": "VAR_0x4064",
+      "var_value": 99,
+      "script": "VictoryRoad_1F_EventScript_160F33"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 12,
+      "elevation": 0,
+      "item": "POCKET_KEY_ITEMS",
+      "flag": "37",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "item": "ITEM_FULL_RESTORE",
+      "flag": "38",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
new file mode 100644
index 000000000..656bd8e6c
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -0,0 +1,46 @@
+VictoryRoad_1F_MapScripts:: @ 8160F05
+	map_script 1, VictoryRoad_1F_MapScript1_160F10
+	map_script 3, VictoryRoad_1F_MapScript2_160F2F
+	.byte 0
+
+VictoryRoad_1F_MapScript1_160F10:: @ 8160F10
+	compare_var_to_value VAR_0x4064, 100
+	call_if 5, EventScript_160F1C
+	end
+
+EventScript_160F1C:: @ 8160F1C
+	setmetatile 12, 14, 775, 1
+	setmetatile 12, 15, 791, 1
+	return
+
+VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F
+	setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F
+	end
+
+VictoryRoad_1F_EventScript_160F33:: @ 8160F33
+	lockall
+	compare_var_to_value VAR_0x4064, 100
+	goto_if_eq EventScript_160F62
+	setmetatile 12, 14, 721, 0
+	setmetatile 12, 15, 737, 0
+	playse SE_MU_PACHI
+	special DrawWholeMapView
+	waitse
+	moveobjectoffscreen 5
+	setvar VAR_0x4064, 100
+	releaseall
+	end
+
+EventScript_160F62:: @ 8160F62
+	releaseall
+	end
+
+VictoryRoad_1F_EventScript_160F64:: @ 8160F64
+	trainerbattle 0, 406, 0, Text_174710, Text_174738
+	msgbox gUnknown_8174744, 6
+	end
+
+VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B
+	trainerbattle 0, 396, 0, Text_174784, Text_1747B8
+	msgbox gUnknown_81747C8, 6
+	end
diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc
new file mode 100644
index 000000000..46cd136ad
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/text.inc
@@ -0,0 +1,22 @@
+Text_174710:: @ 8174710
+    .string "I wonder if you are good enough\n"
+    .string "for me?$"
+
+Text_174738:: @ 8174738
+    .string "I lost out…$"
+
+gUnknown_8174744:: @ 8174744
+    .string "I never wanted to lose to anybody,\n"
+    .string "especially to a younger kid…$"
+
+Text_174784:: @ 8174784
+    .string "I can see you're good.\n"
+    .string "Let me see exactly how good!$"
+
+Text_1747B8:: @ 81747B8
+    .string "I had a chance…$"
+
+gUnknown_81747C8:: @ 81747C8
+    .string "Tch!\n"
+    .string "I concede, you are better than I!$"
+
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
new file mode 100644
index 000000000..058247ece
--- /dev/null
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -0,0 +1,272 @@
+{
+  "id": "MAP_VICTORY_ROAD_2F",
+  "name": "VictoryRoad_2F",
+  "layout": "LAYOUT_VICTORY_ROAD_2F",
+  "music": "BGM_FRLG_MT_MOON",
+  "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "52",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "VictoryRoad_2F_EventScript_161037",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 20,
+      "y": 11,
+      "elevation": 4,
+      "movement_type": "17",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "VictoryRoad_2F_EventScript_16104E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 31,
+      "y": 16,
+      "elevation": 4,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "VictoryRoad_2F_EventScript_161065",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 26,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "40",
+      "movement_range_x": 4,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "VictoryRoad_2F_EventScript_161093",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 36,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "VictoryRoad_2F_EventScript_16107C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_2F_EventScript_1BE9EC",
+      "flag": "427"
+    },
+    {
+      "graphics_id": "92",
+      "x": 40,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_2F_EventScript_1BE9F9",
+      "flag": "428"
+    },
+    {
+      "graphics_id": "92",
+      "x": 25,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_2F_EventScript_1BEA06",
+      "flag": "429"
+    },
+    {
+      "graphics_id": "92",
+      "x": 14,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_2F_EventScript_1BEA13",
+      "flag": "430"
+    },
+    {
+      "graphics_id": "97",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_2F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 6,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_2F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 33,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_2F_EventScript_1BE11D",
+      "flag": "88"
+    },
+    {
+      "graphics_id": "41",
+      "x": 40,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_2F_EventScript_1C47AE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 34,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 38,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 36,
+      "y": 17,
+      "elevation": 4,
+      "dest_map": "MAP_VICTORY_ROAD_3F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 49,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE23",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 48,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE23",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 47,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE23",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 34,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_3F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_0x4065",
+      "var_value": 99,
+      "script": "VictoryRoad_2F_EventScript_160FD5"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_0x4066",
+      "var_value": 99,
+      "script": "VictoryRoad_2F_EventScript_161006"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc
new file mode 100644
index 000000000..b35ee7821
--- /dev/null
+++ b/data/maps/VictoryRoad_2F/scripts.inc
@@ -0,0 +1,81 @@
+VictoryRoad_2F_MapScripts:: @ 8160F92
+	map_script 1, VictoryRoad_2F_MapScript1_160F98
+	.byte 0
+
+VictoryRoad_2F_MapScript1_160F98:: @ 8160F98
+	compare_var_to_value VAR_0x4065, 100
+	call_if 5, EventScript_160FAF
+	compare_var_to_value VAR_0x4066, 100
+	call_if 5, EventScript_160FC2
+	end
+
+EventScript_160FAF:: @ 8160FAF
+	setmetatile 13, 10, 775, 1
+	setmetatile 13, 11, 791, 1
+	return
+
+EventScript_160FC2:: @ 8160FC2
+	setmetatile 33, 16, 775, 1
+	setmetatile 33, 17, 791, 1
+	return
+
+VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
+	lockall
+	compare_var_to_value VAR_0x4065, 100
+	goto_if_eq EventScript_161004
+	setmetatile 13, 10, 721, 0
+	setmetatile 13, 11, 737, 0
+	playse SE_MU_PACHI
+	special DrawWholeMapView
+	waitse
+	moveobjectoffscreen 11
+	setvar VAR_0x4065, 100
+	releaseall
+	end
+
+EventScript_161004:: @ 8161004
+	releaseall
+	end
+
+VictoryRoad_2F_EventScript_161006:: @ 8161006
+	lockall
+	compare_var_to_value VAR_0x4066, 100
+	goto_if_eq EventScript_161035
+	setmetatile 33, 16, 721, 0
+	setmetatile 33, 17, 737, 0
+	playse SE_MU_PACHI
+	special DrawWholeMapView
+	waitse
+	moveobjectoffscreen 12
+	setvar VAR_0x4066, 100
+	releaseall
+	end
+
+EventScript_161035:: @ 8161035
+	releaseall
+	end
+
+VictoryRoad_2F_EventScript_161037:: @ 8161037
+	trainerbattle 0, 167, 0, Text_1747EF, Text_17482C
+	msgbox gUnknown_817483E, 6
+	end
+
+VictoryRoad_2F_EventScript_16104E:: @ 816104E
+	trainerbattle 0, 325, 0, Text_174877, Text_1748B4
+	msgbox gUnknown_81748BB, 6
+	end
+
+VictoryRoad_2F_EventScript_161065:: @ 8161065
+	trainerbattle 0, 287, 0, Text_1748EE, Text_17491B
+	msgbox gUnknown_8174927, 6
+	end
+
+VictoryRoad_2F_EventScript_16107C:: @ 816107C
+	trainerbattle 0, 290, 0, Text_174995, Text_1749B0
+	msgbox gUnknown_81749BB, 6
+	end
+
+VictoryRoad_2F_EventScript_161093:: @ 8161093
+	trainerbattle 0, 298, 0, Text_174942, Text_17495A
+	msgbox gUnknown_8174969, 6
+	end
diff --git a/data/maps/VictoryRoad_2F/text.inc b/data/maps/VictoryRoad_2F/text.inc
new file mode 100644
index 000000000..d125ef160
--- /dev/null
+++ b/data/maps/VictoryRoad_2F/text.inc
@@ -0,0 +1,54 @@
+Text_1747EF:: @ 81747EF
+    .string "If you can get through here,\n"
+    .string "you can go meet the ELITE FOUR.$"
+
+Text_17482C:: @ 817482C
+    .string "No!\n"
+    .string "Unbelievable!$"
+
+gUnknown_817483E:: @ 817483E
+    .string "I can beat you when it comes to\n"
+    .string "knowledge about POKéMON!$"
+
+Text_174877:: @ 8174877
+    .string "This here is VICTORY ROAD.\n"
+    .string "It's the final test for TRAINERS!$"
+
+Text_1748B4:: @ 81748B4
+    .string "Atcho!$"
+
+gUnknown_81748BB:: @ 81748BB
+    .string "If you get stuck, try moving some\n"
+    .string "boulders around.$"
+
+Text_1748EE:: @ 81748EE
+    .string "Ah, so you wish to challenge the\n"
+    .string "ELITE FOUR?$"
+
+Text_17491B:: @ 817491B
+    .string "You got me!$"
+
+gUnknown_8174927:: @ 8174927
+    .string "{RIVAL} also came through here.$"
+
+Text_174942:: @ 8174942
+    .string "Come on!\n"
+    .string "I'll whip you!$"
+
+Text_17495A:: @ 817495A
+    .string "I got whipped!$"
+
+gUnknown_8174969:: @ 8174969
+    .string "You earned the right to be on\n"
+    .string "VICTORY ROAD…$"
+
+Text_174995:: @ 8174995
+    .string "Is VICTORY ROAD too tough?$"
+
+Text_1749B0:: @ 81749B0
+    .string "Well done!$"
+
+gUnknown_81749BB:: @ 81749BB
+    .string "Many TRAINERS give up their\n"
+    .string "challenge here and go home.$"
+
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
new file mode 100644
index 000000000..5ba23ad2e
--- /dev/null
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -0,0 +1,222 @@
+{
+  "id": "MAP_VICTORY_ROAD_3F",
+  "name": "VictoryRoad_3F",
+  "layout": "LAYOUT_VICTORY_ROAD_3F",
+  "music": "BGM_FRLG_MT_MOON",
+  "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_4",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "41",
+      "x": 40,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "VictoryRoad_3F_EventScript_161103",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 21,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "VictoryRoad_3F_EventScript_161148",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 10,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "VictoryRoad_3F_EventScript_16111A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "VictoryRoad_3F_EventScript_161131",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 38,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_3F_EventScript_1BEA20",
+      "flag": "431"
+    },
+    {
+      "graphics_id": "92",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_3F_EventScript_1BEA2D",
+      "flag": "432"
+    },
+    {
+      "graphics_id": "97",
+      "x": 19,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_3F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 33,
+      "y": 18,
+      "elevation": 0,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 88,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_3F_EventScript_1BE11D",
+      "flag": "89"
+    },
+    {
+      "graphics_id": "97",
+      "x": 35,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_3F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "97",
+      "x": 32,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "VictoryRoad_3F_EventScript_1BE11D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 38,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "VictoryRoad_3F_EventScript_16115F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "42",
+      "x": 39,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "VictoryRoad_3F_EventScript_16117A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 34,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 37,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 39,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_2F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 34,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_2F",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x4067",
+      "var_value": 99,
+      "script": "VictoryRoad_3F_EventScript_1610CF"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc
new file mode 100644
index 000000000..17331cee4
--- /dev/null
+++ b/data/maps/VictoryRoad_3F/scripts.inc
@@ -0,0 +1,62 @@
+VictoryRoad_3F_MapScripts:: @ 81610AA
+	map_script 1, VictoryRoad_3F_MapScript1_1610B0
+	.byte 0
+
+VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0
+	compare_var_to_value VAR_0x4067, 100
+	call_if 5, EventScript_1610BC
+	end
+
+EventScript_1610BC:: @ 81610BC
+	setmetatile 12, 12, 775, 1
+	setmetatile 12, 13, 791, 1
+	return
+
+VictoryRoad_3F_EventScript_1610CF:: @ 81610CF
+	lockall
+	compare_var_to_value VAR_0x4067, 100
+	goto_if_eq EventScript_161101
+	setmetatile 12, 12, 721, 0
+	setmetatile 12, 13, 737, 0
+	playse SE_MU_PACHI
+	special DrawWholeMapView
+	waitse
+	moveobjectoffscreen 7
+	moveobjectoffscreen 10
+	setvar VAR_0x4067, 100
+	releaseall
+	end
+
+EventScript_161101:: @ 8161101
+	releaseall
+	end
+
+VictoryRoad_3F_EventScript_161103:: @ 8161103
+	trainerbattle 0, 393, 0, Text_174B60, Text_174B83
+	msgbox gUnknown_8174B99, 6
+	end
+
+VictoryRoad_3F_EventScript_16111A:: @ 816111A
+	trainerbattle 0, 394, 0, Text_174C8A, Text_174CA9
+	msgbox gUnknown_8174CBD, 6
+	end
+
+VictoryRoad_3F_EventScript_161131:: @ 8161131
+	trainerbattle 0, 403, 0, Text_174C30, Text_174C5A
+	msgbox gUnknown_8174C67, 6
+	end
+
+VictoryRoad_3F_EventScript_161148:: @ 8161148
+	trainerbattle 0, 404, 0, Text_174BCA, Text_174BF4
+	msgbox gUnknown_8174C03, 6
+	end
+
+VictoryRoad_3F_EventScript_16115F:: @ 816115F
+	trainerbattle 4, 485, 0, Text_174D0C, Text_174D45, Text_174D96
+	msgbox gUnknown_8174D64, 6
+	end
+
+VictoryRoad_3F_EventScript_16117A:: @ 816117A
+	trainerbattle 4, 485, 0, Text_174E08, Text_174E39, Text_174E8D
+	msgbox gUnknown_8174E48, 6
+	end
diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc
new file mode 100644
index 000000000..fbda3b739
--- /dev/null
+++ b/data/maps/VictoryRoad_3F/text.inc
@@ -0,0 +1,103 @@
+Text_1749F3:: @ 81749F3
+    .string "ギヤーオ！$"
+
+Text_1749F9:: @ 81749F9
+    .string "You should be proud of yourself,\n"
+    .string "having battled your way through\l"
+    .string "VICTORY ROAD so courageously.\p"
+    .string "In recognition of your feat,\n"
+    .string "I'll teach you DOUBLE-EDGE.\p"
+    .string "Would you like me to teach that\n"
+    .string "technique?$"
+
+Text_174ABC:: @ 8174ABC
+    .string "I'll teach you the technique\n"
+    .string "anytime.$"
+
+Text_174AE2:: @ 8174AE2
+    .string "Which POKéMON should I teach\n"
+    .string "DOUBLE-EDGE?$"
+
+Text_174B0C:: @ 8174B0C
+    .string "Keep that drive going for the\n"
+    .string "POKéMON LEAGUE!\p"
+    .string "Take a run at them and knock 'em\n"
+    .string "out!$"
+
+Text_174B60:: @ 8174B60
+    .string "I heard rumors of a child prodigy.$"
+
+Text_174B83:: @ 8174B83
+    .string "The rumors were true!$"
+
+gUnknown_8174B99:: @ 8174B99
+    .string "So, it was you who beat GIOVANNI\n"
+    .string "of TEAM ROCKET?$"
+
+Text_174BCA:: @ 8174BCA
+    .string "TRAINERS live to seek stronger\n"
+    .string "opponents.$"
+
+Text_174BF4:: @ 8174BF4
+    .string "Oh!\n"
+    .string "So strong!$"
+
+gUnknown_8174C03:: @ 8174C03
+    .string "By fighting tough battles, you get\n"
+    .string "stronger.$"
+
+Text_174C30:: @ 8174C30
+    .string "I'll show you just how good you\n"
+    .string "are. Not!$"
+
+Text_174C5A:: @ 8174C5A
+    .string "I'm furious!$"
+
+gUnknown_8174C67:: @ 8174C67
+    .string "You showed me just how good\n"
+    .string "I was…$"
+
+Text_174C8A:: @ 8174C8A
+    .string "Only the chosen can pass here!$"
+
+Text_174CA9:: @ 8174CA9
+    .string "I don't believe it!$"
+
+gUnknown_8174CBD:: @ 8174CBD
+    .string "All TRAINERS here are headed to\n"
+    .string "the POKéMON LEAGUE.\p"
+    .string "Don't let down your guard.$"
+
+Text_174D0C:: @ 8174D0C
+    .string "RAY: Together, the two of us are\n"
+    .string "destined for greatness!$"
+
+Text_174D45:: @ 8174D45
+    .string "RAY: Ludicrous!\n"
+    .string "This can't be!$"
+
+gUnknown_8174D64:: @ 8174D64
+    .string "RAY: You've beaten us.\n"
+    .string "Greatness remains elusive…$"
+
+Text_174D96:: @ 8174D96
+    .string "RAY: Together, the two of us are\n"
+    .string "striving for the pinnacle.\p"
+    .string "We need you to bring two POKéMON\n"
+    .string "into battle with us.$"
+
+Text_174E08:: @ 8174E08
+    .string "TYRA: We're trying to become\n"
+    .string "champions together.$"
+
+Text_174E39:: @ 8174E39
+    .string "TYRA: Oh, but…$"
+
+gUnknown_8174E48:: @ 8174E48
+    .string "TYRA: You've taught me that power\n"
+    .string "can be infinite in shape and form.$"
+
+Text_174E8D:: @ 8174E8D
+    .string "TYRA: You can't battle with us if\n"
+    .string "you have only one POKéMON.$"
+
diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json
new file mode 100644
index 000000000..2c47e786f
--- /dev/null
+++ b/data/maps/ViridianCity/map.json
@@ -0,0 +1,262 @@
+{
+  "id": "MAP_VIRIDIAN_CITY",
+  "name": "ViridianCity",
+  "layout": "LAYOUT_VIRIDIAN_CITY",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_VIRIDIAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE2",
+      "offset": 12,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE1",
+      "offset": 12,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE22",
+      "offset": 10,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "27",
+      "x": 8,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_165AF0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 11,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_1BDF13",
+      "flag": "17"
+    },
+    {
+      "graphics_id": "32",
+      "x": 34,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_1659CA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "240",
+      "x": 21,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 2,
+      "movement_range_y": 3,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_1659F6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "31",
+      "x": 20,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_165AC4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 33,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_165A8F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 16,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_1659C1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 18,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_EventScript_1BEB8C",
+      "flag": "461"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 26,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 25,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY_HOUSE1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 36,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_VIRIDIAN_CITY_GYM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 25,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_VIRIDIAN_CITY_HOUSE2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 36,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_VIRIDIAN_CITY_MART",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4051",
+      "var_value": 0,
+      "script": "ViridianCity_EventScript_165AF6"
+    },
+    {
+      "type": "trigger",
+      "x": 36,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 0,
+      "script": "ViridianCity_EventScript_16596D"
+    },
+    {
+      "type": "trigger",
+      "x": 20,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4051",
+      "var_value": 1,
+      "script": "ViridianCity_EventScript_165B10"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4051",
+      "var_value": 1,
+      "script": "ViridianCity_EventScript_165B2E"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 23,
+      "y": 1,
+      "elevation": 3,
+      "script": "ViridianCity_EventScript_16599D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 32,
+      "y": 10,
+      "elevation": 0,
+      "script": "ViridianCity_EventScript_1659AF"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 20,
+      "y": 31,
+      "elevation": 0,
+      "script": "ViridianCity_EventScript_1659A6"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 20,
+      "y": 16,
+      "elevation": 0,
+      "script": "ViridianCity_EventScript_165994"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 36,
+      "y": 10,
+      "elevation": 0,
+      "script": "ViridianCity_EventScript_1659B8"
+    }
+  ]
+}
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
new file mode 100644
index 000000000..5434fa1fa
--- /dev/null
+++ b/data/maps/ViridianCity/scripts.inc
@@ -0,0 +1,257 @@
+ViridianCity_MapScripts:: @ 81658D3
+	map_script 3, ViridianCity_MapScript1_1658D9
+	.byte 0
+
+ViridianCity_MapScript1_1658D9:: @ 81658D9
+	setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY
+	compare_var_to_value VAR_0x4051, 0
+	call_if 1, EventScript_165920
+	compare_var_to_value VAR_0x4051, 1
+	call_if 1, EventScript_16590F
+	compare_var_to_value VAR_0x4051, 2
+	call_if 4, EventScript_165909
+	compare_var_to_value VAR_0x405A, 0
+	call_if 1, EventScript_165931
+	end
+
+EventScript_165909:: @ 8165909
+	setvar VAR_0x4010, 32
+	return
+
+EventScript_16590F:: @ 816590F
+	setvar VAR_0x4010, 32
+	setobjectxyperm 4, 21, 8
+	setobjectmovementtype 4, 1
+	return
+
+EventScript_165920:: @ 8165920
+	setvar VAR_0x4010, 34
+	setobjectxyperm 4, 21, 11
+	setobjectmovementtype 4, 8
+	return
+
+EventScript_165931:: @ 8165931
+	checkflag FLAG_0x821
+	goto_if 0, EventScript_1A77A9
+	checkflag FLAG_0x822
+	goto_if 0, EventScript_1A77A9
+	checkflag FLAG_0x823
+	goto_if 0, EventScript_1A77A9
+	checkflag FLAG_UNK824
+	goto_if 0, EventScript_1A77A9
+	checkflag FLAG_0x825
+	goto_if 0, EventScript_1A77A9
+	checkflag FLAG_UNK826
+	goto_if 0, EventScript_1A77A9
+	setvar VAR_0x405A, 1
+	return
+
+ViridianCity_EventScript_16596D:: @ 816596D
+	lockall
+	textcolor 3
+	applymovement 255, Movement_1A75E9
+	waitmovement 0
+	delay 20
+	msgbox gUnknown_817E2F5
+	closemessage
+	applymovement 255, Movement_165992
+	waitmovement 0
+	releaseall
+	end
+
+Movement_165992:: @ 8165992
+	step_14
+	step_end
+
+ViridianCity_EventScript_165994:: @ 8165994
+	msgbox gUnknown_817E1BB, 3
+	end
+
+ViridianCity_EventScript_16599D:: @ 816599D
+	msgbox gUnknown_817E1E7, 3
+	end
+
+ViridianCity_EventScript_1659A6:: @ 81659A6
+	msgbox gUnknown_817E24D, 3
+	end
+
+ViridianCity_EventScript_1659AF:: @ 81659AF
+	msgbox gUnknown_817E2DB, 3
+	end
+
+ViridianCity_EventScript_1659B8:: @ 81659B8
+	msgbox gUnknown_817E2F5, 3
+	end
+
+ViridianCity_EventScript_1659C1:: @ 81659C1
+	msgbox gUnknown_817DABB, 2
+	end
+
+ViridianCity_EventScript_1659CA:: @ 81659CA
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x405A, 1
+	goto_if_eq EventScript_1659EC
+	msgbox gUnknown_817DB39
+	closemessage
+	applymovement 3, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+EventScript_1659EC:: @ 81659EC
+	msgbox gUnknown_817DB78
+	release
+	end
+
+ViridianCity_EventScript_1659F6:: @ 81659F6
+	lock
+	faceplayer
+	checkflag FLAG_UNK820
+	goto_if_eq EventScript_165A23
+	compare_var_to_value VAR_0x4051, 2
+	goto_if 4, EventScript_165A4A
+	compare_var_to_value VAR_0x4051, 1
+	goto_if_eq EventScript_165A54
+	compare_var_to_value VAR_0x4051, 0
+	goto_if_eq EventScript_165A84
+	end
+
+EventScript_165A23:: @ 8165A23
+	msgbox gUnknown_817E046, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_165A40
+	msgbox gUnknown_817E0EA
+	release
+	end
+
+EventScript_165A40:: @ 8165A40
+	msgbox gUnknown_817E14E
+	release
+	end
+
+EventScript_165A4A:: @ 8165A4A
+	msgbox gUnknown_817DF61
+	release
+	end
+
+EventScript_165A54:: @ 8165A54
+	call EventScript_165B4C
+	release
+	end
+
+EventScript_165A5B:: @ 8165A5B
+	msgbox gUnknown_817DEEB
+	release
+	end
+
+EventScript_165A65:: @ 8165A65
+	msgbox gUnknown_817DE9B
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	special sub_807F888
+	waitstate
+	release
+	end
+
+EventScript_165A84:: @ 8165A84
+	msgbox gUnknown_817DD03
+	closemessage
+	release
+	end
+
+ViridianCity_EventScript_165A8F:: @ 8165A8F
+	lock
+	faceplayer
+	msgbox gUnknown_817DB98, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_165AB0
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_165ABA
+	end
+
+EventScript_165AB0:: @ 8165AB0
+	msgbox gUnknown_817DBE4
+	release
+	end
+
+EventScript_165ABA:: @ 8165ABA
+	msgbox gUnknown_817DBD5
+	release
+	end
+
+ViridianCity_EventScript_165AC4:: @ 8165AC4
+	lock
+	faceplayer
+	compare_var_to_value VAR_0x4051, 0
+	goto_if_eq EventScript_165ADB
+	msgbox gUnknown_817DC99
+	release
+	end
+
+EventScript_165ADB:: @ 8165ADB
+	msgbox gUnknown_817DC4E
+	closemessage
+	applymovement 5, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+ViridianCity_EventScript_165AF0:: @ 8165AF0
+	goto EventScript_1C4A1E
+	end
+
+ViridianCity_EventScript_165AF6:: @ 8165AF6
+	lockall
+	textcolor 0
+	msgbox gUnknown_817DD03
+	closemessage
+	applymovement 255, Movement_165B0E
+	waitmovement 0
+	releaseall
+	end
+
+Movement_165B0E:: @ 8165B0E
+	step_10
+	step_end
+
+ViridianCity_EventScript_165B10:: @ 8165B10
+	lockall
+	textcolor 0
+	applymovement 4, Movement_1A75E7
+	waitmovement 0
+	applymovement 255, Movement_1A75EB
+	waitmovement 0
+	call EventScript_165B4C
+	release
+	end
+
+ViridianCity_EventScript_165B2E:: @ 8165B2E
+	lockall
+	textcolor 0
+	applymovement 4, Movement_1A75EB
+	waitmovement 0
+	applymovement 255, Movement_1A75E7
+	waitmovement 0
+	call EventScript_165B4C
+	release
+	end
+
+EventScript_165B4C:: @ 8165B4C
+	msgbox gUnknown_817DD4E
+	closemessage
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	special sub_8112364
+	special sub_807F888
+	waitstate
+	lock
+	faceplayer
+	msgbox gUnknown_817DE9B
+	setvar VAR_0x4051, 2
+	giveitem ITEM_TEACHY_TV
+	msgbox gUnknown_817DEEB
+	return
diff --git a/data/maps/ViridianCity/text.inc b/data/maps/ViridianCity/text.inc
new file mode 100644
index 000000000..37b1d3c55
--- /dev/null
+++ b/data/maps/ViridianCity/text.inc
@@ -0,0 +1,125 @@
+gUnknown_817DABB:: @ 817DABB
+    .string "Those POKé BALLS at your waist!\n"
+    .string "You have POKéMON, don't you?\p"
+    .string "It's great that you can carry and\n"
+    .string "use POKéMON anytime, anywhere.$"
+
+gUnknown_817DB39:: @ 817DB39
+    .string "This POKéMON GYM is always closed.\p"
+    .string "I wonder who the LEADER is?$"
+
+gUnknown_817DB78:: @ 817DB78
+    .string "VIRIDIAN GYM's LEADER returned!$"
+
+gUnknown_817DB98:: @ 817DB98
+    .string "You want to know about the two\n"
+    .string "kinds of caterpillar POKéMON?$"
+
+gUnknown_817DBD5:: @ 817DBD5
+    .string "Oh, okay then!$"
+
+gUnknown_817DBE4:: @ 817DBE4
+    .string "CATERPIE has no poison,\n"
+    .string "but WEEDLE does.\p"
+    .string "Watch that your POKéMON aren't\n"
+    .string "stabbed by WEEDLE's POISON STING.$"
+
+gUnknown_817DC4E:: @ 817DC4E
+    .string "Oh, Grandpa!\n"
+    .string "Don't be so mean!\p"
+    .string "I'm so sorry.\n"
+    .string "He hasn't had his coffee yet.$"
+
+gUnknown_817DC99:: @ 817DC99
+    .string "I go shopping in PEWTER CITY\n"
+    .string "occasionally.\p"
+    .string "I have to take the winding trail in\n"
+    .string "VIRIDIAN FOREST when I go.$"
+
+gUnknown_817DD03:: @ 817DD03
+    .string "I absolutely forbid you from\n"
+    .string "going through here!\p"
+    .string "This is private property!$"
+
+gUnknown_817DD4E:: @ 817DD4E
+    .string "Well, now, I've had my coffee, and\n"
+    .string "that's what I need to get going!\p"
+    .string "Hm?\n"
+    .string "What is that red box you have?\p"
+    .string "Ah, so you're working on your\n"
+    .string "POKéDEX.\p"
+    .string "Then let me give you a word of\n"
+    .string "advice.\p"
+    .string "Whenever you catch a POKéMON,\n"
+    .string "the POKéDEX automatically updates\l"
+    .string "its data.\p"
+    .string "…You don't know how to catch\n"
+    .string "a POKéMON?\p"
+    .string "I suppose I had better show you\n"
+    .string "then!$"
+
+gUnknown_817DE9B:: @ 817DE9B
+    .string "There! Now tell me, that was\n"
+    .string "educational, was it not?\p"
+    .string "And here, take this, too.$"
+
+gUnknown_817DEEB:: @ 817DEEB
+    .string "If there's something you don't\n"
+    .string "understand, watch that.\p"
+    .string "It will teach you about the basics\n"
+    .string "of being a POKéMON TRAINER.$"
+
+gUnknown_817DF61:: @ 817DF61
+    .string "Well, now, I've had my coffee, and\n"
+    .string "that's what I need to get going!\p"
+    .string "But I made it too strong.\n"
+    .string "It gave me a headache…\p"
+    .string "Incidentally, are you filling your\n"
+    .string "POKéDEX?\p"
+    .string "At first, focus on weakening the\n"
+    .string "POKéMON before trying to catch it.$"
+
+gUnknown_817E046:: @ 817E046
+    .string "Well, now, I've had my coffee, and\n"
+    .string "that's what I need to get going!\p"
+    .string "But I made it too strong.\n"
+    .string "It gave me a headache…\p"
+    .string "Incidentally, is my old TEACHY TV\n"
+    .string "helping you?$"
+
+gUnknown_817E0EA:: @ 817E0EA
+    .string "Wahaha!\n"
+    .string "It's my grandson on the show!\p"
+    .string "Since he's the one doing the\n"
+    .string "teaching, you're bound to learn.$"
+
+gUnknown_817E14E:: @ 817E14E
+    .string "Hm… You're too busy to not even\n"
+    .string "have the time for TEACHY TV…\p"
+    .string "Time is money, and neither should\n"
+    .string "be ill spent…$"
+
+gUnknown_817E1BB:: @ 817E1BB
+    .string "VIRIDIAN CITY \n"
+    .string "The Eternally Green Paradise$"
+
+gUnknown_817E1E7:: @ 817E1E7
+    .string "TRAINER TIPS\p"
+    .string "Catch POKéMON and expand your\n"
+    .string "collection.\p"
+    .string "The more you have, the easier it\n"
+    .string "is to battle.$"
+
+gUnknown_817E24D:: @ 817E24D
+    .string "TRAINER TIPS\p"
+    .string "The battle moves of POKéMON are\n"
+    .string "limited by their POWER POINTS, PP.\p"
+    .string "To replenish PP, rest your tired\n"
+    .string "POKéMON at a POKéMON CENTER.$"
+
+gUnknown_817E2DB:: @ 817E2DB
+    .string "VIRIDIAN CITY POKéMON GYM$"
+
+gUnknown_817E2F5:: @ 817E2F5
+    .string "VIRIDIAN GYM's doors are locked…$"
+
diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json
new file mode 100644
index 000000000..6b9738c4d
--- /dev/null
+++ b/data/maps/ViridianCity_Gym/map.json
@@ -0,0 +1,196 @@
+{
+  "id": "MAP_VIRIDIAN_CITY_GYM",
+  "name": "ViridianCity_Gym",
+  "layout": "LAYOUT_VIRIDIAN_CITY_GYM",
+  "music": "BGM_FRLG_GYM",
+  "region_map_section": "MAPSEC_VIRIDIAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_1",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "54",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "ViridianCity_Gym_EventScript_169FD6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "ViridianCity_Gym_EventScript_16A004",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 11,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "ViridianCity_Gym_EventScript_169FA8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "ViridianCity_Gym_EventScript_169F7A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 2,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "ViridianCity_Gym_EventScript_169F91",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "54",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "ViridianCity_Gym_EventScript_169FBF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "41",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "ViridianCity_Gym_EventScript_169FED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "87",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_Gym_EventScript_169ECA",
+      "flag": "85"
+    },
+    {
+      "graphics_id": "41",
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "ViridianCity_Gym_EventScript_16A01B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "91",
+      "x": 16,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_Gym_EventScript_16A032",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 17,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 18,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 20,
+      "elevation": 0,
+      "script": "ViridianCity_Gym_EventScript_16A05E"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 19,
+      "y": 20,
+      "elevation": 0,
+      "script": "ViridianCity_Gym_EventScript_16A05E"
+    },
+    {
+      "type": "hidden_item",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "item": "ITEM_MACHO_BRACE",
+      "flag": "189",
+      "unknown": 129
+    }
+  ]
+}
diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc
new file mode 100644
index 000000000..b03bc5d93
--- /dev/null
+++ b/data/maps/ViridianCity_Gym/scripts.inc
@@ -0,0 +1,117 @@
+ViridianCity_Gym_MapScripts:: @ 8169EC9
+	.byte 0
+
+ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
+	setvar VAR_0x8004, 15
+	setvar VAR_0x8005, 2
+	special UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, 350, 0, Text_18F352, Text_18F43F, EventScript_169F04
+	checkflag FLAG_0x298
+	goto_if 0, EventScript_169F2F
+	msgbox gUnknown_818F4A2
+	closemessage
+	fadescreen 1
+	removeobject 8
+	fadescreen 0
+	release
+	end
+
+EventScript_169F04:: @ 8169F04
+	setvar VAR_0x8004, 15
+	setvar VAR_0x8005, 3
+	special SetFlavorTextFlagFromSpecialVars
+	setflag FLAG_0x0AD
+	setflag FLAG_0x4B7
+	setflag FLAG_0x827
+	setvar VAR_0x4054, 3
+	setvar VAR_0x8008, 8
+	call EventScript_1A6B18
+	goto EventScript_169F2F
+	end
+
+EventScript_169F2F:: @ 8169F2F
+	msgbox gUnknown_818F586
+	checkitemspace ITEM_TM26, 1
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_169F70
+	additem ITEM_TM26, 1
+	giveitemfanfaremsg gUnknown_818F675, ITEM_TM26
+	setflag FLAG_0x298
+	msgbox gUnknown_818F695
+	release
+	end
+
+EventScript_169F70:: @ 8169F70
+	msgbox gUnknown_818F71B
+	release
+	end
+
+ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A
+	trainerbattle 0, 296, 0, Text_18F7F3, Text_18F824
+	msgbox gUnknown_818F840, 6
+	end
+
+ViridianCity_Gym_EventScript_169F91:: @ 8169F91
+	trainerbattle 0, 297, 0, Text_18F98A, Text_18F9BB
+	msgbox gUnknown_818F9CC, 6
+	end
+
+ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8
+	trainerbattle 0, 322, 0, Text_18F7AD, Text_18F7D6
+	msgbox gUnknown_818F7DD, 6
+	end
+
+ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF
+	trainerbattle 0, 323, 0, Text_18F86C, Text_18F899
+	msgbox gUnknown_818F8A0, 6
+	end
+
+ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6
+	trainerbattle 0, 324, 0, Text_18F92C, Text_18F95A
+	msgbox gUnknown_818F960, 6
+	end
+
+ViridianCity_Gym_EventScript_169FED:: @ 8169FED
+	trainerbattle 0, 392, 0, Text_18F9E7, Text_18FA2D
+	msgbox gUnknown_818FA3B, 6
+	end
+
+ViridianCity_Gym_EventScript_16A004:: @ 816A004
+	trainerbattle 0, 400, 0, Text_18F73B, Text_18F769
+	msgbox gUnknown_818F77B, 6
+	end
+
+ViridianCity_Gym_EventScript_16A01B:: @ 816A01B
+	trainerbattle 0, 401, 0, Text_18F8CB, Text_18F8EE
+	msgbox gUnknown_818F8FE, 6
+	end
+
+ViridianCity_Gym_EventScript_16A032:: @ 816A032
+	lock
+	faceplayer
+	checkflag FLAG_0x4B7
+	goto_if_eq EventScript_16A047
+	msgbox gUnknown_818FA81
+	release
+	end
+
+EventScript_16A047:: @ 816A047
+	setvar VAR_0x8004, 15
+	setvar VAR_0x8005, 4
+	special SetFlavorTextFlagFromSpecialVars
+	msgbox gUnknown_818FB56
+	release
+	end
+
+ViridianCity_Gym_EventScript_16A05E:: @ 816A05E
+	lockall
+	checkflag FLAG_0x827
+	goto_if_eq EventScript_16A072
+	msgbox gUnknown_818FB8D
+	releaseall
+	end
+
+EventScript_16A072:: @ 816A072
+	msgbox gUnknown_818FBC1
+	releaseall
+	end
diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc
new file mode 100644
index 000000000..608d52755
--- /dev/null
+++ b/data/maps/ViridianCity_Gym/text.inc
@@ -0,0 +1,171 @@
+Text_18F352:: @ 818F352
+    .string "Fwahahaha!\n"
+    .string "Welcome to my hideout!\p"
+    .string "It shall be so until I can restore\n"
+    .string "TEAM ROCKET to its former glory.\p"
+    .string "But, you have found me again.\n"
+    .string "So be it.\l"
+    .string "This time, I'm not holding back!\p"
+    .string "Once more, you shall face\n"
+    .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{BGM_FRLG_SUSPICIOUS_EYE}$"
+
+Text_18F43F:: @ 818F43F
+    .string "Ha!\n"
+    .string "That was a truly intense fight.\l"
+    .string "You have won!\p"
+    .string "As proof, here is the EARTHBADGE!\n"
+    .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$"
+
+gUnknown_818F4A2:: @ 818F4A2
+    .string "Having lost in this fashion, \n"
+    .string "I can't face my followers.\l"
+    .string "I have betrayed their trust.\p"
+    .string "As of today, TEAM ROCKET is\n"
+    .string "finished forever!\p"
+    .string "As for myself, I shall dedicate\n"
+    .string "my life to training again.\p"
+    .string "Let us meet again someday!\n"
+    .string "Farewell!$"
+
+gUnknown_818F586:: @ 818F586
+    .string "The EARTHBADGE makes POKéMON of\n"
+    .string "any level obey without question.\p"
+    .string "It is evidence of your mastery as\n"
+    .string "a POKéMON TRAINER.\p"
+    .string "With it, you can challenge the\n"
+    .string "POKéMON LEAGUE.\p"
+    .string "Also, take this TM.\p"
+    .string "Consider it a gift for your POKéMON\n"
+    .string "LEAGUE challenge.$"
+
+gUnknown_818F675:: @ 818F675
+    .string "{PLAYER} received TM26\n"
+    .string "from GIOVANNI.$"
+
+gUnknown_818F695:: @ 818F695
+    .string "TM26 contains EARTHQUAKE.\p"
+    .string "It is a powerful attack that causes\n"
+    .string "a massive tremor.\p"
+    .string "I made it when I ran the GYM here,\n"
+    .string "far too long ago… $"
+
+gUnknown_818F71B:: @ 818F71B
+    .string "You do not have space for this!$"
+
+Text_18F73B:: @ 818F73B
+    .string "Heh!\n"
+    .string "You must be running out of steam\l"
+    .string "by now!$"
+
+Text_18F769:: @ 818F769
+    .string "I ran out of gas!$"
+
+gUnknown_818F77B:: @ 818F77B
+    .string "You'll need power to keep up with\n"
+    .string "our GYM LEADER.$"
+
+Text_18F7AD:: @ 818F7AD
+    .string "Rrrroar!\n"
+    .string "I'm working myself into a rage!$"
+
+Text_18F7D6:: @ 818F7D6
+    .string "Wargh!$"
+
+gUnknown_818F7DD:: @ 818F7DD
+    .string "I'm still not worthy!$"
+
+Text_18F7F3:: @ 818F7F3
+    .string "POKéMON and I, we make wonderful\n"
+    .string "music together!$"
+
+Text_18F824:: @ 818F824
+    .string "You are in perfect harmony!$"
+
+gUnknown_818F840:: @ 818F840
+    .string "Do you know the identity of our\n"
+    .string "GYM LEADER?$"
+
+Text_18F86C:: @ 818F86C
+    .string "Karate is the ultimate form of\n"
+    .string "martial arts!$"
+
+Text_18F899:: @ 818F899
+    .string "Aiyah!$"
+
+gUnknown_818F8A0:: @ 818F8A0
+    .string "If my POKéMON were as good at\n"
+    .string "karate as I…$"
+
+Text_18F8CB:: @ 818F8CB
+    .string "The truly talented win with style.$"
+
+Text_18F8EE:: @ 818F8EE
+    .string "I lost my grip!$"
+
+gUnknown_818F8FE:: @ 818F8FE
+    .string "The LEADER will scold me for\n"
+    .string "losing this way…$"
+
+Text_18F92C:: @ 818F92C
+    .string "I'm the KARATE KING!\n"
+    .string "Your fate rests with me!$"
+
+Text_18F95A:: @ 818F95A
+    .string "Ayah!$"
+
+gUnknown_818F960:: @ 818F960
+    .string "The POKéMON LEAGUE?\n"
+    .string "You? Don't get cocky!$"
+
+Text_18F98A:: @ 818F98A
+    .string "Your POKéMON will cower at the\n"
+    .string "crack of my whip!$"
+
+Text_18F9BB:: @ 818F9BB
+    .string "Yowch!\n"
+    .string "Whiplash!$"
+
+gUnknown_818F9CC:: @ 818F9CC
+    .string "Wait!\n"
+    .string "I was just careless!$"
+
+Text_18F9E7:: @ 818F9E7
+    .string "VIRIDIAN GYM was closed for a\n"
+    .string "long time.\p"
+    .string "But now, our LEADER is back!$"
+
+Text_18FA2D:: @ 818FA2D
+    .string "I was beaten?$"
+
+gUnknown_818FA3B:: @ 818FA3B
+    .string "You can go on to the POKéMON\n"
+    .string "LEAGUE only by defeating our GYM\l"
+    .string "LEADER!$"
+
+gUnknown_818FA81:: @ 818FA81
+    .string "Yo!\n"
+    .string "Champ in the making!\p"
+    .string "Even I don't know the VIRIDIAN\n"
+    .string "LEADER's identity.\p"
+    .string "But one thing's certain.\n"
+    .string "This will be the toughest of all\l"
+    .string "the GYM LEADERS.\p"
+    .string "Also, I heard that the TRAINERS\n"
+    .string "here like GROUND-type POKéMON.$"
+
+gUnknown_818FB56:: @ 818FB56
+    .string "Blow me away! GIOVANNI was the\n"
+    .string "GYM LEADER of VIRIDIAN?$"
+
+gUnknown_818FB8D:: @ 818FB8D
+    .string "VIRIDIAN POKéMON GYM\n"
+    .string "LEADER: ?\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}$"
+
+gUnknown_818FBC1:: @ 818FBC1
+    .string "VIRIDIAN POKéMON GYM\n"
+    .string "LEADER: GIOVANNI\p"
+    .string "WINNING TRAINERS:\n"
+    .string "{RIVAL}, {PLAYER}$"
+
diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json
new file mode 100644
index 000000000..ef18aa4c4
--- /dev/null
+++ b/data/maps/ViridianCity_House1/map.json
@@ -0,0 +1,89 @@
+{
+  "id": "MAP_VIRIDIAN_CITY_HOUSE1",
+  "name": "ViridianCity_House1",
+  "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_VIRIDIAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "30",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_House1_EventScript_169E9B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "17",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_House1_EventScript_169EA4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "110",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_House1_EventScript_169EAD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "script": "ViridianCity_House1_EventScript_169EC0"
+    }
+  ]
+}
diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc
new file mode 100644
index 000000000..b82b0ed2f
--- /dev/null
+++ b/data/maps/ViridianCity_House1/scripts.inc
@@ -0,0 +1,24 @@
+ViridianCity_House1_MapScripts:: @ 8169E9A
+	.byte 0
+
+ViridianCity_House1_EventScript_169E9B:: @ 8169E9B
+	msgbox gUnknown_818F292, 2
+	end
+
+ViridianCity_House1_EventScript_169EA4:: @ 8169EA4
+	msgbox gUnknown_818F30F, 2
+	end
+
+ViridianCity_House1_EventScript_169EAD:: @ 8169EAD
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_SPEAROW, 0
+	msgbox gUnknown_818F32C
+	waitmoncry
+	release
+	end
+
+ViridianCity_House1_EventScript_169EC0:: @ 8169EC0
+	msgbox gUnknown_818F33D, 3
+	end
diff --git a/data/maps/ViridianCity_House1/text.inc b/data/maps/ViridianCity_House1/text.inc
new file mode 100644
index 000000000..c1ec37238
--- /dev/null
+++ b/data/maps/ViridianCity_House1/text.inc
@@ -0,0 +1,16 @@
+gUnknown_818F292:: @ 818F292
+    .string "Coming up with nicknames is fun,\n"
+    .string "but it's not so easy to do.\p"
+    .string "Clever names are nice, but simple\n"
+    .string "names are easier to remember.$"
+
+gUnknown_818F30F:: @ 818F30F
+    .string "My daddy loves POKéMON, too.$"
+
+gUnknown_818F32C:: @ 818F32C
+    .string "SPEARY: Tetweet!$"
+
+gUnknown_818F33D:: @ 818F33D
+    .string "SPEAROW\n"
+    .string "Name: SPEARY$"
+
diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json
new file mode 100644
index 000000000..5f6b02a03
--- /dev/null
+++ b/data/maps/ViridianCity_House2/map.json
@@ -0,0 +1,104 @@
+{
+  "id": "MAP_VIRIDIAN_CITY_HOUSE2",
+  "name": "ViridianCity_House2",
+  "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_VIRIDIAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "28",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_House2_EventScript_16A094",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_House2_EventScript_16A07D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "script": "ViridianCity_House2_EventScript_16A0AB"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "script": "ViridianCity_House2_EventScript_16A11D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "script": "ViridianCity_House2_EventScript_16A11D"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 9,
+      "y": 2,
+      "elevation": 0,
+      "script": "ViridianCity_House2_EventScript_1ACD65"
+    },
+    {
+      "type": "bg_event_type_1",
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "script": "ViridianCity_House2_EventScript_1ACD65"
+    }
+  ]
+}
diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc
new file mode 100644
index 000000000..c8388e2f7
--- /dev/null
+++ b/data/maps/ViridianCity_House2/scripts.inc
@@ -0,0 +1,97 @@
+ViridianCity_House2_MapScripts:: @ 816A07C
+	.byte 0
+
+ViridianCity_House2_EventScript_16A07D:: @ 816A07D
+	lock
+	faceplayer
+	msgbox gUnknown_818FC00
+	closemessage
+	applymovement 2, Movement_1A75E9
+	waitmovement 0
+	release
+	end
+
+ViridianCity_House2_EventScript_16A094:: @ 816A094
+	lock
+	faceplayer
+	msgbox gUnknown_818FC2B
+	closemessage
+	applymovement 1, Movement_1A75E5
+	waitmovement 0
+	release
+	end
+
+ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB
+	lockall
+	msgbox gUnknown_818FC65
+	msgbox gUnknown_818FF19, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16A11B
+	msgbox gUnknown_818FD23
+	msgbox gUnknown_818FF19, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16A11B
+	msgbox gUnknown_818FDA8
+	msgbox gUnknown_818FF19, MSGBOX_YESNO
+	compare_var_to_value VAR_RESULT, 0
+	goto_if_eq EventScript_16A11B
+	msgbox gUnknown_818FE5C
+	applymovement 2, Movement_1A75E9
+	waitmovement 0
+	textcolor 1
+	msgbox gUnknown_818FF28
+	releaseall
+	end
+
+EventScript_16A11B:: @ 816A11B
+	releaseall
+	end
+
+ViridianCity_House2_EventScript_16A11D:: @ 816A11D
+	lockall
+	msgbox gUnknown_818FF4B
+	goto EventScript_16A12C
+	end
+
+EventScript_16A12C:: @ 816A12C
+	message Text_18FF88
+	waitmessage
+	multichoicegrid 7, 1, 15, 3, 0
+	switch VAR_RESULT
+	case 0, EventScript_16A18B
+	case 1, EventScript_16A1A7
+	case 2, EventScript_16A1C3
+	case 3, EventScript_16A199
+	case 4, EventScript_16A1B5
+	case 5, EventScript_16A1D1
+	case 127, EventScript_16A1D1
+	end
+
+EventScript_16A18B:: @ 816A18B
+	msgbox gUnknown_818FFA9
+	goto EventScript_16A12C
+	end
+
+EventScript_16A199:: @ 816A199
+	msgbox gUnknown_8190025
+	goto EventScript_16A12C
+	end
+
+EventScript_16A1A7:: @ 816A1A7
+	msgbox gUnknown_819009F
+	goto EventScript_16A12C
+	end
+
+EventScript_16A1B5:: @ 816A1B5
+	msgbox gUnknown_819010F
+	goto EventScript_16A12C
+	end
+
+EventScript_16A1C3:: @ 816A1C3
+	msgbox gUnknown_8190199
+	goto EventScript_16A12C
+	end
+
+EventScript_16A1D1:: @ 816A1D1
+	releaseall
+	end
diff --git a/data/maps/ViridianCity_House2/text.inc b/data/maps/ViridianCity_House2/text.inc
new file mode 100644
index 000000000..a575c0f34
--- /dev/null
+++ b/data/maps/ViridianCity_House2/text.inc
@@ -0,0 +1,93 @@
+gUnknown_818FC00:: @ 818FC00
+    .string "Whew! I'm trying to memorize all my\n"
+    .string "notes.$"
+
+gUnknown_818FC2B:: @ 818FC2B
+    .string "Okay!\p"
+    .string "Be sure to read what's on the\n"
+    .string "blackboard carefully!$"
+
+gUnknown_818FC65:: @ 818FC65
+    .string "Let's check out the notebook.\p"
+    .string "First page…\p"
+    .string "POKé BALLS are used to catch\n"
+    .string "POKéMON.\p"
+    .string "Up to six POKéMON can be carried\n"
+    .string "in your party.\p"
+    .string "People who raise and battle\n"
+    .string "with POKéMON are called TRAINERS.$"
+
+gUnknown_818FD23:: @ 818FD23
+    .string "Second page…\p"
+    .string "A healthy POKéMON may be hard to\n"
+    .string "catch, so weaken it first.\p"
+    .string "Poison, burn, or cause another\n"
+    .string "status problem to weaken it.$"
+
+gUnknown_818FDA8:: @ 818FDA8
+    .string "Third page…\p"
+    .string "POKéMON TRAINERS seek others to\n"
+    .string "engage in POKéMON battles.\p"
+    .string "To TRAINERS, the taste of victory\n"
+    .string "is sweet, indeed.\p"
+    .string "Battles are constantly waged at\n"
+    .string "POKéMON GYMS everywhere.$"
+
+gUnknown_818FE5C:: @ 818FE5C
+    .string "Fourth page…\p"
+    .string "The ultimate goal for all POKéMON\n"
+    .string "TRAINERS is simple.\p"
+    .string "It is to defeat the top eight\n"
+    .string "POKéMON GYM LEADERS.\p"
+    .string "Do so to earn the right to face…\p"
+    .string "The ELITE FOUR of the POKéMON\n"
+    .string "LEAGUE!$"
+
+gUnknown_818FF19:: @ 818FF19
+    .string "Turn the page?$"
+
+gUnknown_818FF28:: @ 818FF28
+    .string "GIRL: Hey!\n"
+    .string "Don't look at my notes!$"
+
+gUnknown_818FF4B:: @ 818FF4B
+    .string "The blackboard lists POKéMON\n"
+    .string "STATUS problems during battles.$"
+
+Text_18FF88:: @ 818FF88
+    .string "Which topic do you want to read?$"
+
+gUnknown_818FFA9:: @ 818FFA9
+    .string "A POKéMON can't attack if it's\n"
+    .string "asleep.\p"
+    .string "POKéMON will stay asleep even\n"
+    .string "after battles.\p"
+    .string "Use AWAKENING to awaken one\n"
+    .string "from sleep.$"
+
+gUnknown_8190025:: @ 8190025
+    .string "A burn reduces ATTACK power.\n"
+    .string "It also causes ongoing HP loss.\p"
+    .string "A burn remains after a battle.\n"
+    .string "Use BURN HEAL to cure a burn.$"
+
+gUnknown_819009F:: @ 819009F
+    .string "When poisoned, a POKéMON's health\n"
+    .string "steadily drops.\p"
+    .string "Poison lingers after battles.\n"
+    .string "Use an ANTIDOTE to cure poison!$"
+
+gUnknown_819010F:: @ 819010F
+    .string "A frozen POKéMON becomes\n"
+    .string "helplessly immobile.\p"
+    .string "It stays frozen even after the\n"
+    .string "battle ends.\p"
+    .string "Use ICE HEAL to thaw out the\n"
+    .string "suffering POKéMON.$"
+
+gUnknown_8190199:: @ 8190199
+    .string "Paralysis reduces SPEED and may\n"
+    .string "prevent the POKéMON from moving.\p"
+    .string "Paralysis remains after battles.\n"
+    .string "Use PARLYZ HEAL for treatment.$"
+
diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json
new file mode 100644
index 000000000..3915e053d
--- /dev/null
+++ b/data/maps/ViridianCity_Mart/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_VIRIDIAN_CITY_MART",
+  "name": "ViridianCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_VIRIDIAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_Mart_EventScript_16A268",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_Mart_EventScript_16A2B7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_Mart_EventScript_16A2AE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc
new file mode 100644
index 000000000..44d9437ea
--- /dev/null
+++ b/data/maps/ViridianCity_Mart/scripts.inc
@@ -0,0 +1,90 @@
+ViridianCity_Mart_MapScripts:: @ 816A1D3
+	map_script 1, ViridianCity_Mart_MapScript1_16A1DE
+	map_script 2, ViridianCity_Mart_MapScript2_16A1FB
+	.byte 0
+
+ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE
+	checkflag FLAG_0x829
+	goto_if 0, EventScript_16A1E8
+	end
+
+EventScript_16A1E8:: @ 816A1E8
+	setmetatile 1, 3, 703, 1
+	setmetatile 1, 4, 704, 1
+	end
+
+ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB
+	map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205
+	.2byte 0
+
+EventScript_16A205:: @ 816A205
+	lockall
+	textcolor 0
+	applymovement 1, Movement_1A75ED
+	waitmovement 0
+	msgbox gUnknown_819021A
+	closemessage
+	applymovement 1, Movement_16A262
+	applymovement 255, Movement_16A25C
+	waitmovement 0
+	msgbox gUnknown_819023A
+	setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
+	additem ITEM_OAKS_PARCEL, 1
+	giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, BGM_FRLG_ME_KEYITEM
+	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5
+	releaseall
+	end
+
+Movement_16A25C:: @ 816A25C
+	step_11
+	step_11
+	step_11
+	step_11
+	step_2f
+	step_end
+
+Movement_16A262:: @ 816A262
+	step_1c
+	step_1c
+	step_1c
+	step_1c
+	step_30
+	step_end
+
+ViridianCity_Mart_EventScript_16A268:: @ 816A268
+	lock
+	faceplayer
+	compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
+	goto_if_eq EventScript_16A2A4
+	special sub_8110AB4
+	compare_var_to_value VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
+	message Text_1A6211
+	waitmessage
+	pokemart Items_16A298
+	msgbox gUnknown_81A5190
+	release
+	end
+
+	.align 2
+Items_16A298:: @ 816A298
+	.2byte ITEM_POKE_BALL
+	.2byte ITEM_POTION
+	.2byte ITEM_ANTIDOTE
+	.2byte ITEM_PARALYZE_HEAL
+	.2byte ITEM_NONE
+	release
+	end
+
+EventScript_16A2A4:: @ 816A2A4
+	msgbox Text_1902BF
+	release
+	end
+
+ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE
+	msgbox gUnknown_81902F5, 2
+	end
+
+ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7
+	msgbox gUnknown_819032C, 2
+	end
diff --git a/data/maps/ViridianCity_Mart/text.inc b/data/maps/ViridianCity_Mart/text.inc
new file mode 100644
index 000000000..a610e83cd
--- /dev/null
+++ b/data/maps/ViridianCity_Mart/text.inc
@@ -0,0 +1,26 @@
+gUnknown_819021A:: @ 819021A
+    .string "Hey!\n"
+    .string "You came from PALLET TOWN?$"
+
+gUnknown_819023A:: @ 819023A
+    .string "You know PROF. OAK, right?\p"
+    .string "His order came in.\n"
+    .string "Can I get you to take it to him?$"
+
+gUnknown_8190289:: @ 8190289
+    .string "{PLAYER} received OAK'S PARCEL\n"
+    .string "from the POKéMON MART clerk.$"
+
+Text_1902BF:: @ 81902BF
+    .string "Okay, thanks! Please say hi to\n"
+    .string "PROF. OAK for me, too.$"
+
+gUnknown_81902F5:: @ 81902F5
+    .string "This shop does good business in\n"
+    .string "ANTIDOTES, I've heard.$"
+
+gUnknown_819032C:: @ 819032C
+    .string "I've got to buy some POTIONS.\p"
+    .string "You never know when your POKéMON\n"
+    .string "will need quick healing.$"
+
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..a63b5d733
--- /dev/null
+++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F",
+  "name": "ViridianCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_VIRIDIAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "64",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2CF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "61",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2E1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2D8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2EA",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_VIRIDIAN_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..507b2bfe4
--- /dev/null
+++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,27 @@
+ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0
+	map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB
+	map_script 5, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C
+	.byte 0
+
+ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB
+	setrespawn SPAWN_VIRIDIAN_CITY
+	end
+
+ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF
+	lock
+	faceplayer
+	call EventScript_1A6578
+	release
+	end
+
+ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8
+	msgbox gUnknown_81903E5, 2
+	end
+
+ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1
+	msgbox gUnknown_8190384, 2
+	end
+
+ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA
+	msgbox gUnknown_8190450, 2
+	end
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/text.inc b/data/maps/ViridianCity_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..18b535a45
--- /dev/null
+++ b/data/maps/ViridianCity_PokemonCenter_1F/text.inc
@@ -0,0 +1,18 @@
+gUnknown_8190384:: @ 8190384
+    .string "Please feel free to use that PC in\n"
+    .string "the corner.\p"
+    .string "The receptionist told me so.\n"
+    .string "It's so kind of her!$"
+
+gUnknown_81903E5:: @ 81903E5
+    .string "There's a POKéMON CENTER in every\n"
+    .string "town ahead.\p"
+    .string "They charge no money, so don't\n"
+    .string "be shy about healing POKéMON.$"
+
+gUnknown_8190450:: @ 8190450
+    .string "POKéMON CENTERS heal your tired,\n"
+    .string "hurt, or fainted POKéMON.\p"
+    .string "They make all POKéMON completely\n"
+    .string "healthy.$"
+
diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..5d66d7096
--- /dev/null
+++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F",
+  "name": "ViridianCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "BGM_FRLG_POKEMON_CENTER",
+  "region_map_section": "MAPSEC_VIRIDIAN_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "65",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8D02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "69",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "flag": "112"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..18e0018ba
--- /dev/null
+++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,18 @@
+ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3
+	map_script 2, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script 4, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script 1, ViridianCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script 3, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4
+	.byte 0
+
+ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308
+	call EventScript_1BB4A3
+	end
+
+EventScript_16A30E:: @ 816A30E
+	call EventScript_1BB6AB
+	end
+
+EventScript_16A314:: @ 816A314
+	call EventScript_1BB7DE
+	end
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
new file mode 100644
index 000000000..ca91c7017
--- /dev/null
+++ b/data/maps/ViridianForest/map.json
@@ -0,0 +1,267 @@
+{
+  "id": "MAP_VIRIDIAN_FOREST",
+  "name": "ViridianForest",
+  "layout": "LAYOUT_VIRIDIAN_FOREST",
+  "music": "BGM_FRLG_VIRIDIAN_FOREST",
+  "region_map_section": "MAPSEC_VIRIDIAN_FOREST",
+  "requires_flash": false,
+  "weather": "WEATHER_CLOUDY",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 7,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "18",
+      "x": 29,
+      "y": 58,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianForest_EventScript_160529",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 45,
+      "y": 58,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianForest_EventScript_160532",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 47,
+      "y": 45,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "ViridianForest_EventScript_160571",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 47,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "ViridianForest_EventScript_160588",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 7,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "ViridianForest_EventScript_16059F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 5,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianForest_EventScript_1BE5A8",
+      "flag": "342"
+    },
+    {
+      "graphics_id": "92",
+      "x": 40,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianForest_EventScript_1BE5B5",
+      "flag": "343"
+    },
+    {
+      "graphics_id": "92",
+      "x": 21,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianForest_EventScript_1BE5C2",
+      "flag": "344"
+    },
+    {
+      "graphics_id": "20",
+      "x": 43,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "ViridianForest_EventScript_1605B6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 16,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "ViridianForest_EventScript_1605CD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 49,
+      "y": 60,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ViridianForest_EventScript_1BEAC9",
+      "flag": "446"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 29,
+      "y": 62,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 28,
+      "y": 62,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 30,
+      "y": 62,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 39,
+      "y": 59,
+      "elevation": 3,
+      "script": "ViridianForest_EventScript_16053B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 43,
+      "y": 26,
+      "elevation": 0,
+      "script": "ViridianForest_EventScript_16054D"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 9,
+      "y": 29,
+      "elevation": 0,
+      "script": "ViridianForest_EventScript_160556"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "script": "ViridianForest_EventScript_160568"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 28,
+      "y": 44,
+      "elevation": 0,
+      "script": "ViridianForest_EventScript_160544"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 31,
+      "y": 60,
+      "elevation": 0,
+      "script": "ViridianForest_EventScript_16055F"
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 22,
+      "elevation": 3,
+      "item": "ITEM_POTION",
+      "flag": "0",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 28,
+      "y": 57,
+      "elevation": 0,
+      "item": "ITEM_ANTIDOTE",
+      "flag": "1",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc
new file mode 100644
index 000000000..bf8438d65
--- /dev/null
+++ b/data/maps/ViridianForest/scripts.inc
@@ -0,0 +1,64 @@
+ViridianForest_MapScripts:: @ 816051F
+	map_script 3, ViridianForest_MapScript1_160525
+	.byte 0
+
+ViridianForest_MapScript1_160525:: @ 8160525
+	setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST
+	end
+
+ViridianForest_EventScript_160529:: @ 8160529
+	msgbox gUnknown_8172255, 2
+	end
+
+ViridianForest_EventScript_160532:: @ 8160532
+	msgbox gUnknown_8172559, 2
+	end
+
+ViridianForest_EventScript_16053B:: @ 816053B
+	msgbox gUnknown_81725C7, 3
+	end
+
+ViridianForest_EventScript_160544:: @ 8160544
+	msgbox gUnknown_8172629, 3
+	end
+
+ViridianForest_EventScript_16054D:: @ 816054D
+	msgbox gUnknown_817265C, 3
+	end
+
+ViridianForest_EventScript_160556:: @ 8160556
+	msgbox gUnknown_81726A3, 3
+	end
+
+ViridianForest_EventScript_16055F:: @ 816055F
+	msgbox gUnknown_817271D, 3
+	end
+
+ViridianForest_EventScript_160568:: @ 8160568
+	msgbox gUnknown_8172773, 3
+	end
+
+ViridianForest_EventScript_160571:: @ 8160571
+	trainerbattle 0, 102, 0, Text_1722C7, Text_1722F9
+	msgbox gUnknown_8172315, 6
+	end
+
+ViridianForest_EventScript_160588:: @ 8160588
+	trainerbattle 0, 103, 0, Text_17234A, Text_17237D
+	msgbox gUnknown_8172398, 6
+	end
+
+ViridianForest_EventScript_16059F:: @ 816059F
+	trainerbattle 0, 104, 0, Text_1723D4, Text_172402
+	msgbox gUnknown_817241F, 6
+	end
+
+ViridianForest_EventScript_1605B6:: @ 81605B6
+	trainerbattle 0, 531, 0, Text_172482, Text_1724BF
+	msgbox gUnknown_81724DC, 6
+	end
+
+ViridianForest_EventScript_1605CD:: @ 81605CD
+	trainerbattle 0, 532, 0, Text_1724F9, Text_17251B
+	msgbox gUnknown_8172527, 6
+	end
diff --git a/data/maps/ViridianForest/text.inc b/data/maps/ViridianForest/text.inc
new file mode 100644
index 000000000..e3dc737a2
--- /dev/null
+++ b/data/maps/ViridianForest/text.inc
@@ -0,0 +1,105 @@
+gUnknown_8172255:: @ 8172255
+    .string "I came here with some friends to\n"
+    .string "catch us some BUG POKéMON!\p"
+    .string "They're all itching to get into\n"
+    .string "some POKéMON battles!$"
+
+Text_1722C7:: @ 81722C7
+    .string "Hey! You have POKéMON!\n"
+    .string "Come on!\l"
+    .string "Let's battle 'em!$"
+
+Text_1722F9:: @ 81722F9
+    .string "No!\nCATERPIE can't hack it!$"
+
+gUnknown_8172315:: @ 8172315
+    .string "Ssh! You'll scare the bugs away.\n"
+    .string "Another time, okay?$"
+
+Text_17234A:: @ 817234A
+    .string "Yo!\n"
+    .string "You can't jam out if you're a\l"
+    .string "POKéMON TRAINER!$"
+
+Text_17237D:: @ 817237D
+    .string "Huh?\n"
+    .string "I ran out of POKéMON!$"
+
+gUnknown_8172398:: @ 8172398
+    .string "That totally stinks! I'm going to\n"
+    .string "catch some stronger ones!$"
+
+Text_1723D4:: @ 81723D4
+    .string "Hey, wait up!\n"
+    .string "What's the hurry? Why the rush?$"
+
+Text_172402:: @ 8172402
+    .string "I give!\n"
+    .string "You're good at this!$"
+
+gUnknown_817241F:: @ 817241F
+    .string "Sometimes, you can find stuff on\n"
+    .string "the ground.\p"
+    .string "I'm looking for the stuff I\n"
+    .string "dropped. Can you help me?$"
+
+Text_172482:: @ 8172482
+    .string "I might be little, but I won't like\n"
+    .string "it if you go easy on me!$"
+
+Text_1724BF:: @ 81724BF
+    .string "Oh, boo.\n"
+    .string "Nothing went right.$"
+
+gUnknown_81724DC:: @ 81724DC
+    .string "I lost some of my allowance…$"
+
+Text_1724F9:: @ 81724F9
+    .string "Did you know that POKéMON evolve?$"
+
+Text_17251B:: @ 817251B
+    .string "Oh!\n"
+    .string "I lost!$"
+
+gUnknown_8172527:: @ 8172527
+    .string "BUG POKéMON evolve quickly.\n"
+    .string "They're a lot of fun!$"
+
+gUnknown_8172559:: @ 8172559
+    .string "I was throwing POKé BALLS to\n"
+    .string "catch POKéMON, and I ran out.\p"
+    .string "That's why you can never have too\n"
+    .string "many POKé BALLS.$"
+
+gUnknown_81725C7:: @ 81725C7
+    .string "TRAINER TIPS\p"
+    .string "If your POKéMON are weak and you\n"
+    .string "want to avoid battles, stay away\l"
+    .string "from grassy areas!$"
+
+gUnknown_8172629:: @ 8172629
+    .string "For poison, use ANTIDOTE!\n"
+    .string "Get it at POKéMON MARTS!$"
+
+gUnknown_817265C:: @ 817265C
+    .string "TRAINER TIPS\p"
+    .string "Contact PROF. OAK via a PC to\n"
+    .string "get your POKéDEX evaluated!$"
+
+gUnknown_81726A3:: @ 81726A3
+    .string "TRAINER TIPS\p"
+    .string "You can't catch a POKéMON that\n"
+    .string "belongs to someone else.\p"
+    .string "Throw POKé BALLS only at wild\n"
+    .string "POKéMON to catch them!$"
+
+gUnknown_817271D:: @ 817271D
+    .string "TRAINER TIPS\p"
+    .string "Weaken POKéMON before attempting\n"
+    .string "capture!\p"
+    .string "When healthy, they may escape!$"
+
+gUnknown_8172773:: @ 8172773
+    .string "LEAVING VIRIDIAN FOREST\n"
+    .string "PEWTER CITY AHEAD$"
+
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
new file mode 100644
index 000000000..3f4e458ca
--- /dev/null
+++ b/data/maps/map_groups.json
@@ -0,0 +1,623 @@
+{
+  "group_order": [
+    "gMapGroup0",
+    "gMapGroup1",
+    "gMapGroup2",
+    "gMapGroup3",
+    "gMapGroup4",
+    "gMapGroup5",
+    "gMapGroup6",
+    "gMapGroup7",
+    "gMapGroup8",
+    "gMapGroup9",
+    "gMapGroup10",
+    "gMapGroup11",
+    "gMapGroup12",
+    "gMapGroup13",
+    "gMapGroup14",
+    "gMapGroup15",
+    "gMapGroup16",
+    "gMapGroup17",
+    "gMapGroup18",
+    "gMapGroup19",
+    "gMapGroup20",
+    "gMapGroup21",
+    "gMapGroup22",
+    "gMapGroup23",
+    "gMapGroup24",
+    "gMapGroup25",
+    "gMapGroup26",
+    "gMapGroup27",
+    "gMapGroup28",
+    "gMapGroup29",
+    "gMapGroup30",
+    "gMapGroup31",
+    "gMapGroup32",
+    "gMapGroup33",
+    "gMapGroup34",
+    "gMapGroup35",
+    "gMapGroup36",
+    "gMapGroup37",
+    "gMapGroup38",
+    "gMapGroup39",
+    "gMapGroup40",
+    "gMapGroup41",
+    "gMapGroup42"
+  ],
+  "gMapGroup0": [
+    "UnknownMap_00_00",
+    "UnknownMap_00_01",
+    "UnknownMap_00_02",
+    "UnknownMap_00_03",
+    "UnknownMap_00_04"
+  ],
+  "gMapGroup1": [
+    "ViridianForest",
+    "MtMoon_1F",
+    "MtMoon_B1F",
+    "MtMoon_B2F",
+    "SSAnne_Exterior",
+    "SSAnne_1F_Corridor",
+    "SSAnne_2F_Corridor",
+    "SSAnne_3F_Corridor",
+    "SSAnne_B1F_Corridor",
+    "SSAnne_Deck",
+    "SSAnne_Kitchen",
+    "SSAnne_CaptainsOffice",
+    "SSAnne_1F_Room1",
+    "SSAnne_1F_Room2",
+    "SSAnne_1F_Room3",
+    "SSAnne_1F_Room4",
+    "SSAnne_1F_Room5",
+    "SSAnne_1F_Room7",
+    "SSAnne_2F_Room1",
+    "SSAnne_2F_Room2",
+    "SSAnne_2F_Room3",
+    "SSAnne_2F_Room4",
+    "SSAnne_2F_Room5",
+    "SSAnne_2F_Room6",
+    "SSAnne_B1F_Room1",
+    "SSAnne_B1F_Room2",
+    "SSAnne_B1F_Room3",
+    "SSAnne_B1F_Room4",
+    "SSAnne_B1F_Room5",
+    "SSAnne_1F_Room6",
+    "UndergroundPath_NorthEntrance",
+    "UndergroundPath_NorthSouthTunnel",
+    "UndergroundPath_SouthEntrance",
+    "UndergroundPath_WestEntrance",
+    "UndergroundPath_EastWestTunnel",
+    "UndergroundPath_EastEntrance",
+    "DiglettsCave_NorthEntrance",
+    "DiglettsCave_B1F",
+    "DiglettsCave_SouthEntrance",
+    "VictoryRoad_1F",
+    "VictoryRoad_2F",
+    "VictoryRoad_3F",
+    "RocketHideout_B1F",
+    "RocketHideout_B2F",
+    "RocketHideout_B3F",
+    "RocketHideout_B4F",
+    "RocketHideout_Elevator",
+    "SilphCo_1F",
+    "SilphCo_2F",
+    "SilphCo_3F",
+    "SilphCo_4F",
+    "SilphCo_5F",
+    "SilphCo_6F",
+    "SilphCo_7F",
+    "SilphCo_8F",
+    "SilphCo_9F",
+    "SilphCo_10F",
+    "SilphCo_11F",
+    "SilphCo_Elevator",
+    "PokemonMansion_1F",
+    "PokemonMansion_2F",
+    "PokemonMansion_3F",
+    "PokemonMansion_B1F",
+    "SafariZone_Center",
+    "SafariZone_East",
+    "SafariZone_North",
+    "SafariZone_West",
+    "SafariZone_Building1",
+    "SafariZone_Building2",
+    "SafariZone_Building3",
+    "SafariZone_Building4",
+    "SafariZone_SecretHouse",
+    "CeruleanCave_1F",
+    "CeruleanCave_2F",
+    "CeruleanCave_B1F",
+    "PokemonLeague_LoreleisRoom",
+    "PokemonLeague_BrunosRoom",
+    "PokemonLeague_AgathasRoom",
+    "PokemonLeague_LancesRoom",
+    "PokemonLeague_ChampionsRoom",
+    "PokemonLeague_HallOfFame",
+    "RockTunnel_1F",
+    "RockTunnel_B1F",
+    "SeafoamIslands_1F",
+    "SeafoamIslands_B1F",
+    "SeafoamIslands_B2F",
+    "SeafoamIslands_B3F",
+    "SeafoamIslands_B4F",
+    "PokemonTower_1F",
+    "PokemonTower_2F",
+    "PokemonTower_3F",
+    "PokemonTower_4F",
+    "PokemonTower_5F",
+    "PokemonTower_6F",
+    "PokemonTower_7F",
+    "PowerPlant",
+    "MtEmber_RubyPath_B4F",
+    "MtEmber_Exterior",
+    "MtEmber_SummitPath_1F",
+    "MtEmber_SummitPath_2F",
+    "MtEmber_SummitPath_3F",
+    "MtEmber_Summit",
+    "MtEmber_RubyPath_B5F",
+    "MtEmber_RubyPath_1F",
+    "MtEmber_RubyPath_B1F",
+    "MtEmber_RubyPath_B2F",
+    "MtEmber_RubyPath_B3F",
+    "MtEmber_RubyPath_B1F_Stairs",
+    "MtEmber_RubyPath_B2F_Stairs",
+    "ThreeIsland_BerryForest",
+    "FourIsland_IcefallCave_Entrance",
+    "FourIsland_IcefallCave_1F",
+    "FourIsland_IcefallCave_B1F",
+    "FourIsland_IcefallCave_Back",
+    "FiveIsland_RocketWarehouse",
+    "SixIsland_DottedHole_1F",
+    "SixIsland_DottedHole_B1F",
+    "SixIsland_DottedHole_B2F",
+    "SixIsland_DottedHole_B3F",
+    "SixIsland_DottedHole_B4F",
+    "SixIsland_DottedHole_SapphireRoom",
+    "SixIsland_PatternBush",
+    "SixIsland_AlteringCave"
+  ],
+  "gMapGroup2": [
+    "NavelRock_Exterior",
+    "SevenIsland_TrainerTower_1F",
+    "SevenIsland_TrainerTower_2F",
+    "SevenIsland_TrainerTower_3F",
+    "SevenIsland_TrainerTower_4F",
+    "SevenIsland_TrainerTower_5F",
+    "SevenIsland_TrainerTower_6F",
+    "SevenIsland_TrainerTower_7F",
+    "SevenIsland_TrainerTower_8F",
+    "SevenIsland_TrainerTower_Roof",
+    "SevenIsland_TrainerTower_Lobby",
+    "SevenIsland_TrainerTower_Elevator",
+    "FiveIsland_LostCave_Entrance",
+    "FiveIsland_LostCave_Room1",
+    "FiveIsland_LostCave_Room2",
+    "FiveIsland_LostCave_Room3",
+    "FiveIsland_LostCave_Room4",
+    "FiveIsland_LostCave_Room5",
+    "FiveIsland_LostCave_Room6",
+    "FiveIsland_LostCave_Room7",
+    "FiveIsland_LostCave_Room8",
+    "FiveIsland_LostCave_Room9",
+    "FiveIsland_LostCave_Room10",
+    "FiveIsland_LostCave_Room11",
+    "FiveIsland_LostCave_Room12",
+    "FiveIsland_LostCave_Room13",
+    "FiveIsland_LostCave_Room14",
+    "SevenIsland_TanobyRuins_MoneanChamber",
+    "SevenIsland_TanobyRuins_LiptooChamber",
+    "SevenIsland_TanobyRuins_WeepthChamber",
+    "SevenIsland_TanobyRuins_DilfordChamber",
+    "SevenIsland_TanobyRuins_ScufibChamber",
+    "SevenIsland_TanobyRuins_RixyChamber",
+    "SevenIsland_TanobyRuins_ViapoisChamber",
+    "ThreeIsland_DunsparceTunnel",
+    "SevenIsland_SeavaultCanyon_TanobyKey",
+    "NavelRock_1F",
+    "NavelRock_Summit",
+    "NavelRock_Base",
+    "NavelRock_SummitPath_2F",
+    "NavelRock_SummitPath_3F",
+    "NavelRock_SummitPath_4F",
+    "NavelRock_SummitPath_5F",
+    "NavelRock_BasePath_B1F",
+    "NavelRock_BasePath_B2F",
+    "NavelRock_BasePath_B3F",
+    "NavelRock_BasePath_B4F",
+    "NavelRock_BasePath_B5F",
+    "NavelRock_BasePath_B6F",
+    "NavelRock_BasePath_B7F",
+    "NavelRock_BasePath_B8F",
+    "NavelRock_BasePath_B9F",
+    "NavelRock_BasePath_B10F",
+    "NavelRock_BasePath_B11F",
+    "NavelRock_B1F",
+    "NavelRock_Fork",
+    "BirthIsland_Exterior",
+    "OneIsland_KindleRoad_EmberSpa",
+    "BirthIsland_Harbor",
+    "NavelRock_Harbor"
+  ],
+  "gMapGroup3": [
+    "PalletTown",
+    "ViridianCity",
+    "PewterCity",
+    "CeruleanCity",
+    "LavenderTown",
+    "VermilionCity",
+    "CeladonCity",
+    "FuchsiaCity",
+    "CinnabarIsland",
+    "IndigoPlateau_Exterior",
+    "SaffronCity_Duplicate",
+    "SaffronCity",
+    "OneIsland",
+    "TwoIsland",
+    "ThreeIsland",
+    "FourIsland",
+    "FiveIsland",
+    "SevenIsland",
+    "SixIsland",
+    "Route1",
+    "Route2",
+    "Route3",
+    "Route4",
+    "Route5",
+    "Route6",
+    "Route7",
+    "Route8",
+    "Route9",
+    "Route10",
+    "Route11",
+    "Route12",
+    "Route13",
+    "Route14",
+    "Route15",
+    "Route16",
+    "Route17",
+    "Route18",
+    "Route19",
+    "Route20",
+    "Route21_North",
+    "Route21_South",
+    "Route22",
+    "Route23",
+    "Route24",
+    "Route25",
+    "OneIsland_KindleRoad",
+    "OneIsland_TreasureBeach",
+    "TwoIsland_CapeBrink",
+    "ThreeIsland_BondBridge",
+    "ThreeIsland_Port",
+    "UnknownMap_03_50",
+    "UnknownMap_03_51",
+    "UnknownMap_03_52",
+    "UnknownMap_03_53",
+    "FiveIsland_ResortGorgeous",
+    "FiveIsland_WaterLabyrinth",
+    "FiveIsland_Meadow",
+    "FiveIsland_MemorialPillar",
+    "SixIsland_OutcastIsland",
+    "SixIsland_GreenPath",
+    "SixIsland_WaterPath",
+    "SixIsland_RuinValley",
+    "SevenIsland_TrainerTower",
+    "SevenIsland_SevaultCanyon_Entrance",
+    "SevenIsland_SevaultCanyon",
+    "SevenIsland_TanobyRuins"
+  ],
+  "gMapGroup4": [
+    "PalletTown_PlayersHouse_1F",
+    "PalletTown_PlayersHouse_2F",
+    "PalletTown_GarysHouse",
+    "PalletTown_ProfessorOaksLab"
+  ],
+  "gMapGroup5": [
+    "ViridianCity_House1",
+    "ViridianCity_Gym",
+    "ViridianCity_House2",
+    "ViridianCity_Mart",
+    "ViridianCity_PokemonCenter_1F",
+    "ViridianCity_PokemonCenter_2F"
+  ],
+  "gMapGroup6": [
+    "PewterCity_Museum_1F",
+    "PewterCity_Museum_2F",
+    "PewterCity_Gym",
+    "PewterCity_Mart",
+    "PewterCity_House1",
+    "PewterCity_PokemonCenter_1F",
+    "PewterCity_PokemonCenter_2F",
+    "PewterCity_House2"
+  ],
+  "gMapGroup7": [
+    "CeruleanCity_House1",
+    "CeruleanCity_House2",
+    "CeruleanCity_House3",
+    "CeruleanCity_PokemonCenter_1F",
+    "CeruleanCity_PokemonCenter_2F",
+    "CeruleanCity_Gym",
+    "CeruleanCity_BikeShop",
+    "CeruleanCity_Mart",
+    "CeruleanCity_House4",
+    "CeruleanCity_House5"
+  ],
+  "gMapGroup8": [
+    "LavenderTown_PokemonCenter_1F",
+    "LavenderTown_PokemonCenter_2F",
+    "LavenderTown_VolunteerPokemonHouse",
+    "LavenderTown_House1",
+    "LavenderTown_House2",
+    "LavenderTown_Mart"
+  ],
+  "gMapGroup9": [
+    "VermilionCity_House1",
+    "VermilionCity_PokemonCenter_1F",
+    "VermilionCity_PokemonCenter_2F",
+    "VermilionCity_PokemonFanClub",
+    "VermilionCity_House2",
+    "VermilionCity_Mart",
+    "VermilionCity_Gym",
+    "VermilionCity_House3"
+  ],
+  "gMapGroup10": [
+    "CeladonCity_DepartmentStore_1F",
+    "CeladonCity_DepartmentStore_2F",
+    "CeladonCity_DepartmentStore_3F",
+    "CeladonCity_DepartmentStore_4F",
+    "CeladonCity_DepartmentStore_5F",
+    "CeladonCity_DepartmentStore_Roof",
+    "CeladonCity_DepartmentStore_Elevator",
+    "CeladonCity_Condominiums_1F",
+    "CeladonCity_Condominiums_2F",
+    "CeladonCity_Condominiums_3F",
+    "CeladonCity_Condominiums_Roof",
+    "CeladonCity_Condominiums_RoofRoom",
+    "CeladonCity_PokemonCenter_1F",
+    "CeladonCity_PokemonCenter_2F",
+    "CeladonCity_GameCorner",
+    "CeladonCity_GameCorner_PrizeRoom",
+    "CeladonCity_Gym",
+    "CeladonCity_Restaurant",
+    "CeladonCity_House1",
+    "CeladonCity_Hotel"
+  ],
+  "gMapGroup11": [
+    "FuchsiaCity_SafariZone_Entrance",
+    "FuchsiaCity_Mart",
+    "FuchsiaCity_ZooBuilding",
+    "FuchsiaCity_Gym",
+    "FuchsiaCity_House1",
+    "FuchsiaCity_PokemonCenter_1F",
+    "FuchsiaCity_PokemonCenter_2F",
+    "FuchsiaCity_Building1",
+    "FuchsiaCity_House2",
+    "FuchsiaCity_House3"
+  ],
+  "gMapGroup12": [
+    "CinnabarIsland_Gym",
+    "CinnabarIsland_PokemonLab_Entrance",
+    "CinnabarIsland_PokemonLab_Lounge",
+    "CinnabarIsland_PokemonLab_ResearchRoom",
+    "CinnabarIsland_PokemonLab_ExperimentRoom",
+    "CinnabarIsland_PokemonCenter_1F",
+    "CinnabarIsland_PokemonCenter_2F",
+    "CinnabarIsland_Mart"
+  ],
+  "gMapGroup13": [
+    "IndigoPlateau_PokemonCenter_1F",
+    "IndigoPlateau_PokemonCenter_2F"
+  ],
+  "gMapGroup14": [
+    "SaffronCity_House1_1F",
+    "SaffronCity_House1_2F",
+    "SaffronCity_Dojo",
+    "SaffronCity_Gym",
+    "SaffronCity_House2",
+    "SaffronCity_Mart",
+    "SaffronCity_PokemonCenter_1F",
+    "SaffronCity_PokemonCenter_2F",
+    "SaffronCity_House3",
+    "SaffronCity_PokemonTrainerFanClub"
+  ],
+  "gMapGroup15": [
+    "Route2_ViridianForest_SouthEntrance",
+    "Route2_House",
+    "Route2_EastBuilding",
+    "Route2_ViridianForest_NorthEntrance"
+  ],
+  "gMapGroup16": [
+    "Route4_PokemonCenter_1F",
+    "Route4_PokemonCenter_2F"
+  ],
+  "gMapGroup17": [
+    "Route5_PokemonDayCare",
+    "Route5_SouthEntrance"
+  ],
+  "gMapGroup18": [
+    "Route6_NorthEntrance",
+    "UnknownMap_18_01"
+  ],
+  "gMapGroup19": [
+    "Route7_EastEntrance"
+  ],
+  "gMapGroup20": [
+    "Route8_WestEntrance"
+  ],
+  "gMapGroup21": [
+    "Route10_PokemonCenter_1F",
+    "Route10_PokemonCenter_2F"
+  ],
+  "gMapGroup22": [
+    "Route11_EastEntrance_1F",
+    "Route11_EastEntrance_2F"
+  ],
+  "gMapGroup23": [
+    "Route12_NorthEntrance_1F",
+    "Route12_NorthEntrance_2F",
+    "Route12_FishingHouse"
+  ],
+  "gMapGroup24": [
+    "Route15_WestEntrance_1F",
+    "Route15_WestEntrance_2F"
+  ],
+  "gMapGroup25": [
+    "Route16_House",
+    "Route16_NorthEntrance_1F",
+    "Route16_NorthEntrance_2F"
+  ],
+  "gMapGroup26": [
+    "Route18_EastEntrance_1F",
+    "Route18_EastEntrance_2F"
+  ],
+  "gMapGroup27": [
+    "UnusedHouse_27_00"
+  ],
+  "gMapGroup28": [
+    "Route22_NorthEntrance"
+  ],
+  "gMapGroup29": [
+    "UnusedHouse_29_00"
+  ],
+  "gMapGroup30": [
+    "Route25_SeaCottage"
+  ],
+  "gMapGroup31": [
+    "SevenIsland_House_Room1",
+    "SevenIsland_House_Room2",
+    "SevenIsland_Mart",
+    "SevenIsland_PokemonCenter_1F",
+    "SevenIsland_PokemonCenter_2F",
+    "UnusedHouse_31_05",
+    "SevenIsland_Harbor"
+  ],
+  "gMapGroup32": [
+    "OneIsland_PokemonCenter_1F",
+    "OneIsland_PokemonCenter_2F",
+    "OneIsland_House1",
+    "OneIsland_House2",
+    "OneIsland_Harbor"
+  ],
+  "gMapGroup33": [
+    "TwoIsland_JoyfulGameCorner",
+    "TwoIsland_House",
+    "TwoIsland_PokemonCenter_1F",
+    "TwoIsland_PokemonCenter_2F",
+    "TwoIsland_Harbor"
+  ],
+  "gMapGroup34": [
+    "ThreeIsland_House1",
+    "ThreeIsland_PokemonCenter_1F",
+    "ThreeIsland_PokemonCenter_2F",
+    "ThreeIsland_Mart",
+    "ThreeIsland_House2",
+    "ThreeIsland_House3",
+    "ThreeIsland_House4",
+    "ThreeIsland_House5"
+  ],
+  "gMapGroup35": [
+    "FourIsland_PokemonDayCare",
+    "FourIsland_PokemonCenter_1F",
+    "FourIsland_PokemonCenter_2F",
+    "FourIsland_House1",
+    "FourIsland_LoreleisHouse",
+    "FourIsland_Harbor",
+    "FourIsland_House2",
+    "FourIsland_Mart"
+  ],
+  "gMapGroup36": [
+    "FiveIsland_PokemonCenter_1F",
+    "FiveIsland_PokemonCenter_2F",
+    "FiveIsland_Harbor",
+    "FiveIsland_House1",
+    "FiveIsland_House2"
+  ],
+  "gMapGroup37": [
+    "SixIsland_PokemonCenter_1F",
+    "SixIsland_PokemonCenter_2F",
+    "SixIsland_Harbor",
+    "SixIsland_House",
+    "SixIsland_Mart"
+  ],
+  "gMapGroup38": [
+    "ThreeIsland_Harbor"
+  ],
+  "gMapGroup39": [
+    "FiveIsland_ResortGorgeous_House"
+  ],
+  "gMapGroup40": [
+    "TwoIsland_CapeBrink_House"
+  ],
+  "gMapGroup41": [
+    "SixIsland_WaterPath_House1",
+    "SixIsland_WaterPath_House2"
+  ],
+  "gMapGroup42": [
+    "SevenIsland_SevaultCanyon_House"
+  ],
+  "connections_include_order": [
+    "PalletTown",
+    "ViridianCity",
+    "PewterCity",
+    "CeruleanCity",
+    "LavenderTown",
+    "VermilionCity",
+    "CeladonCity",
+    "FuchsiaCity",
+    "CinnabarIsland",
+    "IndigoPlateau_Exterior",
+    "SaffronCity_Duplicate",
+    "SaffronCity",
+    "OneIsland",
+    "TwoIsland",
+    "ThreeIsland",
+    "FiveIsland",
+    "SevenIsland",
+    "SixIsland",
+    "Route1",
+    "Route2",
+    "Route3",
+    "Route4",
+    "Route5",
+    "Route6",
+    "Route7",
+    "Route8",
+    "Route9",
+    "Route10",
+    "Route11",
+    "Route12",
+    "Route13",
+    "Route14",
+    "Route15",
+    "Route16",
+    "Route17",
+    "Route18",
+    "Route19",
+    "Route20",
+    "Route21_North",
+    "Route21_South",
+    "Route22",
+    "Route23",
+    "Route24",
+    "Route25",
+    "OneIsland_KindleRoad",
+    "OneIsland_TreasureBeach",
+    "TwoIsland_CapeBrink",
+    "ThreeIsland_BondBridge",
+    "ThreeIsland_Port",
+    "UnknownMap_03_50",
+    "UnknownMap_03_51",
+    "FiveIsland_ResortGorgeous",
+    "FiveIsland_WaterLabyrinth",
+    "FiveIsland_Meadow",
+    "FiveIsland_MemorialPillar",
+    "SixIsland_OutcastIsland",
+    "SixIsland_GreenPath",
+    "SixIsland_WaterPath",
+    "SixIsland_RuinValley",
+    "SevenIsland_TrainerTower",
+    "SevenIsland_SevaultCanyon_Entrance",
+    "SevenIsland_SevaultCanyon",
+    "SevenIsland_TanobyRuins"
+  ]
+}
\ No newline at end of file
diff --git a/data/menu_indicators.s b/data/menu_indicators.s
new file mode 100644
index 000000000..dd8911c7d
--- /dev/null
+++ b/data/menu_indicators.s
@@ -0,0 +1,46 @@
+	.section .rodata
+	.align 2
+gUnknown_846325C:: @ 846325C
+	.incbin "baserom.gba", 0x46325C, 0x48
+
+gUnknown_84632A4:: @ 84632A4
+	.incbin "baserom.gba", 0x4632A4, 0x18
+
+gUnknown_84632BC:: @ 84632BC
+	.incbin "baserom.gba", 0x4632BC, 0x4
+
+gUnknown_84632C0:: @ 84632C0
+	.incbin "baserom.gba", 0x4632C0, 0x4
+
+gUnknown_84632C4:: @ 84632C4
+	.incbin "baserom.gba", 0x4632C4, 0x4
+
+gUnknown_84632C8:: @ 84632C8
+	.incbin "baserom.gba", 0x4632C8, 0x4
+
+gUnknown_84632CC:: @ 84632CC
+	.incbin "baserom.gba", 0x4632CC, 0x4
+
+gUnknown_84632D0:: @ 84632D0
+	.incbin "baserom.gba", 0x4632D0, 0x4
+
+gUnknown_84632D4:: @ 84632D4
+	.incbin "baserom.gba", 0x4632D4, 0x4
+
+gUnknown_84632D8:: @ 84632D8
+	.incbin "baserom.gba", 0x4632D8, 0x18
+
+gUnknown_84632F0:: @ 84632F0
+	.incbin "baserom.gba", 0x4632F0, 0x18
+
+gUnknown_8463308:: @ 8463308
+	.incbin "baserom.gba", 0x463308, 0x20
+
+gUnknown_8463328:: @ 8463328
+	.incbin "baserom.gba", 0x463328, 0x70
+
+gUnknown_8463398:: @ 8463398
+	.incbin "baserom.gba", 0x463398, 0x40
+
+gUnknown_84633D8:: @ 84633D8
+	.incbin "baserom.gba", 0x4633D8, 0x44
diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s
index 48be143d7..c33228bb6 100644
--- a/data/mystery_event_msg.s
+++ b/data/mystery_event_msg.s
@@ -215,7 +215,7 @@ MysteryEventScript_StampCard:: @ 8488E2
 @ 	.string "Thank you for using the MYSTERY\nGIFT System.$"
 @
 @ sText_AuroraTicketNoPlace:
-@ 	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
+@ 	.string "Oh, I'm sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
 @
 @ MysteryEventScript_MysticTicket:: @ 867550B
 @ 	setvaddress MysteryEventScript_MysticTicket
@@ -269,7 +269,7 @@ MysteryEventScript_StampCard:: @ 8488E2
 @ 	.string "Thank you for using the MYSTERY\nGIFT System.$"
 @
 @ sText_MysticTicketNoPlace:
-@ 	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
+@ 	.string "Oh, I'm sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
 @
 @ MysteryEventScript_AlteringCave:: @ 86756E3
 @ 	setvaddress MysteryEventScript_AlteringCave
@@ -339,4 +339,4 @@ MysteryEventScript_StampCard:: @ 8488E2
 @ 	.string "Thank you for using the MYSTERY\nGIFT System.$"
 @
 @ sText_MysteryGiftOldSeaMap_3:
-@ 	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
+@ 	.string "Oh, I'm sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s
index 5dbcf50ee..9d74b6282 100644
--- a/data/mystery_event_script_cmd_table.s
+++ b/data/mystery_event_script_cmd_table.s
@@ -1,5 +1,6 @@
 	.section script_data, "aw", %progbits
 
+	.align 2
 gMysteryEventScriptCmdTable:: @ 81DBCF0
 	.4byte MEScrCmd_nop
 	.4byte MEScrCmd_checkcompat
diff --git a/data/oak_speech/help_docs_page2_tilemap.bin b/data/oak_speech/help_docs_page2_tilemap.bin
new file mode 100644
index 000000000..6d3cd42f1
--- /dev/null
+++ b/data/oak_speech/help_docs_page2_tilemap.bin
diff --git a/data/oak_speech/help_docs_page3_tilemap.bin b/data/oak_speech/help_docs_page3_tilemap.bin
new file mode 100644
index 000000000..24805c96e
--- /dev/null
+++ b/data/oak_speech/help_docs_page3_tilemap.bin
diff --git a/data/oak_speech/help_docs_palette.pal b/data/oak_speech/help_docs_palette.pal
new file mode 100644
index 000000000..b6905b913
--- /dev/null
+++ b/data/oak_speech/help_docs_palette.pal
@@ -0,0 +1,67 @@
+JASC-PAL
+0100
+64
+16 115 230
+65 139 131
+82 148 139
+106 164 156
+131 180 172
+156 197 189
+180 213 205
+205 230 222
+230 246 238
+255 0 255
+255 0 255
+0 90 16
+255 0 0
+49 82 205
+255 255 255
+32 32 32
+16 115 230
+255 255 164
+255 255 106
+222 222 90
+189 189 74
+156 156 57
+156 156 57
+123 123 49
+90 90 32
+57 57 16
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+0 0 0
+238 230 172
+115 180 197
+156 213 238
+205 238 246
+246 255 255
+230 246 246
+106 106 106
+74 82 106
+82 98 180
+230 246 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 74 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 0 255
+123 123 123
+172 172 156
+197 197 197
+222 222 222
+238 238 238
+255 255 255
diff --git a/data/oak_speech/new_game_adventure_intro_tilemap.bin b/data/oak_speech/new_game_adventure_intro_tilemap.bin
new file mode 100644
index 000000000..ad1c8216c
--- /dev/null
+++ b/data/oak_speech/new_game_adventure_intro_tilemap.bin
@@ -0,0 +1,2 @@
+^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^                                `                           `   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   `                           `   ` ((((((((((((((((((((((((((`   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` ((((((((((((((((((((((((((`   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   `                           `   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   `                     ` a b c d e f   ` ((((((((((((((((((((p q r s t u v   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` g h i j k l m   ` ((((((((((((((((((((w x y z { | }   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` n o � � � � �   `                     ~  � � � � �   	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 
+ 
\ No newline at end of file
diff --git a/data/oak_speech/oak_speech_background_tilemap.bin b/data/oak_speech/oak_speech_background_tilemap.bin
new file mode 100644
index 000000000..64374cd24
--- /dev/null
+++ b/data/oak_speech/oak_speech_background_tilemap.bin
diff --git a/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png b/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png
new file mode 100644
index 000000000..419858b1b
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png
diff --git a/data/oak_speech/oak_speech_gfx_grass_platform.png b/data/oak_speech/oak_speech_gfx_grass_platform.png
new file mode 100644
index 000000000..2c8e425d2
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_grass_platform.png
diff --git a/data/oak_speech/oak_speech_gfx_leaf_pal.pal b/data/oak_speech/oak_speech_gfx_leaf_pal.pal
new file mode 100644
index 000000000..feb1214a1
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_leaf_pal.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+115 197 164
+255 238 205
+246 205 180
+213 164 148
+172 131 106
+106 74 65
+205 164 139
+164 123 98
+115 74 49
+74 41 16
+222 222 222
+180 180 180
+131 131 131
+82 82 90
+41 41 49
+255 255 255
+0 0 0
+131 189 213
+106 156 180
+82 131 156
+49 90 115
+32 65 90
+0 0 255
+255 255 189
+222 222 82
+172 172 57
+98 98 0
+213 131 123
+189 106 98
+164 82 74
+139 57 49
+98 24 16
diff --git a/data/oak_speech/oak_speech_gfx_leaf_pic.png b/data/oak_speech/oak_speech_gfx_leaf_pic.png
new file mode 100644
index 000000000..1825f9960
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_leaf_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_oak_pal.pal b/data/oak_speech/oak_speech_gfx_oak_pal.pal
new file mode 100644
index 000000000..a0b648b2b
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_oak_pal.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+115 197 164
+255 230 205
+222 189 156
+197 148 115
+106 74 65
+238 222 148
+205 189 115
+172 156 90
+139 123 65
+98 90 49
+255 0 255
+205 205 222
+123 131 156
+57 74 106
+255 255 255
+0 0 0
+0 0 255
+172 148 222
+131 115 172
+82 65 115
+230 222 180
+205 197 156
+180 172 139
+164 156 123
+123 115 90
+82 57 49
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/oak_speech/oak_speech_gfx_oak_pic.png b/data/oak_speech/oak_speech_gfx_oak_pic.png
new file mode 100644
index 000000000..9ac602944
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_oak_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_pika1.png b/data/oak_speech/oak_speech_gfx_pika1.png
new file mode 100644
index 000000000..71644c355
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_pika1.png
diff --git a/data/oak_speech/oak_speech_gfx_pika2.png b/data/oak_speech/oak_speech_gfx_pika2.png
new file mode 100644
index 000000000..e85cbfa9c
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_pika2.png
diff --git a/data/oak_speech/oak_speech_gfx_pika_eyes.png b/data/oak_speech/oak_speech_gfx_pika_eyes.png
new file mode 100644
index 000000000..5e2fd80c0
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_pika_eyes.png
diff --git a/data/oak_speech/oak_speech_gfx_red_pal.pal b/data/oak_speech/oak_speech_gfx_red_pal.pal
new file mode 100644
index 000000000..7eec09831
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_red_pal.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+115 197 164
+255 230 205
+222 189 156
+197 148 131
+148 106 90
+106 74 65
+205 164 139
+164 123 98
+115 74 49
+82 65 32
+222 222 222
+180 180 180
+131 131 131
+82 82 90
+57 57 65
+255 255 255
+0 0 0
+131 189 213
+106 156 180
+82 131 156
+49 90 115
+32 65 90
+0 0 255
+238 238 74
+205 205 49
+164 164 32
+98 98 0
+213 131 123
+189 106 98
+164 82 74
+139 57 49
+98 24 16
diff --git a/data/oak_speech/oak_speech_gfx_red_pic.png b/data/oak_speech/oak_speech_gfx_red_pic.png
new file mode 100644
index 000000000..edf5cf9b1
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_red_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_rival_pal.pal b/data/oak_speech/oak_speech_gfx_rival_pal.pal
new file mode 100644
index 000000000..8240527a6
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_rival_pal.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+115 197 164
+255 230 205
+222 189 156
+197 148 115
+106 74 65
+238 189 74
+213 156 57
+189 123 41
+139 82 41
+164 123 106
+222 222 222
+197 197 197
+139 139 139
+98 98 98
+65 65 65
+255 255 255
+0 0 0
+180 148 180
+139 106 139
+106 74 106
+82 49 82
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+246 131 131
+205 82 82
diff --git a/data/oak_speech/oak_speech_gfx_rival_pic.png b/data/oak_speech/oak_speech_gfx_rival_pic.png
new file mode 100644
index 000000000..317cbc038
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_rival_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_solid_colors.png b/data/oak_speech/oak_speech_gfx_solid_colors.png
new file mode 100644
index 000000000..30066cdd8
--- /dev/null
+++ b/data/oak_speech/oak_speech_gfx_solid_colors.png
diff --git a/data/oak_speech/oak_speech_grass_platform_palette.pal b/data/oak_speech/oak_speech_grass_platform_palette.pal
new file mode 100644
index 000000000..4fb339128
--- /dev/null
+++ b/data/oak_speech/oak_speech_grass_platform_palette.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 189 164
+65 139 131
+82 148 139
+106 164 156
+131 180 172
+156 197 189
+180 213 205
+205 230 222
+230 246 238
+0 0 0
+255 0 255
+139 189 164
+156 205 172
+180 222 197
+205 238 222
+115 172 156
diff --git a/data/oak_speech/oak_speech_pika_palette.pal b/data/oak_speech/oak_speech_pika_palette.pal
new file mode 100644
index 000000000..4d2e92c74
--- /dev/null
+++ b/data/oak_speech/oak_speech_pika_palette.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 205 180
+255 255 255
+255 246 106
+246 213 0
+238 172 0
+197 139 0
+131 82 0
+255 0 255
+255 0 255
+180 180 180
+255 74 74
+230 0 0
+180 0 0
+106 106 106
+16 16 16
+255 0 255
diff --git a/data/palette.s b/data/palette.s
new file mode 100644
index 000000000..67a6fcb0c
--- /dev/null
+++ b/data/palette.s
@@ -0,0 +1,7 @@
+	.section .rodata
+	.align 2
+gUnknown_83AC960:: @ 83AC960
+	.incbin "baserom.gba", 0x3AC960, 0x10
+
+gUnknown_83AC970:: @ 83AC970
+	.incbin "baserom.gba", 0x3AC970, 0x20
diff --git a/data/pokedex_area_markers.s b/data/pokedex_area_markers.s
new file mode 100644
index 000000000..bf63a3210
--- /dev/null
+++ b/data/pokedex_area_markers.s
@@ -0,0 +1,14 @@
+	.section .rodata
+	.align 2
+
+gUnknown_846341C:: @ 846341C
+	.incbin "baserom.gba", 0x46341C, 0x20
+
+gUnknown_846343C:: @ 846343C
+	.incbin "baserom.gba", 0x46343C, 0x128
+
+gUnknown_8463564:: @ 8463564
+	.incbin "baserom.gba", 0x463564, 0x1C
+
+gUnknown_8463580:: @ 8463580
+	.incbin "baserom.gba", 0x463580, 0x140
diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s
new file mode 100644
index 000000000..be7c0de93
--- /dev/null
+++ b/data/pokemon_summary_screen.s
@@ -0,0 +1,134 @@
+	.section .rodata
+	.align 2
+
+gUnknown_84636C0:: @ 84636C0
+	.incbin "baserom.gba", 0x4636C0, 0x20
+
+gUnknown_84636E0:: @ 84636E0
+	.incbin "baserom.gba", 0x4636E0, 0x20
+
+gUnknown_8463700:: @ 8463700
+	.incbin "baserom.gba", 0x463700, 0x20
+
+gUnknown_8463720:: @ 8463720
+	.incbin "baserom.gba", 0x463720, 0x20
+
+gUnknown_8463740:: @ 8463740
+	.incbin "baserom.gba", 0x463740, 0x12C
+
+gUnknown_846386C:: @ 846386C
+	.incbin "baserom.gba", 0x46386C, 0x120
+
+gUnknown_846398C:: @ 846398C
+	.incbin "baserom.gba", 0x46398C, 0x18
+
+gUnknown_84639A4:: @ 84639A4
+	.incbin "baserom.gba", 0x4639A4, 0x8
+
+gUnknown_84639AC:: @ 84639AC
+	.incbin "baserom.gba", 0x4639AC, 0x48
+
+gUnknown_84639F4:: @ 84639F4
+	.incbin "baserom.gba", 0x4639F4, 0x20
+
+gUnknown_8463A14:: @ 8463A14
+	.incbin "baserom.gba", 0x463A14, 0x68
+
+gUnknown_8463A7C:: @ 8463A7C
+	.incbin "baserom.gba", 0x463A7C, 0x70
+
+gUnknown_8463AEC:: @ 8463AEC
+	.incbin "baserom.gba", 0x463AEC, 0x10
+
+gUnknown_8463AFC:: @ 8463AFC
+	.incbin "baserom.gba", 0x463AFC, 0x4
+
+gUnknown_8463B00:: @ 8463B00
+	.incbin "baserom.gba", 0x463B00, 0x20
+
+gUnknown_8463B20:: @ 8463B20
+	.incbin "baserom.gba", 0x463B20, 0x10
+
+gUnknown_8463B30:: @ 8463B30
+	.incbin "baserom.gba", 0x463B30, 0x10
+
+gUnknown_8463B40:: @ 8463B40
+	.incbin "baserom.gba", 0x463B40, 0x4
+
+gUnknown_8463B44:: @ 8463B44
+	.incbin "baserom.gba", 0x463B44, 0x20
+
+gUnknown_8463B64:: @ 8463B64
+	.incbin "baserom.gba", 0x463B64, 0x24
+
+gUnknown_8463B88:: @ 8463B88
+	.incbin "baserom.gba", 0x463B88, 0xF8
+
+gUnknown_8463C80:: @ 8463C80
+	.incbin "baserom.gba", 0x463C80, 0x1E0
+
+gUnknown_8463E60:: @ 8463E60
+	.incbin "baserom.gba", 0x463E60, 0x64
+
+gUnknown_8463EC4:: @ 8463EC4
+	.incbin "baserom.gba", 0x463EC4, 0x10
+
+gUnknown_8463ED4:: @ 8463ED4
+	.incbin "baserom.gba", 0x463ED4, 0x1C
+
+gUnknown_8463EF0:: @ 8463EF0
+	.incbin "baserom.gba", 0x463EF0, 0xC
+
+gUnknown_8463EFC:: @ 8463EFC
+	.incbin "baserom.gba", 0x463EFC, 0x10
+
+gUnknown_8463F0C:: @ 8463F0C
+	.incbin "baserom.gba", 0x463F0C, 0x18
+
+gUnknown_8463F24:: @ 8463F24
+	.incbin "baserom.gba", 0x463F24, 0x18
+
+gUnknown_8463F3C:: @ 8463F3C
+	.incbin "baserom.gba", 0x463F3C, 0x20
+
+gUnknown_8463F5C:: @ 8463F5C
+	.incbin "baserom.gba", 0x463F5C, 0x20
+
+gUnknown_8463F7C:: @ 8463F7C
+	.incbin "baserom.gba", 0x463F7C, 0x20
+
+gUnknown_8463F9C:: @ 8463F9C
+	.incbin "baserom.gba", 0x463F9C, 0x8
+
+gUnknown_8463FA4:: @ 8463FA4
+	.incbin "baserom.gba", 0x463FA4, 0x3
+
+gUnknown_8463FA7:: @ 8463FA7
+	.incbin "baserom.gba", 0x463FA7, 0x11
+
+gUnknown_8463FB8:: @ 8463FB8
+	.incbin "baserom.gba", 0x463FB8, 0x6
+
+gUnknown_8463FBE:: @ 8463FBE
+	.incbin "baserom.gba", 0x463FBE, 0x3
+
+gUnknown_8463FC1:: @ 8463FC1
+	.incbin "baserom.gba", 0x463FC1, 0x5
+
+gUnknown_8463FC6:: @ 8463FC6
+	.incbin "baserom.gba", 0x463FC6, 0x7
+
+gUnknown_8463FCD:: @ 8463FCD
+	.incbin "baserom.gba", 0x463FCD, 0x7
+
+gUnknown_8463FD4:: @ 8463FD4
+	.incbin "baserom.gba", 0x463FD4, 0xB
+
+gUnknown_8463FDF:: @ 8463FDF
+	.incbin "baserom.gba", 0x463FDF, 0xB
+
+gUnknown_8463FEA:: @ 8463FEA
+	.incbin "baserom.gba", 0x463FEA, 0x12
+
+gUnknown_8463FFC:: @ 8463FFC
+	.incbin "baserom.gba", 0x463FFC, 0xC
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 29850d685..23cd757c2 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -1,8 +1,8 @@
-    .align 2
+	.align 2
 
 gScriptCmdTable:: @ 815F9B4
-	.4byte sub_8069ED0
-	.4byte sub_8069ED4
+	.4byte ScrCmd_nop
+	.4byte ScrCmd_nop1
 	.4byte ScrCmd_end
 	.4byte ScrCmd_return
 	.4byte ScrCmd_call
@@ -38,48 +38,48 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_compare_var_to_var
 	.4byte ScrCmd_callnative
 	.4byte ScrCmd_gotonative
-	.4byte sub_8069EFC
-	.4byte sub_8069F3C
-	.4byte sub_8069FA4
+	.4byte ScrCmd_special
+	.4byte ScrCmd_specialvar
+	.4byte ScrCmd_waitstate
 	.4byte ScrCmd_delay
 	.4byte ScrCmd_setflag
 	.4byte ScrCmd_clearflag
 	.4byte ScrCmd_checkflag
-	.4byte sub_806A9D4
-	.4byte sub_806A9D8
-	.4byte sub_806A9DC
+	.4byte ScrCmd_initclock
+	.4byte ScrCmd_dodailyevents
+	.4byte ScrCmd_gettime
 	.4byte ScrCmd_playse
-	.4byte sub_806B094
+	.4byte ScrCmd_waitse
 	.4byte ScrCmd_playfanfare
-	.4byte sub_806B0CC
-	.4byte sub_806B0E0
-	.4byte sub_806B120
-	.4byte sub_806B134
-	.4byte sub_806B154
-	.4byte sub_806B17C
-	.4byte sub_806B1C8
+	.4byte ScrCmd_waitfanfare
+	.4byte ScrCmd_playbgm
+	.4byte ScrCmd_savebgm
+	.4byte ScrCmd_fadedefaultbgm
+	.4byte ScrCmd_fadenewbgm
+	.4byte ScrCmd_fadeoutbgm
+	.4byte ScrCmd_fadeinbgm
 	.4byte ScrCmd_warp
 	.4byte ScrCmd_warpsilent
 	.4byte ScrCmd_warpdoor
 	.4byte ScrCmd_warphole
-	.4byte sub_806AC70
+	.4byte ScrCmd_warpteleport
 	.4byte ScrCmd_setwarp
 	.4byte ScrCmd_setdynamicwarp
-	.4byte sub_806AE90
-	.4byte sub_806AF10
+	.4byte ScrCmd_setdivewarp
+	.4byte ScrCmd_setholewarp
 	.4byte ScrCmd_getplayerxy
 	.4byte ScrCmd_getpartysize
-	.4byte sub_806A610
+	.4byte ScrCmd_giveitem
 	.4byte ScrCmd_takeitem
-	.4byte sub_806A6A0
-	.4byte sub_806A6E4
+	.4byte ScrCmd_checkitemspace
+	.4byte ScrCmd_checkitem
 	.4byte ScrCmd_checkitemtype
 	.4byte ScrCmd_givepcitem
 	.4byte ScrCmd_checkpcitem
-	.4byte sub_806A7DC
-	.4byte sub_806A7F0
-	.4byte sub_806A818
-	.4byte sub_806A804
+	.4byte ScrCmd_givedecoration
+	.4byte ScrCmd_takedecoration
+	.4byte ScrCmd_checkdecor
+	.4byte ScrCmd_checkdecorspace
 	.4byte ScrCmd_applymovement
 	.4byte ScrCmd_applymovement_at
 	.4byte ScrCmd_waitmovement
@@ -94,34 +94,34 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_faceplayer
 	.4byte ScrCmd_turnobject
 	.4byte ScrCmd_trainerbattle
-	.4byte sub_806C2D8
-	.4byte ScrCmd_ontrainerbattleend
-	.4byte ScrCmd_ontrainerbattleendgoto
+	.4byte ScrCmd_dotrainerbattle
+	.4byte ScrCmd_gotopostbattlescript
+	.4byte ScrCmd_gotobeatenscript
 	.4byte ScrCmd_checktrainerflag
 	.4byte ScrCmd_settrainerflag
 	.4byte ScrCmd_cleartrainerflag
 	.4byte ScrCmd_setobjectxyperm
 	.4byte ScrCmd_moveobjectoffscreen
 	.4byte ScrCmd_setobjectmovementtype
-	.4byte sub_806B878
-	.4byte sub_806B80C
-	.4byte sub_806B88C
+	.4byte ScrCmd_waitmessage
+	.4byte ScrCmd_message
+	.4byte ScrCmd_closemessage
 	.4byte ScrCmd_lockall
 	.4byte ScrCmd_lock
 	.4byte ScrCmd_releaseall
 	.4byte ScrCmd_release
-	.4byte sub_806BA3C
+	.4byte ScrCmd_waitbuttonpress
 	.4byte ScrCmd_yesnobox
 	.4byte ScrCmd_multichoice
 	.4byte ScrCmd_multichoicedefault
 	.4byte ScrCmd_multichoicegrid
-	.4byte sub_806BB38
-	.4byte sub_806BB8C
-	.4byte sub_806BB98
-	.4byte sub_806BB9C
-	.4byte sub_806BBD8
-	.4byte sub_806BBF8
-	.4byte sub_806BC04
+	.4byte ScrCmd_drawbox
+	.4byte ScrCmd_erasebox
+	.4byte ScrCmd_drawboxtext
+	.4byte ScrCmd_showmonpic
+	.4byte ScrCmd_hidemonpic
+	.4byte ScrCmd_showcontestwinner
+	.4byte ScrCmd_braillemessage
 	.4byte ScrCmd_givemon
 	.4byte ScrCmd_giveegg
 	.4byte ScrCmd_setmonmove
@@ -130,33 +130,33 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_bufferleadmonspeciesname
 	.4byte ScrCmd_bufferpartymonnick
 	.4byte ScrCmd_bufferitemname
-	.4byte sub_806BE34
+	.4byte ScrCmd_bufferdecorationname
 	.4byte ScrCmd_buffermovename
 	.4byte ScrCmd_buffernumberstring
 	.4byte ScrCmd_bufferstdstring
 	.4byte ScrCmd_bufferstring
-	.4byte sub_806C3AC
-	.4byte sub_806C3C0
-	.4byte sub_806C3D4
+	.4byte ScrCmd_pokemart
+	.4byte ScrCmd_pokemartdecoration
+	.4byte ScrCmd_pokemartdecoration2
 	.4byte ScrCmd_playslotmachine
-	.4byte sub_806C410
-	.4byte sub_806C418
-	.4byte sub_806C424
-	.4byte sub_806C428
-	.4byte sub_806C42C
+	.4byte ScrCmd_setberrytree
+	.4byte ScrCmd_choosecontestmon
+	.4byte ScrCmd_startcontest
+	.4byte ScrCmd_showcontestresults
+	.4byte ScrCmd_contestlinktransfer
 	.4byte ScrCmd_random
 	.4byte ScrCmd_givemoney
 	.4byte ScrCmd_takemoney
 	.4byte ScrCmd_checkmoney
-	.4byte sub_806C1CC
-	.4byte sub_806C21C
-	.4byte sub_806C228
-	.4byte sub_806C414
+	.4byte ScrCmd_showmoneybox
+	.4byte ScrCmd_hidemoneybox
+	.4byte ScrCmd_updatemoneybox
+	.4byte ScrCmd_getpricereduction
 	.4byte ScrCmd_fadescreen
 	.4byte ScrCmd_fadescreenspeed
 	.4byte ScrCmd_setflashradius
 	.4byte ScrCmd_animateflash
-	.4byte sub_806B85C
+	.4byte ScrCmd_messageautoscroll
 	.4byte ScrCmd_dofieldeffect
 	.4byte ScrCmd_setfieldeffectarg
 	.4byte ScrCmd_waitfieldeffect
@@ -175,16 +175,16 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_turnvobject
 	.4byte ScrCmd_opendoor
 	.4byte ScrCmd_closedoor
-	.4byte sub_806C688
+	.4byte ScrCmd_waitdooranim
 	.4byte ScrCmd_setdooropen
 	.4byte ScrCmd_setdoorclosed
-	.4byte sub_806C724
-	.4byte sub_806C728
+	.4byte ScrCmd_addelevmenuitem
+	.4byte ScrCmd_showelevmenu
 	.4byte ScrCmd_checkcoins
 	.4byte ScrCmd_givecoins
 	.4byte ScrCmd_takecoins
 	.4byte ScrCmd_setwildbattle
-	.4byte sub_806C39C
+	.4byte ScrCmd_dowildbattle
 	.4byte ScrCmd_setvaddress
 	.4byte ScrCmd_vgoto
 	.4byte ScrCmd_vcall
@@ -193,27 +193,27 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_vmessage
 	.4byte ScrCmd_vloadword
 	.4byte ScrCmd_vbufferstring
-	.4byte sub_806C258
+	.4byte ScrCmd_showcoinsbox
 	.4byte ScrCmd_hidecoinsbox
 	.4byte ScrCmd_updatecoinsbox
 	.4byte ScrCmd_incrementgamestat
 	.4byte ScrCmd_setescapewarp
-	.4byte sub_806C540
+	.4byte ScrCmd_waitmoncry
 	.4byte ScrCmd_bufferboxname
-	.4byte sub_806B7EC
-	.4byte sub_806B828
-	.4byte sub_806B850
-	.4byte sub_806C7BC
-	.4byte sub_806C7C8
-	.4byte sub_806A888
+	.4byte ScrCmd_textcolor
+	.4byte ScrCmd_loadhelp
+	.4byte ScrCmd_unloadhelp
+	.4byte ScrCmd_signmsg
+	.4byte ScrCmd_normalmsg
+	.4byte ScrCmd_comparestattoword
 	.4byte ScrCmd_setmonobedient
 	.4byte ScrCmd_checkmonobedience
-	.4byte sub_806A28C
-	.4byte sub_806A8C0
-	.4byte sub_806ACF8
-	.4byte sub_806C844
-	.4byte sub_806BC40
-	.4byte sub_806BD90
+	.4byte ScrCmd_execram
+	.4byte ScrCmd_setworldmapflag
+	.4byte ScrCmd_warpteleport2
+	.4byte ScrCmd_setmonmetlocation
+	.4byte ScrCmd_getbraillestringwidth
+	.4byte ScrCmd_bufferitemnameplural
 
 gScriptCmdTableEnd:: @ 815FD08
-	.4byte sub_8069ED0
+	.4byte ScrCmd_nop
diff --git a/data/seagallop/eb_tilemap.bin b/data/seagallop/eb_tilemap.bin
new file mode 100644
index 000000000..2f912fb18
--- /dev/null
+++ b/data/seagallop/eb_tilemap.bin
diff --git a/data/seagallop/ferry_and_wake.pal b/data/seagallop/ferry_and_wake.pal
new file mode 100644
index 000000000..c25501332
--- /dev/null
+++ b/data/seagallop/ferry_and_wake.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+65 123 180
+238 246 255
+222 230 238
+189 205 230
+156 164 189
+139 139 156
+98 98 123
+57 57 106
+197 98 98
+172 65 106
+32 74 156
+197 148 0
+246 213 24
+222 238 255
+255 255 255
+74 106 139
diff --git a/data/seagallop/ferry_sprite.png b/data/seagallop/ferry_sprite.png
new file mode 100644
index 000000000..cc06fbffa
--- /dev/null
+++ b/data/seagallop/ferry_sprite.png
diff --git a/data/seagallop/wake.png b/data/seagallop/wake.png
new file mode 100644
index 000000000..a5ff28c6e
--- /dev/null
+++ b/data/seagallop/wake.png
diff --git a/data/seagallop/water.png b/data/seagallop/water.png
new file mode 100644
index 000000000..ccf64591a
--- /dev/null
+++ b/data/seagallop/water.png
diff --git a/data/seagallop/wb_tilemap.bin b/data/seagallop/wb_tilemap.bin
new file mode 100644
index 000000000..a3c27d319
--- /dev/null
+++ b/data/seagallop/wb_tilemap.bin
diff --git a/data/slot_machine.s b/data/slot_machine.s
new file mode 100644
index 000000000..dac396602
--- /dev/null
+++ b/data/slot_machine.s
@@ -0,0 +1,94 @@
+	.section .rodata
+	.align 2
+gUnknown_8464890:: @ 8464890
+	.incbin "baserom.gba", 0x464890, 0x1E
+
+gUnknown_84648AE:: @ 84648AE
+	.incbin "baserom.gba", 0x4648AE, 0xF
+
+gUnknown_84648BD:: @ 84648BD
+	.incbin "baserom.gba", 0x4648BD, 0x15
+
+gUnknown_84648D2:: @ 84648D2
+	.incbin "baserom.gba", 0x4648D2, 0x54
+
+gUnknown_8464926:: @ 8464926
+	.incbin "baserom.gba", 0x464926, 0x40
+
+gUnknown_8464966:: @ 8464966
+	.incbin "baserom.gba", 0x464966, 0xC4A
+
+gUnknown_84655B0:: @ 84655B0
+	.incbin "baserom.gba", 0x4655B0, 0x18
+
+gUnknown_84655C8:: @ 84655C8
+	.incbin "baserom.gba", 0x4655C8, 0x40
+
+gUnknown_8465608:: @ 8465608
+	.incbin "baserom.gba", 0x465608, 0xE
+
+gUnknown_8465616:: @ 8465616
+	.incbin "baserom.gba", 0x465616, 0xC0
+
+gUnknown_84656D6:: @ 84656D6
+	.incbin "baserom.gba", 0x4656D6, 0x10E
+
+gUnknown_84657E4:: @ 84657E4
+	.incbin "baserom.gba", 0x4657E4, 0x98
+
+gUnknown_846587C:: @ 846587C
+	.incbin "baserom.gba", 0x46587C, 0x5C
+
+gUnknown_84658D8:: @ 84658D8
+	.incbin "baserom.gba", 0x4658D8, 0x18
+
+gUnknown_84658F0:: @ 84658F0
+	.incbin "baserom.gba", 0x4658F0, 0x40
+
+gUnknown_8465930:: @ 8465930
+	.incbin "baserom.gba", 0x465930, 0x20
+
+gUnknown_8465950:: @ 8465950
+	.incbin "baserom.gba", 0x465950, 0x80
+
+gUnknown_84659D0:: @ 84659D0
+	.incbin "baserom.gba", 0x4659D0, 0x804
+
+gUnknown_84661D4:: @ 84661D4
+	.incbin "baserom.gba", 0x4661D4, 0x2E8
+
+gUnknown_84664BC:: @ 84664BC
+	.incbin "baserom.gba", 0x4664BC, 0x20
+
+gUnknown_84664DC:: @ 84664DC
+	.incbin "baserom.gba", 0x4664DC, 0x60
+
+gUnknown_846653C:: @ 846653C
+	.incbin "baserom.gba", 0x46653C, 0x84
+
+gUnknown_84665C0:: @ 84665C0
+	.incbin "baserom.gba", 0x4665C0, 0x60
+
+gUnknown_8466620:: @ 8466620
+	.incbin "baserom.gba", 0x466620, 0x378
+
+gUnknown_8466998:: @ 8466998
+	.incbin "baserom.gba", 0x466998, 0x178
+
+gUnknown_8466B10:: @ 8466B10
+	.incbin "baserom.gba", 0x466B10, 0x10
+
+gUnknown_8466B20:: @ 8466B20
+	.incbin "baserom.gba", 0x466B20, 0xEC
+
+gUnknown_8466C0C:: @ 8466C0C
+	.incbin "baserom.gba", 0x466C0C, 0x28
+
+gUnknown_8466C34:: @ 8466C34
+	.incbin "baserom.gba", 0x466C34, 0x4
+
+gUnknown_8466C38:: @ 8466C38
+	.incbin "baserom.gba", 0x466C38, 0x8
+
+gUnknown_8466C40:: @ 8466C40
+	.incbin "baserom.gba", 0x466C40, 0x18
diff --git a/data/sound_data.s b/data/sound_data.s
index 4bbe6ce75..472c25ee1 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,37 +1,3394 @@
+	.include "asm/macros/m4a.inc"
+	.include "asm/macros/music_voice.inc"
 	.section .rodata
 
 voicegroup_pokemon_cry:: @ 8489C8C
 	.incbin "baserom.gba", 0x489C8C, 0x2C88
 
+	.align 2
 gCryTable:: @ 848C914
-	.incbin "baserom.gba", 0x48C914, 0x600
+	cry Cry_Bulbasaur
+    cry Cry_Ivysaur
+    cry Cry_Venusaur
+    cry Cry_Charmander
+    cry Cry_Charmeleon
+    cry Cry_Charizard
+    cry Cry_Squirtle
+    cry Cry_Wartortle
+    cry Cry_Blastoise
+    cry Cry_Caterpie
+    cry Cry_Metapod
+    cry Cry_Butterfree
+    cry Cry_Weedle
+    cry Cry_Kakuna
+    cry Cry_Beedrill
+    cry Cry_Pidgey
+    cry Cry_Pidgeotto
+    cry Cry_Pidgeot
+    cry Cry_Rattata
+    cry Cry_Raticate
+    cry Cry_Spearow
+    cry Cry_Fearow
+    cry Cry_Ekans
+    cry Cry_Arbok
+    cry Cry_Pikachu
+    cry Cry_Raichu
+    cry Cry_Sandshrew
+    cry Cry_Sandslash
+    cry Cry_NidoranF
+    cry Cry_Nidorina
+    cry Cry_Nidoqueen
+    cry Cry_NidoranM
+    cry Cry_Nidorino
+    cry Cry_Nidoking
+    cry Cry_Clefairy
+    cry Cry_Clefable
+    cry Cry_Vulpix
+    cry Cry_Ninetales
+    cry Cry_Jigglypuff
+    cry Cry_Wigglytuff
+    cry Cry_Zubat
+    cry Cry_Golbat
+    cry Cry_Oddish
+    cry Cry_Gloom
+    cry Cry_Vileplume
+    cry Cry_Paras
+    cry Cry_Parasect
+    cry Cry_Venonat
+    cry Cry_Venomoth
+    cry Cry_Diglett
+    cry Cry_Dugtrio
+    cry Cry_Meowth
+    cry Cry_Persian
+    cry Cry_Psyduck
+    cry Cry_Golduck
+    cry Cry_Mankey
+    cry Cry_Primeape
+    cry Cry_Growlithe
+    cry Cry_Arcanine
+    cry Cry_Poliwag
+    cry Cry_Poliwhirl
+    cry Cry_Poliwrath
+    cry Cry_Abra
+    cry Cry_Kadabra
+    cry Cry_Alakazam
+    cry Cry_Machop
+    cry Cry_Machoke
+    cry Cry_Machamp
+    cry Cry_Bellsprout
+    cry Cry_Weepinbell
+    cry Cry_Victreebel
+    cry Cry_Tentacool
+    cry Cry_Tentacruel
+    cry Cry_Geodude
+    cry Cry_Graveler
+    cry Cry_Golem
+    cry Cry_Ponyta
+    cry Cry_Rapidash
+    cry Cry_Slowpoke
+    cry Cry_Slowbro
+    cry Cry_Magnemite
+    cry Cry_Magneton
+    cry Cry_Farfetchd
+    cry Cry_Doduo
+    cry Cry_Dodrio
+    cry Cry_Seel
+    cry Cry_Dewgong
+    cry Cry_Grimer
+    cry Cry_Muk
+    cry Cry_Shellder
+    cry Cry_Cloyster
+    cry Cry_Gastly
+    cry Cry_Haunter
+    cry Cry_Gengar
+    cry Cry_Onix
+    cry Cry_Drowzee
+    cry Cry_Hypno
+    cry Cry_Krabby
+    cry Cry_Kingler
+    cry Cry_Voltorb
+    cry Cry_Electrode
+    cry Cry_Exeggcute
+    cry Cry_Exeggutor
+    cry Cry_Cubone
+    cry Cry_Marowak
+    cry Cry_Hitmonlee
+    cry Cry_Hitmonchan
+    cry Cry_Lickitung
+    cry Cry_Koffing
+    cry Cry_Weezing
+    cry Cry_Rhyhorn
+    cry Cry_Rhydon
+    cry Cry_Chansey
+    cry Cry_Tangela
+    cry Cry_Kangaskhan
+    cry Cry_Horsea
+    cry Cry_Seadra
+    cry Cry_Goldeen
+    cry Cry_Seaking
+    cry Cry_Staryu
+    cry Cry_Starmie
+    cry Cry_MrMime
+    cry Cry_Scyther
+    cry Cry_Jynx
+    cry Cry_Electabuzz
+    cry Cry_Magmar
+    cry Cry_Pinsir
+    cry Cry_Tauros
+    cry Cry_Magikarp
+    cry Cry_Gyarados
+    cry Cry_Lapras
+    cry Cry_Ditto
+    cry Cry_Eevee
+    cry Cry_Vaporeon
+    cry Cry_Jolteon
+    cry Cry_Flareon
+    cry Cry_Porygon
+    cry Cry_Omanyte
+    cry Cry_Omastar
+    cry Cry_Kabuto
+    cry Cry_Kabutops
+    cry Cry_Aerodactyl
+    cry Cry_Snorlax
+    cry Cry_Articuno
+    cry Cry_Zapdos
+    cry Cry_Moltres
+    cry Cry_Dratini
+    cry Cry_Dragonair
+    cry Cry_Dragonite
+    cry Cry_Mewtwo
+    cry Cry_Mew
+    cry Cry_Chikorita
+    cry Cry_Bayleef
+    cry Cry_Meganium
+    cry Cry_Cyndaquil
+    cry Cry_Quilava
+    cry Cry_Typhlosion
+    cry Cry_Totodile
+    cry Cry_Croconaw
+    cry Cry_Feraligatr
+    cry Cry_Sentret
+    cry Cry_Furret
+    cry Cry_Hoothoot
+    cry Cry_Noctowl
+    cry Cry_Ledyba
+    cry Cry_Ledian
+    cry Cry_Spinarak
+    cry Cry_Ariados
+    cry Cry_Crobat
+    cry Cry_Chinchou
+    cry Cry_Lanturn
+    cry Cry_Pichu
+    cry Cry_Cleffa
+    cry Cry_Igglybuff
+    cry Cry_Togepi
+    cry Cry_Togetic
+    cry Cry_Natu
+    cry Cry_Xatu
+    cry Cry_Mareep
+    cry Cry_Flaaffy
+    cry Cry_Ampharos
+    cry Cry_Bellossom
+    cry Cry_Marill
+    cry Cry_Azumarill
+    cry Cry_Sudowoodo
+    cry Cry_Politoed
+    cry Cry_Hoppip
+    cry Cry_Skiploom
+    cry Cry_Jumpluff
+    cry Cry_Aipom
+    cry Cry_Sunkern
+    cry Cry_Sunflora
+    cry Cry_Yanma
+    cry Cry_Wooper
+    cry Cry_Quagsire
+    cry Cry_Espeon
+    cry Cry_Umbreon
+    cry Cry_Murkrow
+    cry Cry_Slowking
+    cry Cry_Misdreavus
+    cry Cry_Unown
+    cry Cry_Wobbuffet
+    cry Cry_Girafarig
+    cry Cry_Pineco
+    cry Cry_Forretress
+    cry Cry_Dunsparce
+    cry Cry_Gligar
+    cry Cry_Steelix
+    cry Cry_Snubbull
+    cry Cry_Granbull
+    cry Cry_Qwilfish
+    cry Cry_Scizor
+    cry Cry_Shuckle
+    cry Cry_Heracross
+    cry Cry_Sneasel
+    cry Cry_Teddiursa
+    cry Cry_Ursaring
+    cry Cry_Slugma
+    cry Cry_Magcargo
+    cry Cry_Swinub
+    cry Cry_Piloswine
+    cry Cry_Corsola
+    cry Cry_Remoraid
+    cry Cry_Octillery
+    cry Cry_Delibird
+    cry Cry_Mantine
+    cry Cry_Skarmory
+    cry Cry_Houndour
+    cry Cry_Houndoom
+    cry Cry_Kingdra
+    cry Cry_Phanpy
+    cry Cry_Donphan
+    cry Cry_Porygon2
+    cry Cry_Stantler
+    cry Cry_Smeargle
+    cry Cry_Tyrogue
+    cry Cry_Hitmontop
+    cry Cry_Smoochum
+    cry Cry_Elekid
+    cry Cry_Magby
+    cry Cry_Miltank
+    cry Cry_Blissey
+    cry Cry_Raikou
+    cry Cry_Entei
+    cry Cry_Suicune
+    cry Cry_Larvitar
+    cry Cry_Pupitar
+    cry Cry_Tyranitar
+    cry Cry_Lugia
+    cry Cry_HoOh
+    cry Cry_Celebi
+    cry Cry_Kecleon
+    cry Cry_Roselia
+    cry Cry_Torkoal
+    cry Cry_Electrike
+    cry Cry_Manectric
+    cry Cry_Duskull
+    cry Cry_Latias
+    cry Cry_Wynaut
+    cry Cry_Seviper
+    cry Cry_Sharpedo
+    cry Cry_Zangoose
+    cry Cry_Azurill
+    cry Cry_Swablu
+    cry Cry_Altaria
+    cry Cry_Unused265
+    cry Cry_Taillow
+    cry Cry_Swellow
+    cry Cry_Unused268
+    cry Cry_Spinda
+    cry Cry_Torchic
+    cry Cry_Combusken
+    cry Cry_Blaziken
+    cry Cry_Treecko
+    cry Cry_Grovyle
+    cry Cry_Sceptile
+    cry Cry_Mudkip
+    cry Cry_Marshtomp
+    cry Cry_Swampert
+    cry Cry_Pelipper
+    cry Cry_Wingull
+    cry Cry_Banette
+    cry Cry_Shuppet
+    cry Cry_Lotad
+    cry Cry_Lombre
+    cry Cry_Ludicolo
+    cry Cry_Seedot
+    cry Cry_Nuzleaf
+    cry Cry_Shiftry
+    cry Cry_Carvanha
+    cry Cry_Wurmple
+    cry Cry_Silcoon
+    cry Cry_Beautifly
+    cry Cry_Cascoon
+    cry Cry_Dustox
+    cry Cry_Ralts
+    cry Cry_Kirlia
+    cry Cry_Gardevoir
+    cry Cry_Slakoth
+    cry Cry_Vigoroth
+    cry Cry_Slaking
+    cry Cry_Nincada
+    cry Cry_Ninjask
+    cry Cry_Shedinja
+    cry Cry_Makuhita
+    cry Cry_Hariyama
+    cry Cry_Nosepass
+    cry Cry_Glalie
+    cry Cry_Plusle
+    cry Cry_Minun
+    cry Cry_Surskit
+    cry Cry_Masquerain
+    cry Cry_Skitty
+    cry Cry_Delcatty
+    cry Cry_Gulpin
+    cry Cry_Swalot
+    cry Cry_Numel
+    cry Cry_Camerupt
+    cry Cry_Barboach
+    cry Cry_Whiscash
+    cry Cry_Corphish
+    cry Cry_Crawdaunt
+    cry Cry_Spoink
+    cry Cry_Grumpig
+    cry Cry_Trapinch
+    cry Cry_Vibrava
+    cry Cry_Flygon
+    cry Cry_Cacnea
+    cry Cry_Cacturne
+    cry Cry_Baltoy
+    cry Cry_Claydol
+    cry Cry_Lunatone
+    cry Cry_Solrock
+    cry Cry_Feebas
+    cry Cry_Milotic
+    cry Cry_Absol
+    cry Cry_Meditite
+    cry Cry_Medicham
+    cry Cry_Spheal
+    cry Cry_Sealeo
+    cry Cry_Walrein
+    cry Cry_Clamperl
+    cry Cry_Huntail
+    cry Cry_Gorebyss
+    cry Cry_Lileep
+    cry Cry_Cradily
+    cry Cry_Anorith
+    cry Cry_Armaldo
+    cry Cry_Beldum
+    cry Cry_Metang
+    cry Cry_Metagross
+    cry Cry_Bagon
+    cry Cry_Shelgon
+    cry Cry_Regirock
+    cry Cry_Regice
+    cry Cry_Registeel
+    cry Cry_Castform
+    cry Cry_Volbeat
+    cry Cry_Illumise
+    cry Cry_Poochyena
+    cry Cry_Mightyena
+    cry Cry_Dusclops
+    cry Cry_Sableye
+    cry Cry_Mawile
+    cry Cry_Aron
+    cry Cry_Lairon
+    cry Cry_Aggron
+    cry Cry_Relicanth
+    cry Cry_Luvdisc
+    cry Cry_Groudon
+    cry Cry_Kyogre
+    cry Cry_Rayquaza
+    cry Cry_Salamence
+    cry Cry_Breloom
+    cry Cry_Shroomish
+    cry Cry_Linoone
+    cry Cry_Tropius
+    cry Cry_Wailmer
+    cry Cry_Zigzagoon
+    cry Cry_Exploud
+    cry Cry_Loudred
+    cry Cry_Wailord
+    cry Cry_Whismur
+    cry Cry_Snorunt
+    cry Cry_Latios
+    cry Cry_Jirachi
+    cry Cry_Deoxys
+    cry Cry_Chimecho
 
-gUnknown_848CF14:: @ 848CF14
-	.incbin "baserom.gba", 0x48CF14, 0x600
+	.align 2
+gCryTable2:: @ 848DB44
+	cry2 Cry_Bulbasaur
+    cry2 Cry_Ivysaur
+    cry2 Cry_Venusaur
+    cry2 Cry_Charmander
+    cry2 Cry_Charmeleon
+    cry2 Cry_Charizard
+    cry2 Cry_Squirtle
+    cry2 Cry_Wartortle
+    cry2 Cry_Blastoise
+    cry2 Cry_Caterpie
+    cry2 Cry_Metapod
+    cry2 Cry_Butterfree
+    cry2 Cry_Weedle
+    cry2 Cry_Kakuna
+    cry2 Cry_Beedrill
+    cry2 Cry_Pidgey
+    cry2 Cry_Pidgeotto
+    cry2 Cry_Pidgeot
+    cry2 Cry_Rattata
+    cry2 Cry_Raticate
+    cry2 Cry_Spearow
+    cry2 Cry_Fearow
+    cry2 Cry_Ekans
+    cry2 Cry_Arbok
+    cry2 Cry_Pikachu
+    cry2 Cry_Raichu
+    cry2 Cry_Sandshrew
+    cry2 Cry_Sandslash
+    cry2 Cry_NidoranF
+    cry2 Cry_Nidorina
+    cry2 Cry_Nidoqueen
+    cry2 Cry_NidoranM
+    cry2 Cry_Nidorino
+    cry2 Cry_Nidoking
+    cry2 Cry_Clefairy
+    cry2 Cry_Clefable
+    cry2 Cry_Vulpix
+    cry2 Cry_Ninetales
+    cry2 Cry_Jigglypuff
+    cry2 Cry_Wigglytuff
+    cry2 Cry_Zubat
+    cry2 Cry_Golbat
+    cry2 Cry_Oddish
+    cry2 Cry_Gloom
+    cry2 Cry_Vileplume
+    cry2 Cry_Paras
+    cry2 Cry_Parasect
+    cry2 Cry_Venonat
+    cry2 Cry_Venomoth
+    cry2 Cry_Diglett
+    cry2 Cry_Dugtrio
+    cry2 Cry_Meowth
+    cry2 Cry_Persian
+    cry2 Cry_Psyduck
+    cry2 Cry_Golduck
+    cry2 Cry_Mankey
+    cry2 Cry_Primeape
+    cry2 Cry_Growlithe
+    cry2 Cry_Arcanine
+    cry2 Cry_Poliwag
+    cry2 Cry_Poliwhirl
+    cry2 Cry_Poliwrath
+    cry2 Cry_Abra
+    cry2 Cry_Kadabra
+    cry2 Cry_Alakazam
+    cry2 Cry_Machop
+    cry2 Cry_Machoke
+    cry2 Cry_Machamp
+    cry2 Cry_Bellsprout
+    cry2 Cry_Weepinbell
+    cry2 Cry_Victreebel
+    cry2 Cry_Tentacool
+    cry2 Cry_Tentacruel
+    cry2 Cry_Geodude
+    cry2 Cry_Graveler
+    cry2 Cry_Golem
+    cry2 Cry_Ponyta
+    cry2 Cry_Rapidash
+    cry2 Cry_Slowpoke
+    cry2 Cry_Slowbro
+    cry2 Cry_Magnemite
+    cry2 Cry_Magneton
+    cry2 Cry_Farfetchd
+    cry2 Cry_Doduo
+    cry2 Cry_Dodrio
+    cry2 Cry_Seel
+    cry2 Cry_Dewgong
+    cry2 Cry_Grimer
+    cry2 Cry_Muk
+    cry2 Cry_Shellder
+    cry2 Cry_Cloyster
+    cry2 Cry_Gastly
+    cry2 Cry_Haunter
+    cry2 Cry_Gengar
+    cry2 Cry_Onix
+    cry2 Cry_Drowzee
+    cry2 Cry_Hypno
+    cry2 Cry_Krabby
+    cry2 Cry_Kingler
+    cry2 Cry_Voltorb
+    cry2 Cry_Electrode
+    cry2 Cry_Exeggcute
+    cry2 Cry_Exeggutor
+    cry2 Cry_Cubone
+    cry2 Cry_Marowak
+    cry2 Cry_Hitmonlee
+    cry2 Cry_Hitmonchan
+    cry2 Cry_Lickitung
+    cry2 Cry_Koffing
+    cry2 Cry_Weezing
+    cry2 Cry_Rhyhorn
+    cry2 Cry_Rhydon
+    cry2 Cry_Chansey
+    cry2 Cry_Tangela
+    cry2 Cry_Kangaskhan
+    cry2 Cry_Horsea
+    cry2 Cry_Seadra
+    cry2 Cry_Goldeen
+    cry2 Cry_Seaking
+    cry2 Cry_Staryu
+    cry2 Cry_Starmie
+    cry2 Cry_MrMime
+    cry2 Cry_Scyther
+    cry2 Cry_Jynx
+    cry2 Cry_Electabuzz
+    cry2 Cry_Magmar
+    cry2 Cry_Pinsir
+    cry2 Cry_Tauros
+    cry2 Cry_Magikarp
+    cry2 Cry_Gyarados
+    cry2 Cry_Lapras
+    cry2 Cry_Ditto
+    cry2 Cry_Eevee
+    cry2 Cry_Vaporeon
+    cry2 Cry_Jolteon
+    cry2 Cry_Flareon
+    cry2 Cry_Porygon
+    cry2 Cry_Omanyte
+    cry2 Cry_Omastar
+    cry2 Cry_Kabuto
+    cry2 Cry_Kabutops
+    cry2 Cry_Aerodactyl
+    cry2 Cry_Snorlax
+    cry2 Cry_Articuno
+    cry2 Cry_Zapdos
+    cry2 Cry_Moltres
+    cry2 Cry_Dratini
+    cry2 Cry_Dragonair
+    cry2 Cry_Dragonite
+    cry2 Cry_Mewtwo
+    cry2 Cry_Mew
+    cry2 Cry_Chikorita
+    cry2 Cry_Bayleef
+    cry2 Cry_Meganium
+    cry2 Cry_Cyndaquil
+    cry2 Cry_Quilava
+    cry2 Cry_Typhlosion
+    cry2 Cry_Totodile
+    cry2 Cry_Croconaw
+    cry2 Cry_Feraligatr
+    cry2 Cry_Sentret
+    cry2 Cry_Furret
+    cry2 Cry_Hoothoot
+    cry2 Cry_Noctowl
+    cry2 Cry_Ledyba
+    cry2 Cry_Ledian
+    cry2 Cry_Spinarak
+    cry2 Cry_Ariados
+    cry2 Cry_Crobat
+    cry2 Cry_Chinchou
+    cry2 Cry_Lanturn
+    cry2 Cry_Pichu
+    cry2 Cry_Cleffa
+    cry2 Cry_Igglybuff
+    cry2 Cry_Togepi
+    cry2 Cry_Togetic
+    cry2 Cry_Natu
+    cry2 Cry_Xatu
+    cry2 Cry_Mareep
+    cry2 Cry_Flaaffy
+    cry2 Cry_Ampharos
+    cry2 Cry_Bellossom
+    cry2 Cry_Marill
+    cry2 Cry_Azumarill
+    cry2 Cry_Sudowoodo
+    cry2 Cry_Politoed
+    cry2 Cry_Hoppip
+    cry2 Cry_Skiploom
+    cry2 Cry_Jumpluff
+    cry2 Cry_Aipom
+    cry2 Cry_Sunkern
+    cry2 Cry_Sunflora
+    cry2 Cry_Yanma
+    cry2 Cry_Wooper
+    cry2 Cry_Quagsire
+    cry2 Cry_Espeon
+    cry2 Cry_Umbreon
+    cry2 Cry_Murkrow
+    cry2 Cry_Slowking
+    cry2 Cry_Misdreavus
+    cry2 Cry_Unown
+    cry2 Cry_Wobbuffet
+    cry2 Cry_Girafarig
+    cry2 Cry_Pineco
+    cry2 Cry_Forretress
+    cry2 Cry_Dunsparce
+    cry2 Cry_Gligar
+    cry2 Cry_Steelix
+    cry2 Cry_Snubbull
+    cry2 Cry_Granbull
+    cry2 Cry_Qwilfish
+    cry2 Cry_Scizor
+    cry2 Cry_Shuckle
+    cry2 Cry_Heracross
+    cry2 Cry_Sneasel
+    cry2 Cry_Teddiursa
+    cry2 Cry_Ursaring
+    cry2 Cry_Slugma
+    cry2 Cry_Magcargo
+    cry2 Cry_Swinub
+    cry2 Cry_Piloswine
+    cry2 Cry_Corsola
+    cry2 Cry_Remoraid
+    cry2 Cry_Octillery
+    cry2 Cry_Delibird
+    cry2 Cry_Mantine
+    cry2 Cry_Skarmory
+    cry2 Cry_Houndour
+    cry2 Cry_Houndoom
+    cry2 Cry_Kingdra
+    cry2 Cry_Phanpy
+    cry2 Cry_Donphan
+    cry2 Cry_Porygon2
+    cry2 Cry_Stantler
+    cry2 Cry_Smeargle
+    cry2 Cry_Tyrogue
+    cry2 Cry_Hitmontop
+    cry2 Cry_Smoochum
+    cry2 Cry_Elekid
+    cry2 Cry_Magby
+    cry2 Cry_Miltank
+    cry2 Cry_Blissey
+    cry2 Cry_Raikou
+    cry2 Cry_Entei
+    cry2 Cry_Suicune
+    cry2 Cry_Larvitar
+    cry2 Cry_Pupitar
+    cry2 Cry_Tyranitar
+    cry2 Cry_Lugia
+    cry2 Cry_HoOh
+    cry2 Cry_Celebi
+    cry2 Cry_Kecleon
+    cry2 Cry_Roselia
+    cry2 Cry_Torkoal
+    cry2 Cry_Electrike
+    cry2 Cry_Manectric
+    cry2 Cry_Duskull
+    cry2 Cry_Latias
+    cry2 Cry_Wynaut
+    cry2 Cry_Seviper
+    cry2 Cry_Sharpedo
+    cry2 Cry_Zangoose
+    cry2 Cry_Azurill
+    cry2 Cry_Swablu
+    cry2 Cry_Altaria
+    cry2 Cry_Unused265
+    cry2 Cry_Taillow
+    cry2 Cry_Swellow
+    cry2 Cry_Unused268
+    cry2 Cry_Spinda
+    cry2 Cry_Torchic
+    cry2 Cry_Combusken
+    cry2 Cry_Blaziken
+    cry2 Cry_Treecko
+    cry2 Cry_Grovyle
+    cry2 Cry_Sceptile
+    cry2 Cry_Mudkip
+    cry2 Cry_Marshtomp
+    cry2 Cry_Swampert
+    cry2 Cry_Pelipper
+    cry2 Cry_Wingull
+    cry2 Cry_Banette
+    cry2 Cry_Shuppet
+    cry2 Cry_Lotad
+    cry2 Cry_Lombre
+    cry2 Cry_Ludicolo
+    cry2 Cry_Seedot
+    cry2 Cry_Nuzleaf
+    cry2 Cry_Shiftry
+    cry2 Cry_Carvanha
+    cry2 Cry_Wurmple
+    cry2 Cry_Silcoon
+    cry2 Cry_Beautifly
+    cry2 Cry_Cascoon
+    cry2 Cry_Dustox
+    cry2 Cry_Ralts
+    cry2 Cry_Kirlia
+    cry2 Cry_Gardevoir
+    cry2 Cry_Slakoth
+    cry2 Cry_Vigoroth
+    cry2 Cry_Slaking
+    cry2 Cry_Nincada
+    cry2 Cry_Ninjask
+    cry2 Cry_Shedinja
+    cry2 Cry_Makuhita
+    cry2 Cry_Hariyama
+    cry2 Cry_Nosepass
+    cry2 Cry_Glalie
+    cry2 Cry_Plusle
+    cry2 Cry_Minun
+    cry2 Cry_Surskit
+    cry2 Cry_Masquerain
+    cry2 Cry_Skitty
+    cry2 Cry_Delcatty
+    cry2 Cry_Gulpin
+    cry2 Cry_Swalot
+    cry2 Cry_Numel
+    cry2 Cry_Camerupt
+    cry2 Cry_Barboach
+    cry2 Cry_Whiscash
+    cry2 Cry_Corphish
+    cry2 Cry_Crawdaunt
+    cry2 Cry_Spoink
+    cry2 Cry_Grumpig
+    cry2 Cry_Trapinch
+    cry2 Cry_Vibrava
+    cry2 Cry_Flygon
+    cry2 Cry_Cacnea
+    cry2 Cry_Cacturne
+    cry2 Cry_Baltoy
+    cry2 Cry_Claydol
+    cry2 Cry_Lunatone
+    cry2 Cry_Solrock
+    cry2 Cry_Feebas
+    cry2 Cry_Milotic
+    cry2 Cry_Absol
+    cry2 Cry_Meditite
+    cry2 Cry_Medicham
+    cry2 Cry_Spheal
+    cry2 Cry_Sealeo
+    cry2 Cry_Walrein
+    cry2 Cry_Clamperl
+    cry2 Cry_Huntail
+    cry2 Cry_Gorebyss
+    cry2 Cry_Lileep
+    cry2 Cry_Cradily
+    cry2 Cry_Anorith
+    cry2 Cry_Armaldo
+    cry2 Cry_Beldum
+    cry2 Cry_Metang
+    cry2 Cry_Metagross
+    cry2 Cry_Bagon
+    cry2 Cry_Shelgon
+    cry2 Cry_Regirock
+    cry2 Cry_Regice
+    cry2 Cry_Registeel
+    cry2 Cry_Castform
+    cry2 Cry_Volbeat
+    cry2 Cry_Illumise
+    cry2 Cry_Poochyena
+    cry2 Cry_Mightyena
+    cry2 Cry_Dusclops
+    cry2 Cry_Sableye
+    cry2 Cry_Mawile
+    cry2 Cry_Aron
+    cry2 Cry_Lairon
+    cry2 Cry_Aggron
+    cry2 Cry_Relicanth
+    cry2 Cry_Luvdisc
+    cry2 Cry_Groudon
+    cry2 Cry_Kyogre
+    cry2 Cry_Rayquaza
+    cry2 Cry_Salamence
+    cry2 Cry_Breloom
+    cry2 Cry_Shroomish
+    cry2 Cry_Linoone
+    cry2 Cry_Tropius
+    cry2 Cry_Wailmer
+    cry2 Cry_Zigzagoon
+    cry2 Cry_Exploud
+    cry2 Cry_Loudred
+    cry2 Cry_Wailord
+    cry2 Cry_Whismur
+    cry2 Cry_Snorunt
+    cry2 Cry_Latios
+    cry2 Cry_Jirachi
+    cry2 Cry_Deoxys
+    cry2 Cry_Chimecho
 
-gUnknown_848D514:: @ 848D514
-	.incbin "baserom.gba", 0x48D514, 0x600
+gUnknown_848ED74:: @ 848ED74
+	.incbin "baserom.gba", 0x48ED74, 0x14528
 
-gUnknown_848DB14:: @ 848DB14
-	.incbin "baserom.gba", 0x48DB14, 0x30
+	.include "sound/music_player_table.inc"
+	.include "sound/song_table.inc"
 
-gCryTable2:: @ 848DB44
-	.incbin "baserom.gba", 0x48DB44, 0x600
+	.align 2
+gDirectSoundWaveData_0:: @ 84A3DA8
+	.incbin "baserom.gba", 0x4A3DA8, 0x6BE1C
+
+	.align 2
+Cry_Bulbasaur:: @ 850FBC4
+	.incbin "sound/direct_sound_samples/cry_bulbasaur.bin"
+
+	.align 2
+Cry_Ivysaur:: @ 8510C50
+	.incbin "sound/direct_sound_samples/cry_ivysaur.bin"
+
+	.align 2
+Cry_Venusaur:: @ 8511CE0
+	.incbin "sound/direct_sound_samples/cry_venusaur.bin"
+
+	.align 2
+Cry_Charmander:: @ 8513038
+	.incbin "sound/direct_sound_samples/cry_charmander.bin"
+
+	.align 2
+Cry_Charmeleon:: @ 8513EA8
+	.incbin "sound/direct_sound_samples/cry_charmeleon.bin"
+
+	.align 2
+Cry_Charizard:: @ 8514D28
+	.incbin "sound/direct_sound_samples/cry_charizard.bin"
+
+	.align 2
+Cry_Squirtle:: @ 8516070
+	.incbin "sound/direct_sound_samples/cry_squirtle.bin"
+
+	.align 2
+Cry_Wartortle:: @ 8516EE4
+	.incbin "sound/direct_sound_samples/cry_wartortle.bin"
+
+	.align 2
+Cry_Blastoise:: @ 8518024
+	.incbin "sound/direct_sound_samples/cry_blastoise.bin"
+
+	.align 2
+Cry_Caterpie:: @ 851936C
+	.incbin "sound/direct_sound_samples/cry_caterpie.bin"
+
+	.align 2
+Cry_Metapod:: @ 8519BC4
+	.incbin "sound/direct_sound_samples/cry_metapod.bin"
+
+	.align 2
+Cry_Butterfree:: @ 851B314
+	.incbin "sound/direct_sound_samples/cry_butterfree.bin"
+
+	.align 2
+Cry_Weedle:: @ 851BD1C
+	.incbin "sound/direct_sound_samples/cry_weedle.bin"
+
+	.align 2
+Cry_Kakuna:: @ 851CD60
+	.incbin "sound/direct_sound_samples/cry_kakuna.bin"
+
+	.align 2
+Cry_Beedrill:: @ 851DF9C
+	.incbin "sound/direct_sound_samples/cry_beedrill.bin"
+
+	.align 2
+Cry_Pidgey:: @ 851F2F8
+	.incbin "sound/direct_sound_samples/cry_pidgey.bin"
+
+	.align 2
+Cry_Pidgeotto:: @ 851F6E0
+	.incbin "sound/direct_sound_samples/cry_pidgeotto.bin"
+
+	.align 2
+Cry_Pidgeot:: @ 85205E8
+	.incbin "sound/direct_sound_samples/cry_pidgeot.bin"
+
+	.align 2
+Cry_Rattata:: @ 852171C
+	.incbin "sound/direct_sound_samples/cry_rattata.bin"
+
+	.align 2
+Cry_Raticate:: @ 8521EFC
+	.incbin "sound/direct_sound_samples/cry_raticate.bin"
+
+	.align 2
+Cry_Spearow:: @ 8522880
+	.incbin "sound/direct_sound_samples/cry_spearow.bin"
+
+	.align 2
+Cry_Fearow:: @ 8523A24
+	.incbin "sound/direct_sound_samples/cry_fearow.bin"
+
+	.align 2
+Cry_Ekans:: @ 8524B60
+	.incbin "sound/direct_sound_samples/cry_ekans.bin"
+
+	.align 2
+Cry_Arbok:: @ 8525EAC
+	.incbin "sound/direct_sound_samples/cry_arbok.bin"
+
+	.align 2
+Cry_Pikachu:: @ 8527204
+	.incbin "sound/direct_sound_samples/cry_pikachu.bin"
+
+	.align 2
+Cry_Raichu:: @ 85282AC
+	.incbin "sound/direct_sound_samples/cry_raichu.bin"
+
+	.align 2
+Cry_Sandshrew:: @ 8529A6C
+	.incbin "sound/direct_sound_samples/cry_sandshrew.bin"
+
+	.align 2
+Cry_Sandslash:: @ 852A3C0
+	.incbin "sound/direct_sound_samples/cry_sandslash.bin"
+
+	.align 2
+Cry_NidoranF:: @ 852B150
+	.incbin "sound/direct_sound_samples/cry_nidoran_f.bin"
+
+	.align 2
+Cry_Nidorina:: @ 852BB00
+	.incbin "sound/direct_sound_samples/cry_nidorina.bin"
+
+	.align 2
+Cry_Nidoqueen:: @ 852C7C8
+	.incbin "sound/direct_sound_samples/cry_nidoqueen.bin"
+
+	.align 2
+Cry_NidoranM:: @ 852D8A8
+	.incbin "sound/direct_sound_samples/cry_nidoran_m.bin"
+
+	.align 2
+Cry_Nidorino:: @ 852E310
+	.incbin "sound/direct_sound_samples/cry_nidorino.bin"
+
+	.align 2
+Cry_Nidoking:: @ 852EF24
+	.incbin "sound/direct_sound_samples/cry_nidoking.bin"
+
+	.align 2
+Cry_Clefairy:: @ 8530790
+	.incbin "sound/direct_sound_samples/cry_clefairy.bin"
+
+	.align 2
+Cry_Clefable:: @ 8531000
+	.incbin "sound/direct_sound_samples/cry_clefable.bin"
+
+	.align 2
+Cry_Vulpix:: @ 8531A90
+	.incbin "sound/direct_sound_samples/cry_vulpix.bin"
+
+	.align 2
+Cry_Ninetales:: @ 8533260
+	.incbin "sound/direct_sound_samples/cry_ninetales.bin"
+
+	.align 2
+Cry_Jigglypuff:: @ 8534ACC
+	.incbin "sound/direct_sound_samples/cry_jigglypuff.bin"
+
+	.align 2
+Cry_Wigglytuff:: @ 8535030
+	.incbin "sound/direct_sound_samples/cry_wigglytuff.bin"
+
+	.align 2
+Cry_Zubat:: @ 85356F8
+	.incbin "sound/direct_sound_samples/cry_zubat.bin"
+
+	.align 2
+Cry_Golbat:: @ 8536A64
+	.incbin "sound/direct_sound_samples/cry_golbat.bin"
+
+	.align 2
+Cry_Oddish:: @ 8537DC8
+	.incbin "sound/direct_sound_samples/cry_oddish.bin"
+
+	.align 2
+Cry_Gloom:: @ 8538C64
+	.incbin "sound/direct_sound_samples/cry_gloom.bin"
+
+	.align 2
+Cry_Vileplume:: @ 85398E0
+	.incbin "sound/direct_sound_samples/cry_vileplume.bin"
+
+	.align 2
+Cry_Paras:: @ 853B27C
+	.incbin "sound/direct_sound_samples/cry_paras.bin"
+
+	.align 2
+Cry_Parasect:: @ 853CE70
+	.incbin "sound/direct_sound_samples/cry_parasect.bin"
+
+	.align 2
+Cry_Venonat:: @ 853ECD8
+	.incbin "sound/direct_sound_samples/cry_venonat.bin"
+
+	.align 2
+Cry_Venomoth:: @ 853FC58
+	.incbin "sound/direct_sound_samples/cry_venomoth.bin"
+
+	.align 2
+Cry_Diglett:: @ 8540C5C
+	.incbin "sound/direct_sound_samples/cry_diglett.bin"
+
+	.align 2
+Cry_Dugtrio:: @ 8541FCC
+	.incbin "sound/direct_sound_samples/cry_dugtrio.bin"
+
+	.align 2
+Cry_Meowth:: @ 8543338
+	.incbin "sound/direct_sound_samples/cry_meowth.bin"
+
+	.align 2
+Cry_Persian:: @ 8543CC8
+	.incbin "sound/direct_sound_samples/cry_persian.bin"
+
+	.align 2
+Cry_Psyduck:: @ 8544FA4
+	.incbin "sound/direct_sound_samples/cry_psyduck.bin"
+
+	.align 2
+Cry_Golduck:: @ 8545CCC
+	.incbin "sound/direct_sound_samples/cry_golduck.bin"
+
+	.align 2
+Cry_Mankey:: @ 8546814
+	.incbin "sound/direct_sound_samples/cry_mankey.bin"
+
+	.align 2
+Cry_Primeape:: @ 8547874
+	.incbin "sound/direct_sound_samples/cry_primeape.bin"
+
+	.align 2
+Cry_Growlithe:: @ 85488A4
+	.incbin "sound/direct_sound_samples/cry_growlithe.bin"
+
+	.align 2
+Cry_Arcanine:: @ 8549608
+	.incbin "sound/direct_sound_samples/cry_arcanine.bin"
+
+	.align 2
+Cry_Poliwag:: @ 854A744
+	.incbin "sound/direct_sound_samples/cry_poliwag.bin"
+
+	.align 2
+Cry_Poliwhirl:: @ 854B260
+	.incbin "sound/direct_sound_samples/cry_poliwhirl.bin"
+
+	.align 2
+Cry_Poliwrath:: @ 854B908
+	.incbin "sound/direct_sound_samples/cry_poliwrath.bin"
+
+	.align 2
+Cry_Abra:: @ 854C42C
+	.incbin "sound/direct_sound_samples/cry_abra.bin"
+
+	.align 2
+Cry_Kadabra:: @ 854DB90
+	.incbin "sound/direct_sound_samples/cry_kadabra.bin"
+
+	.align 2
+Cry_Alakazam:: @ 854F678
+	.incbin "sound/direct_sound_samples/cry_alakazam.bin"
+
+	.align 2
+Cry_Machop:: @ 8551614
+	.incbin "sound/direct_sound_samples/cry_machop.bin"
+
+	.align 2
+Cry_Machoke:: @ 8552378
+	.incbin "sound/direct_sound_samples/cry_machoke.bin"
+
+	.align 2
+Cry_Machamp:: @ 8553108
+	.incbin "sound/direct_sound_samples/cry_machamp.bin"
+
+	.align 2
+Cry_Bellsprout:: @ 8554190
+	.incbin "sound/direct_sound_samples/cry_bellsprout.bin"
+
+	.align 2
+Cry_Weepinbell:: @ 855491C
+	.incbin "sound/direct_sound_samples/cry_weepinbell.bin"
+
+	.align 2
+Cry_Victreebel:: @ 85557BC
+	.incbin "sound/direct_sound_samples/cry_victreebel.bin"
+
+	.align 2
+Cry_Tentacool:: @ 8556B08
+	.incbin "sound/direct_sound_samples/cry_tentacool.bin"
+
+	.align 2
+Cry_Tentacruel:: @ 8557AF8
+	.incbin "sound/direct_sound_samples/cry_tentacruel.bin"
+
+	.align 2
+Cry_Geodude:: @ 85591F4
+	.incbin "sound/direct_sound_samples/cry_geodude.bin"
+
+	.align 2
+Cry_Graveler:: @ 855A9A8
+	.incbin "sound/direct_sound_samples/cry_graveler.bin"
+
+	.align 2
+Cry_Golem:: @ 855C590
+	.incbin "sound/direct_sound_samples/cry_golem.bin"
+
+	.align 2
+Cry_Ponyta:: @ 855D3BC
+	.incbin "sound/direct_sound_samples/cry_ponyta.bin"
+
+	.align 2
+Cry_Rapidash:: @ 855E2CC
+	.incbin "sound/direct_sound_samples/cry_rapidash.bin"
+
+	.align 2
+Cry_Slowpoke:: @ 855F56C
+	.incbin "sound/direct_sound_samples/cry_slowpoke.bin"
+
+	.align 2
+Cry_Slowbro:: @ 855FCD4
+	.incbin "sound/direct_sound_samples/cry_slowbro.bin"
+
+	.align 2
+Cry_Magnemite:: @ 8560A44
+	.incbin "sound/direct_sound_samples/cry_magnemite.bin"
+
+	.align 2
+Cry_Magneton:: @ 8561D88
+	.incbin "sound/direct_sound_samples/cry_magneton.bin"
+
+	.align 2
+Cry_Farfetchd:: @ 8563570
+	.incbin "sound/direct_sound_samples/cry_farfetchd.bin"
+
+	.align 2
+Cry_Doduo:: @ 8563CEC
+	.incbin "sound/direct_sound_samples/cry_doduo.bin"
+
+	.align 2
+Cry_Dodrio:: @ 8565030
+	.incbin "sound/direct_sound_samples/cry_dodrio.bin"
+
+	.align 2
+Cry_Seel:: @ 85663A8
+	.incbin "sound/direct_sound_samples/cry_seel.bin"
+
+	.align 2
+Cry_Dewgong:: @ 8567598
+	.incbin "sound/direct_sound_samples/cry_dewgong.bin"
+
+	.align 2
+Cry_Grimer:: @ 8568ABC
+	.incbin "sound/direct_sound_samples/cry_grimer.bin"
+
+	.align 2
+Cry_Muk:: @ 8569544
+	.incbin "sound/direct_sound_samples/cry_muk.bin"
+
+	.align 2
+Cry_Shellder:: @ 856A404
+	.incbin "sound/direct_sound_samples/cry_shellder.bin"
+
+	.align 2
+Cry_Cloyster:: @ 856B378
+	.incbin "sound/direct_sound_samples/cry_cloyster.bin"
+
+	.align 2
+Cry_Gastly:: @ 856C83C
+	.incbin "sound/direct_sound_samples/cry_gastly.bin"
+
+	.align 2
+Cry_Haunter:: @ 856DF8C
+	.incbin "sound/direct_sound_samples/cry_haunter.bin"
+
+	.align 2
+Cry_Gengar:: @ 856F70C
+	.incbin "sound/direct_sound_samples/cry_gengar.bin"
+
+	.align 2
+Cry_Onix:: @ 85705CC
+	.incbin "sound/direct_sound_samples/cry_onix.bin"
+
+	.align 2
+Cry_Drowzee:: @ 8571E90
+	.incbin "sound/direct_sound_samples/cry_drowzee.bin"
+
+	.align 2
+Cry_Hypno:: @ 8573BA8
+	.incbin "sound/direct_sound_samples/cry_hypno.bin"
+
+	.align 2
+Cry_Krabby:: @ 85758AC
+	.incbin "sound/direct_sound_samples/cry_krabby.bin"
+
+	.align 2
+Cry_Kingler:: @ 85770F8
+	.incbin "sound/direct_sound_samples/cry_kingler.bin"
+
+	.align 2
+Cry_Voltorb:: @ 8578950
+	.incbin "sound/direct_sound_samples/cry_voltorb.bin"
+
+	.align 2
+Cry_Electrode:: @ 857A214
+	.incbin "sound/direct_sound_samples/cry_electrode.bin"
+
+	.align 2
+Cry_Exeggcute:: @ 857BB4C
+	.incbin "sound/direct_sound_samples/cry_exeggcute.bin"
+
+	.align 2
+Cry_Exeggutor:: @ 857CE2C
+	.incbin "sound/direct_sound_samples/cry_exeggutor.bin"
+
+	.align 2
+Cry_Cubone:: @ 857EE10
+	.incbin "sound/direct_sound_samples/cry_cubone.bin"
+
+	.align 2
+Cry_Marowak:: @ 857FD30
+	.incbin "sound/direct_sound_samples/cry_marowak.bin"
+
+	.align 2
+Cry_Hitmonlee:: @ 8580BA0
+	.incbin "sound/direct_sound_samples/cry_hitmonlee.bin"
+
+	.align 2
+Cry_Hitmonchan:: @ 8581E4C
+	.incbin "sound/direct_sound_samples/cry_hitmonchan.bin"
+
+	.align 2
+Cry_Lickitung:: @ 8583024
+	.incbin "sound/direct_sound_samples/cry_lickitung.bin"
+
+	.align 2
+Cry_Koffing:: @ 8583F4C
+	.incbin "sound/direct_sound_samples/cry_koffing.bin"
+
+	.align 2
+Cry_Weezing:: @ 85853A8
+	.incbin "sound/direct_sound_samples/cry_weezing.bin"
+
+	.align 2
+Cry_Rhyhorn:: @ 8586954
+	.incbin "sound/direct_sound_samples/cry_rhyhorn.bin"
+
+	.align 2
+Cry_Rhydon:: @ 8587CC0
+	.incbin "sound/direct_sound_samples/cry_rhydon.bin"
+
+	.align 2
+Cry_Chansey:: @ 858912C
+	.incbin "sound/direct_sound_samples/cry_chansey.bin"
+
+	.align 2
+Cry_Tangela:: @ 8589FF8
+	.incbin "sound/direct_sound_samples/cry_tangela.bin"
+
+	.align 2
+Cry_Kangaskhan:: @ 858AF14
+	.incbin "sound/direct_sound_samples/cry_kangaskhan.bin"
+
+	.align 2
+Cry_Horsea:: @ 858C1C8
+	.incbin "sound/direct_sound_samples/cry_horsea.bin"
+
+	.align 2
+Cry_Seadra:: @ 858CB44
+	.incbin "sound/direct_sound_samples/cry_seadra.bin"
+
+	.align 2
+Cry_Goldeen:: @ 858D3B0
+	.incbin "sound/direct_sound_samples/cry_goldeen.bin"
+
+	.align 2
+Cry_Seaking:: @ 858DD88
+	.incbin "sound/direct_sound_samples/cry_seaking.bin"
+
+	.align 2
+Cry_Staryu:: @ 858F0E0
+	.incbin "sound/direct_sound_samples/cry_staryu.bin"
+
+	.align 2
+Cry_Starmie:: @ 85904C8
+	.incbin "sound/direct_sound_samples/cry_starmie.bin"
+
+	.align 2
+Cry_MrMime:: @ 85919A4
+	.incbin "sound/direct_sound_samples/cry_mr_mime.bin"
+
+	.align 2
+Cry_Scyther:: @ 8592C94
+	.incbin "sound/direct_sound_samples/cry_scyther.bin"
+
+	.align 2
+Cry_Jynx:: @ 85939F0
+	.incbin "sound/direct_sound_samples/cry_jynx.bin"
+
+	.align 2
+Cry_Electabuzz:: @ 8596964
+	.incbin "sound/direct_sound_samples/cry_electabuzz.bin"
+
+	.align 2
+Cry_Magmar:: @ 8598848
+	.incbin "sound/direct_sound_samples/cry_magmar.bin"
+
+	.align 2
+Cry_Pinsir:: @ 85997C4
+	.incbin "sound/direct_sound_samples/cry_pinsir.bin"
+
+	.align 2
+Cry_Tauros:: @ 859A420
+	.incbin "sound/direct_sound_samples/cry_tauros.bin"
+
+	.align 2
+Cry_Magikarp:: @ 859B674
+	.incbin "sound/direct_sound_samples/cry_magikarp.bin"
+
+	.align 2
+Cry_Gyarados:: @ 859C97C
+	.incbin "sound/direct_sound_samples/cry_gyarados.bin"
+
+	.align 2
+Cry_Lapras:: @ 859DDB0
+	.incbin "sound/direct_sound_samples/cry_lapras.bin"
+
+	.align 2
+Cry_Ditto:: @ 859EC84
+	.incbin "sound/direct_sound_samples/cry_ditto.bin"
+
+	.align 2
+Cry_Eevee:: @ 859F7A0
+	.incbin "sound/direct_sound_samples/cry_eevee.bin"
+
+	.align 2
+Cry_Vaporeon:: @ 85A05D8
+	.incbin "sound/direct_sound_samples/cry_vaporeon.bin"
+
+	.align 2
+Cry_Jolteon:: @ 85A1BF0
+	.incbin "sound/direct_sound_samples/cry_jolteon.bin"
+
+	.align 2
+Cry_Flareon:: @ 85A2BC4
+	.incbin "sound/direct_sound_samples/cry_flareon.bin"
+
+	.align 2
+Cry_Porygon:: @ 85A3B48
+	.incbin "sound/direct_sound_samples/cry_porygon.bin"
+
+	.align 2
+Cry_Omanyte:: @ 85A4F54
+	.incbin "sound/direct_sound_samples/cry_omanyte.bin"
+
+	.align 2
+Cry_Omastar:: @ 85A5CAC
+	.incbin "sound/direct_sound_samples/cry_omastar.bin"
+
+	.align 2
+Cry_Kabuto:: @ 85A6A00
+	.incbin "sound/direct_sound_samples/cry_kabuto.bin"
+
+	.align 2
+Cry_Kabutops:: @ 85A7654
+	.incbin "sound/direct_sound_samples/cry_kabutops.bin"
+
+	.align 2
+Cry_Aerodactyl:: @ 85A8410
+	.incbin "sound/direct_sound_samples/cry_aerodactyl.bin"
+
+	.align 2
+Cry_Snorlax:: @ 85A9C6C
+	.incbin "sound/direct_sound_samples/cry_snorlax.bin"
+
+	.align 2
+Cry_Articuno:: @ 85AA1A8
+	.incbin "sound/direct_sound_samples/cry_articuno.bin"
+
+	.align 2
+Cry_Zapdos:: @ 85AB950
+	.incbin "sound/direct_sound_samples/cry_zapdos.bin"
+
+	.align 2
+Cry_Moltres:: @ 85AC8C8
+	.incbin "sound/direct_sound_samples/cry_moltres.bin"
+
+	.align 2
+Cry_Dratini:: @ 85AE074
+	.incbin "sound/direct_sound_samples/cry_dratini.bin"
+
+	.align 2
+Cry_Dragonair:: @ 85AEC10
+	.incbin "sound/direct_sound_samples/cry_dragonair.bin"
+
+	.align 2
+Cry_Dragonite:: @ 85AFCB8
+	.incbin "sound/direct_sound_samples/cry_dragonite.bin"
+
+	.align 2
+Cry_Mewtwo:: @ 85B0FC4
+	.incbin "sound/direct_sound_samples/cry_mewtwo.bin"
+
+	.align 2
+Cry_Mew:: @ 85B2E2C
+	.incbin "sound/direct_sound_samples/cry_mew.bin"
+
+	.align 2
+Cry_Chikorita:: @ 85B4C94
+	.incbin "sound/direct_sound_samples/cry_chikorita.bin"
+
+	.align 2
+Cry_Bayleef:: @ 85B51D4
+	.incbin "sound/direct_sound_samples/cry_bayleef.bin"
+
+	.align 2
+Cry_Meganium:: @ 85B5AA0
+	.incbin "sound/direct_sound_samples/cry_meganium.bin"
+
+	.align 2
+Cry_Cyndaquil:: @ 85B6AD8
+	.incbin "sound/direct_sound_samples/cry_cyndaquil.bin"
+
+	.align 2
+Cry_Quilava:: @ 85B71DC
+	.incbin "sound/direct_sound_samples/cry_quilava.bin"
+
+	.align 2
+Cry_Typhlosion:: @ 85B7DC4
+	.incbin "sound/direct_sound_samples/cry_typhlosion.bin"
+
+	.align 2
+Cry_Totodile:: @ 85BA3D4
+	.incbin "sound/direct_sound_samples/cry_totodile.bin"
+
+	.align 2
+Cry_Croconaw:: @ 85BB62C
+	.incbin "sound/direct_sound_samples/cry_croconaw.bin"
+
+	.align 2
+Cry_Feraligatr:: @ 85BCA68
+	.incbin "sound/direct_sound_samples/cry_feraligatr.bin"
+
+	.align 2
+Cry_Sentret:: @ 85BE3EC
+	.incbin "sound/direct_sound_samples/cry_sentret.bin"
+
+	.align 2
+Cry_Furret:: @ 85BE814
+	.incbin "sound/direct_sound_samples/cry_furret.bin"
+
+	.align 2
+Cry_Hoothoot:: @ 85BEE5C
+	.incbin "sound/direct_sound_samples/cry_hoothoot.bin"
+
+	.align 2
+Cry_Noctowl:: @ 85BF940
+	.incbin "sound/direct_sound_samples/cry_noctowl.bin"
+
+	.align 2
+Cry_Ledyba:: @ 85C0E70
+	.incbin "sound/direct_sound_samples/cry_ledyba.bin"
+
+	.align 2
+Cry_Ledian:: @ 85C1568
+	.incbin "sound/direct_sound_samples/cry_ledian.bin"
+
+	.align 2
+Cry_Spinarak:: @ 85C1DCC
+	.incbin "sound/direct_sound_samples/cry_spinarak.bin"
+
+	.align 2
+Cry_Ariados:: @ 85C2B30
+	.incbin "sound/direct_sound_samples/cry_ariados.bin"
+
+	.align 2
+Cry_Crobat:: @ 85C3784
+	.incbin "sound/direct_sound_samples/cry_crobat.bin"
+
+	.align 2
+Cry_Chinchou:: @ 85C4EB4
+	.incbin "sound/direct_sound_samples/cry_chinchou.bin"
+
+	.align 2
+Cry_Lanturn:: @ 85C5B64
+	.incbin "sound/direct_sound_samples/cry_lanturn.bin"
+
+	.align 2
+Cry_Pichu:: @ 85C65F0
+	.incbin "sound/direct_sound_samples/cry_pichu.bin"
+
+	.align 2
+Cry_Cleffa:: @ 85C6D44
+	.incbin "sound/direct_sound_samples/cry_cleffa.bin"
+
+	.align 2
+Cry_Igglybuff:: @ 85C7334
+	.incbin "sound/direct_sound_samples/cry_igglybuff.bin"
+
+	.align 2
+Cry_Togepi:: @ 85C7A30
+	.incbin "sound/direct_sound_samples/cry_togepi.bin"
+
+	.align 2
+Cry_Togetic:: @ 85C8518
+	.incbin "sound/direct_sound_samples/cry_togetic.bin"
+
+	.align 2
+Cry_Natu:: @ 85C8C18
+	.incbin "sound/direct_sound_samples/cry_natu.bin"
+
+	.align 2
+Cry_Xatu:: @ 85C96A8
+	.incbin "sound/direct_sound_samples/cry_xatu.bin"
+
+	.align 2
+Cry_Mareep:: @ 85CA574
+	.incbin "sound/direct_sound_samples/cry_mareep.bin"
+
+	.align 2
+Cry_Flaaffy:: @ 85CACCC
+	.incbin "sound/direct_sound_samples/cry_flaaffy.bin"
+
+	.align 2
+Cry_Ampharos:: @ 85CBA80
+	.incbin "sound/direct_sound_samples/cry_ampharos.bin"
+
+	.align 2
+Cry_Bellossom:: @ 85CCB00
+	.incbin "sound/direct_sound_samples/cry_bellossom.bin"
+
+	.align 2
+Cry_Marill:: @ 85CD918
+	.incbin "sound/direct_sound_samples/cry_marill.bin"
+
+	.align 2
+Cry_Azumarill:: @ 85CE62C
+	.incbin "sound/direct_sound_samples/cry_azumarill.bin"
+
+	.align 2
+Cry_Sudowoodo:: @ 85CF718
+	.incbin "sound/direct_sound_samples/cry_sudowoodo.bin"
+
+	.align 2
+Cry_Politoed:: @ 85D0748
+	.incbin "sound/direct_sound_samples/cry_politoed.bin"
+
+	.align 2
+Cry_Hoppip:: @ 85D198C
+	.incbin "sound/direct_sound_samples/cry_hoppip.bin"
+
+	.align 2
+Cry_Skiploom:: @ 85D21F8
+	.incbin "sound/direct_sound_samples/cry_skiploom.bin"
+
+	.align 2
+Cry_Jumpluff:: @ 85D2F00
+	.incbin "sound/direct_sound_samples/cry_jumpluff.bin"
+
+	.align 2
+Cry_Aipom:: @ 85D3F3C
+	.incbin "sound/direct_sound_samples/cry_aipom.bin"
+
+	.align 2
+Cry_Sunkern:: @ 85D4D5C
+	.incbin "sound/direct_sound_samples/cry_sunkern.bin"
+
+	.align 2
+Cry_Sunflora:: @ 85D5570
+	.incbin "sound/direct_sound_samples/cry_sunflora.bin"
+
+	.align 2
+Cry_Yanma:: @ 85D6550
+	.incbin "sound/direct_sound_samples/cry_yanma.bin"
+
+	.align 2
+Cry_Wooper:: @ 85D7658
+	.incbin "sound/direct_sound_samples/cry_wooper.bin"
+
+	.align 2
+Cry_Quagsire:: @ 85D7DB8
+	.incbin "sound/direct_sound_samples/cry_quagsire.bin"
+
+	.align 2
+Cry_Espeon:: @ 85D8B18
+	.incbin "sound/direct_sound_samples/cry_espeon.bin"
+
+	.align 2
+Cry_Umbreon:: @ 85D9ECC
+	.incbin "sound/direct_sound_samples/cry_umbreon.bin"
+
+	.align 2
+Cry_Murkrow:: @ 85DAE4C
+	.incbin "sound/direct_sound_samples/cry_murkrow.bin"
+
+	.align 2
+Cry_Slowking:: @ 85DBF10
+	.incbin "sound/direct_sound_samples/cry_slowking.bin"
+
+	.align 2
+Cry_Misdreavus:: @ 85DD6F4
+	.incbin "sound/direct_sound_samples/cry_misdreavus.bin"
+
+	.align 2
+Cry_Unown:: @ 85DE294
+	.incbin "sound/direct_sound_samples/cry_unown.bin"
+
+	.align 2
+Cry_Wobbuffet:: @ 85DEFBC
+	.incbin "sound/direct_sound_samples/cry_wobbuffet.bin"
+
+	.align 2
+Cry_Girafarig:: @ 85E0458
+	.incbin "sound/direct_sound_samples/cry_girafarig.bin"
+
+	.align 2
+Cry_Pineco:: @ 85E130C
+	.incbin "sound/direct_sound_samples/cry_pineco.bin"
+
+	.align 2
+Cry_Forretress:: @ 85E206C
+	.incbin "sound/direct_sound_samples/cry_forretress.bin"
+
+	.align 2
+Cry_Dunsparce:: @ 85E3474
+	.incbin "sound/direct_sound_samples/cry_dunsparce.bin"
+
+	.align 2
+Cry_Gligar:: @ 85E4454
+	.incbin "sound/direct_sound_samples/cry_gligar.bin"
+
+	.align 2
+Cry_Steelix:: @ 85E5074
+	.incbin "sound/direct_sound_samples/cry_steelix.bin"
+
+	.align 2
+Cry_Snubbull:: @ 85E769C
+	.incbin "sound/direct_sound_samples/cry_snubbull.bin"
+
+	.align 2
+Cry_Granbull:: @ 85E8510
+	.incbin "sound/direct_sound_samples/cry_granbull.bin"
+
+	.align 2
+Cry_Qwilfish:: @ 85E9CB4
+	.incbin "sound/direct_sound_samples/cry_qwilfish.bin"
+
+	.align 2
+Cry_Scizor:: @ 85EA850
+	.incbin "sound/direct_sound_samples/cry_scizor.bin"
+
+	.align 2
+Cry_Shuckle:: @ 85EBF4C
+	.incbin "sound/direct_sound_samples/cry_shuckle.bin"
+
+	.align 2
+Cry_Heracross:: @ 85EC980
+	.incbin "sound/direct_sound_samples/cry_heracross.bin"
+
+	.align 2
+Cry_Sneasel:: @ 85EDBD4
+	.incbin "sound/direct_sound_samples/cry_sneasel.bin"
+
+	.align 2
+Cry_Teddiursa:: @ 85EE4F8
+	.incbin "sound/direct_sound_samples/cry_teddiursa.bin"
+
+	.align 2
+Cry_Ursaring:: @ 85EF584
+	.incbin "sound/direct_sound_samples/cry_ursaring.bin"
+
+	.align 2
+Cry_Slugma:: @ 85F135C
+	.incbin "sound/direct_sound_samples/cry_slugma.bin"
+
+	.align 2
+Cry_Magcargo:: @ 85F2474
+	.incbin "sound/direct_sound_samples/cry_magcargo.bin"
+
+	.align 2
+Cry_Swinub:: @ 85F397C
+	.incbin "sound/direct_sound_samples/cry_swinub.bin"
+
+	.align 2
+Cry_Piloswine:: @ 85F4624
+	.incbin "sound/direct_sound_samples/cry_piloswine.bin"
+
+	.align 2
+Cry_Corsola:: @ 85F5318
+	.incbin "sound/direct_sound_samples/cry_corsola.bin"
+
+	.align 2
+Cry_Remoraid:: @ 85F5FF8
+	.incbin "sound/direct_sound_samples/cry_remoraid.bin"
+
+	.align 2
+Cry_Octillery:: @ 85F6A88
+	.incbin "sound/direct_sound_samples/cry_octillery.bin"
+
+	.align 2
+Cry_Delibird:: @ 85F84CC
+	.incbin "sound/direct_sound_samples/cry_delibird.bin"
+
+	.align 2
+Cry_Mantine:: @ 85F9500
+	.incbin "sound/direct_sound_samples/cry_mantine.bin"
+
+	.align 2
+Cry_Skarmory:: @ 85FA4C8
+	.incbin "sound/direct_sound_samples/cry_skarmory.bin"
+
+	.align 2
+Cry_Houndour:: @ 85FBCD0
+	.incbin "sound/direct_sound_samples/cry_houndour.bin"
+
+	.align 2
+Cry_Houndoom:: @ 85FC978
+	.incbin "sound/direct_sound_samples/cry_houndoom.bin"
+
+	.align 2
+Cry_Kingdra:: @ 85FDD28
+	.incbin "sound/direct_sound_samples/cry_kingdra.bin"
+
+	.align 2
+Cry_Phanpy:: @ 85FEB00
+	.incbin "sound/direct_sound_samples/cry_phanpy.bin"
+
+	.align 2
+Cry_Donphan:: @ 85FF650
+	.incbin "sound/direct_sound_samples/cry_donphan.bin"
+
+	.align 2
+Cry_Porygon2:: @ 8600774
+	.incbin "sound/direct_sound_samples/cry_porygon2.bin"
+
+	.align 2
+Cry_Stantler:: @ 860172C
+	.incbin "sound/direct_sound_samples/cry_stantler.bin"
+
+	.align 2
+Cry_Smeargle:: @ 8602DA8
+	.incbin "sound/direct_sound_samples/cry_smeargle.bin"
+
+	.align 2
+Cry_Tyrogue:: @ 86037DC
+	.incbin "sound/direct_sound_samples/cry_tyrogue.bin"
+
+	.align 2
+Cry_Hitmontop:: @ 8604804
+	.incbin "sound/direct_sound_samples/cry_hitmontop.bin"
+
+	.align 2
+Cry_Smoochum:: @ 86055E4
+	.incbin "sound/direct_sound_samples/cry_smoochum.bin"
+
+	.align 2
+Cry_Elekid:: @ 8606198
+	.incbin "sound/direct_sound_samples/cry_elekid.bin"
+
+	.align 2
+Cry_Magby:: @ 8606C24
+	.incbin "sound/direct_sound_samples/cry_magby.bin"
+
+	.align 2
+Cry_Miltank:: @ 8607A94
+	.incbin "sound/direct_sound_samples/cry_miltank.bin"
+
+	.align 2
+Cry_Blissey:: @ 8608970
+	.incbin "sound/direct_sound_samples/cry_blissey.bin"
+
+	.align 2
+Cry_Raikou:: @ 8609A04
+	.incbin "sound/direct_sound_samples/cry_raikou.bin"
+
+	.align 2
+Cry_Entei:: @ 860AB74
+	.incbin "sound/direct_sound_samples/cry_entei.bin"
+
+	.align 2
+Cry_Suicune:: @ 860BFE8
+	.incbin "sound/direct_sound_samples/cry_suicune.bin"
+
+	.align 2
+Cry_Larvitar:: @ 860D230
+	.incbin "sound/direct_sound_samples/cry_larvitar.bin"
+
+	.align 2
+Cry_Pupitar:: @ 860DEE0
+	.incbin "sound/direct_sound_samples/cry_pupitar.bin"
+
+	.align 2
+Cry_Tyranitar:: @ 860E750
+	.incbin "sound/direct_sound_samples/cry_tyranitar.bin"
+
+	.align 2
+Cry_Lugia:: @ 860FEB0
+	.incbin "sound/direct_sound_samples/cry_lugia.bin"
+
+	.align 2
+Cry_HoOh:: @ 86124A8
+	.incbin "sound/direct_sound_samples/cry_ho_oh.bin"
+
+	.align 2
+Cry_Celebi:: @ 8613B3C
+	.incbin "sound/direct_sound_samples/cry_celebi.bin"
+
+	.align 2
+Cry_Kecleon:: @ 86149B4
+	.incbin "sound/direct_sound_samples/cry_kecleon.bin"
+
+	.align 2
+Cry_Roselia:: @ 8615214
+	.incbin "sound/direct_sound_samples/cry_roselia.bin"
+
+	.align 2
+Cry_Torkoal:: @ 8615CD4
+	.incbin "sound/direct_sound_samples/cry_torkoal.bin"
+
+	.align 2
+Cry_Electrike:: @ 8616620
+	.incbin "sound/direct_sound_samples/cry_electrike.bin"
+
+	.align 2
+Cry_Manectric:: @ 861727C
+	.incbin "sound/direct_sound_samples/cry_manectric.bin"
+
+	.align 2
+Cry_Duskull:: @ 8618784
+	.incbin "sound/direct_sound_samples/cry_duskull.bin"
+
+	.align 2
+Cry_Latias:: @ 861921C
+	.incbin "sound/direct_sound_samples/cry_latias.bin"
+
+	.align 2
+Cry_Wynaut:: @ 8619E4C
+	.incbin "sound/direct_sound_samples/cry_wynaut.bin"
+
+	.align 2
+Cry_Seviper:: @ 861AC2C
+	.incbin "sound/direct_sound_samples/cry_seviper.bin"
+
+	.align 2
+Cry_Sharpedo:: @ 861B7CC
+	.incbin "sound/direct_sound_samples/cry_sharpedo.bin"
+
+	.align 2
+Cry_Zangoose:: @ 861CED8
+	.incbin "sound/direct_sound_samples/cry_zangoose.bin"
+
+	.align 2
+Cry_Azurill:: @ 861D868
+	.incbin "sound/direct_sound_samples/cry_azurill.bin"
+
+	.align 2
+Cry_Swablu:: @ 861E2D0
+	.incbin "sound/direct_sound_samples/cry_swablu.bin"
+
+	.align 2
+Cry_Altaria:: @ 861E868
+	.incbin "sound/direct_sound_samples/cry_altaria.bin"
+
+	.align 2
+Cry_Unused265:: @ 861F384
+	.incbin "sound/direct_sound_samples/cry_unused_265.bin"
+
+	.align 2
+Cry_Taillow:: @ 861FCD8
+	.incbin "sound/direct_sound_samples/cry_taillow.bin"
+
+	.align 2
+Cry_Swellow:: @ 86202D8
+	.incbin "sound/direct_sound_samples/cry_swellow.bin"
+
+	.align 2
+Cry_Unused268:: @ 8620BDC
+	.incbin "sound/direct_sound_samples/cry_unused_268.bin"
+
+	.align 2
+Cry_Spinda:: @ 8621D8C
+	.incbin "sound/direct_sound_samples/cry_spinda.bin"
+
+	.align 2
+Cry_Torchic:: @ 86229F8
+	.incbin "sound/direct_sound_samples/cry_torchic.bin"
+
+	.align 2
+Cry_Combusken:: @ 86233A0
+	.incbin "sound/direct_sound_samples/cry_combusken.bin"
+
+	.align 2
+Cry_Blaziken:: @ 8625074
+	.incbin "sound/direct_sound_samples/cry_blaziken.bin"
+
+	.align 2
+Cry_Treecko:: @ 8626FF4
+	.incbin "sound/direct_sound_samples/cry_treecko.bin"
+
+	.align 2
+Cry_Grovyle:: @ 8627B9C
+	.incbin "sound/direct_sound_samples/cry_grovyle.bin"
+
+	.align 2
+Cry_Sceptile:: @ 8629010
+	.incbin "sound/direct_sound_samples/cry_sceptile.bin"
+
+	.align 2
+Cry_Mudkip:: @ 862AA2C
+	.incbin "sound/direct_sound_samples/cry_mudkip.bin"
+
+	.align 2
+Cry_Marshtomp:: @ 862B1B0
+	.incbin "sound/direct_sound_samples/cry_marshtomp.bin"
+
+	.align 2
+Cry_Swampert:: @ 862C2B4
+	.incbin "sound/direct_sound_samples/cry_swampert.bin"
+
+	.align 2
+Cry_Pelipper:: @ 862D934
+	.incbin "sound/direct_sound_samples/cry_pelipper.bin"
+
+	.align 2
+Cry_Wingull:: @ 862E4FC
+	.incbin "sound/direct_sound_samples/cry_wingull.bin"
+
+	.align 2
+Cry_Banette:: @ 862F13C
+	.incbin "sound/direct_sound_samples/cry_banette.bin"
+
+	.align 2
+Cry_Shuppet:: @ 862FDE4
+	.incbin "sound/direct_sound_samples/cry_shuppet.bin"
+
+	.align 2
+Cry_Lotad:: @ 8630624
+	.incbin "sound/direct_sound_samples/cry_lotad.bin"
+
+	.align 2
+Cry_Lombre:: @ 8630A8C
+	.incbin "sound/direct_sound_samples/cry_lombre.bin"
+
+	.align 2
+Cry_Ludicolo:: @ 8631920
+	.incbin "sound/direct_sound_samples/cry_ludicolo.bin"
+
+	.align 2
+Cry_Seedot:: @ 86329F0
+	.incbin "sound/direct_sound_samples/cry_seedot.bin"
+
+	.align 2
+Cry_Nuzleaf:: @ 863321C
+	.incbin "sound/direct_sound_samples/cry_nuzleaf.bin"
+
+	.align 2
+Cry_Shiftry:: @ 8633D84
+	.incbin "sound/direct_sound_samples/cry_shiftry.bin"
+
+	.align 2
+Cry_Carvanha:: @ 8635148
+	.incbin "sound/direct_sound_samples/cry_carvanha.bin"
+
+	.align 2
+Cry_Wurmple:: @ 8635B5C
+	.incbin "sound/direct_sound_samples/cry_wurmple.bin"
+
+	.align 2
+Cry_Silcoon:: @ 8636428
+	.incbin "sound/direct_sound_samples/cry_silcoon.bin"
+
+	.align 2
+Cry_Beautifly:: @ 8637454
+	.incbin "sound/direct_sound_samples/cry_beautifly.bin"
+
+	.align 2
+Cry_Cascoon:: @ 8637C8C
+	.incbin "sound/direct_sound_samples/cry_cascoon.bin"
+
+	.align 2
+Cry_Dustox:: @ 8638CD0
+	.incbin "sound/direct_sound_samples/cry_dustox.bin"
+
+	.align 2
+Cry_Ralts:: @ 863997C
+	.incbin "sound/direct_sound_samples/cry_ralts.bin"
+
+	.align 2
+Cry_Kirlia:: @ 863A398
+	.incbin "sound/direct_sound_samples/cry_kirlia.bin"
+
+	.align 2
+Cry_Gardevoir:: @ 863AFC8
+	.incbin "sound/direct_sound_samples/cry_gardevoir.bin"
+
+	.align 2
+Cry_Slakoth:: @ 863C82C
+	.incbin "sound/direct_sound_samples/cry_slakoth.bin"
+
+	.align 2
+Cry_Vigoroth:: @ 863D0B0
+	.incbin "sound/direct_sound_samples/cry_vigoroth.bin"
+
+	.align 2
+Cry_Slaking:: @ 863DF08
+	.incbin "sound/direct_sound_samples/cry_slaking.bin"
+
+	.align 2
+Cry_Nincada:: @ 863E8F4
+	.incbin "sound/direct_sound_samples/cry_nincada.bin"
+
+	.align 2
+Cry_Ninjask:: @ 863EF64
+	.incbin "sound/direct_sound_samples/cry_ninjask.bin"
+
+	.align 2
+Cry_Shedinja:: @ 863FB8C
+	.incbin "sound/direct_sound_samples/cry_shedinja.bin"
+
+	.align 2
+Cry_Makuhita:: @ 8640344
+	.incbin "sound/direct_sound_samples/cry_makuhita.bin"
+
+	.align 2
+Cry_Hariyama:: @ 8640AA0
+	.incbin "sound/direct_sound_samples/cry_hariyama.bin"
+
+	.align 2
+Cry_Nosepass:: @ 8641B58
+	.incbin "sound/direct_sound_samples/cry_nosepass.bin"
+
+	.align 2
+Cry_Glalie:: @ 86428BC
+	.incbin "sound/direct_sound_samples/cry_glalie.bin"
+
+	.align 2
+Cry_Plusle:: @ 8643DA0
+	.incbin "sound/direct_sound_samples/cry_plusle.bin"
+
+	.align 2
+Cry_Minun:: @ 864469C
+	.incbin "sound/direct_sound_samples/cry_minun.bin"
+
+	.align 2
+Cry_Surskit:: @ 86456A4
+	.incbin "sound/direct_sound_samples/cry_surskit.bin"
+
+	.align 2
+Cry_Masquerain:: @ 8646124
+	.incbin "sound/direct_sound_samples/cry_masquerain.bin"
+
+	.align 2
+Cry_Skitty:: @ 86474D8
+	.incbin "sound/direct_sound_samples/cry_skitty.bin"
+
+	.align 2
+Cry_Delcatty:: @ 8647BEC
+	.incbin "sound/direct_sound_samples/cry_delcatty.bin"
+
+	.align 2
+Cry_Gulpin:: @ 8649104
+	.incbin "sound/direct_sound_samples/cry_gulpin.bin"
+
+	.align 2
+Cry_Swalot:: @ 8649908
+	.incbin "sound/direct_sound_samples/cry_swalot.bin"
+
+	.align 2
+Cry_Numel:: @ 864AA68
+	.incbin "sound/direct_sound_samples/cry_numel.bin"
+
+	.align 2
+Cry_Camerupt:: @ 864B3B4
+	.incbin "sound/direct_sound_samples/cry_camerupt.bin"
+
+	.align 2
+Cry_Barboach:: @ 864CAD4
+	.incbin "sound/direct_sound_samples/cry_barboach.bin"
+
+	.align 2
+Cry_Whiscash:: @ 864D410
+	.incbin "sound/direct_sound_samples/cry_whiscash.bin"
+
+	.align 2
+Cry_Corphish:: @ 864E50C
+	.incbin "sound/direct_sound_samples/cry_corphish.bin"
+
+	.align 2
+Cry_Crawdaunt:: @ 864F110
+	.incbin "sound/direct_sound_samples/cry_crawdaunt.bin"
+
+	.align 2
+Cry_Spoink:: @ 86509C8
+	.incbin "sound/direct_sound_samples/cry_spoink.bin"
+
+	.align 2
+Cry_Grumpig:: @ 8651108
+	.incbin "sound/direct_sound_samples/cry_grumpig.bin"
+
+	.align 2
+Cry_Trapinch:: @ 8651DA8
+	.incbin "sound/direct_sound_samples/cry_trapinch.bin"
+
+	.align 2
+Cry_Vibrava:: @ 86527CC
+	.incbin "sound/direct_sound_samples/cry_vibrava.bin"
+
+	.align 2
+Cry_Flygon:: @ 86535D0
+	.incbin "sound/direct_sound_samples/cry_flygon.bin"
+
+	.align 2
+Cry_Cacnea:: @ 8654FD8
+	.incbin "sound/direct_sound_samples/cry_cacnea.bin"
+
+	.align 2
+Cry_Cacturne:: @ 86558C8
+	.incbin "sound/direct_sound_samples/cry_cacturne.bin"
+
+	.align 2
+Cry_Baltoy:: @ 8656F78
+	.incbin "sound/direct_sound_samples/cry_baltoy.bin"
+
+	.align 2
+Cry_Claydol:: @ 8657BFC
+	.incbin "sound/direct_sound_samples/cry_claydol.bin"
+
+	.align 2
+Cry_Lunatone:: @ 8658F5C
+	.incbin "sound/direct_sound_samples/cry_lunatone.bin"
+
+	.align 2
+Cry_Solrock:: @ 865A758
+	.incbin "sound/direct_sound_samples/cry_solrock.bin"
+
+	.align 2
+Cry_Feebas:: @ 865B784
+	.incbin "sound/direct_sound_samples/cry_feebas.bin"
+
+	.align 2
+Cry_Milotic:: @ 865BF58
+	.incbin "sound/direct_sound_samples/cry_milotic.bin"
+
+	.align 2
+Cry_Absol:: @ 865E69C
+	.incbin "sound/direct_sound_samples/cry_absol.bin"
+
+	.align 2
+Cry_Meditite:: @ 865F118
+	.incbin "sound/direct_sound_samples/cry_meditite.bin"
+
+	.align 2
+Cry_Medicham:: @ 865F938
+	.incbin "sound/direct_sound_samples/cry_medicham.bin"
+
+	.align 2
+Cry_Spheal:: @ 86609BC
+	.incbin "sound/direct_sound_samples/cry_spheal.bin"
+
+	.align 2
+Cry_Sealeo:: @ 8660F70
+	.incbin "sound/direct_sound_samples/cry_sealeo.bin"
+
+	.align 2
+Cry_Walrein:: @ 8661B48
+	.incbin "sound/direct_sound_samples/cry_walrein.bin"
+
+	.align 2
+Cry_Clamperl:: @ 8663F94
+	.incbin "sound/direct_sound_samples/cry_clamperl.bin"
+
+	.align 2
+Cry_Huntail:: @ 86651E4
+	.incbin "sound/direct_sound_samples/cry_huntail.bin"
+
+	.align 2
+Cry_Gorebyss:: @ 86661CC
+	.incbin "sound/direct_sound_samples/cry_gorebyss.bin"
+
+	.align 2
+Cry_Lileep:: @ 8667838
+	.incbin "sound/direct_sound_samples/cry_lileep.bin"
+
+	.align 2
+Cry_Cradily:: @ 86681E0
+	.incbin "sound/direct_sound_samples/cry_cradily.bin"
+
+	.align 2
+Cry_Anorith:: @ 8669F10
+	.incbin "sound/direct_sound_samples/cry_anorith.bin"
+
+	.align 2
+Cry_Armaldo:: @ 866AAC8
+	.incbin "sound/direct_sound_samples/cry_armaldo.bin"
+
+	.align 2
+Cry_Beldum:: @ 866C19C
+	.incbin "sound/direct_sound_samples/cry_beldum.bin"
+
+	.align 2
+Cry_Metang:: @ 866CB3C
+	.incbin "sound/direct_sound_samples/cry_metang.bin"
+
+	.align 2
+Cry_Metagross:: @ 866DE10
+	.incbin "sound/direct_sound_samples/cry_metagross.bin"
+
+	.align 2
+Cry_Bagon:: @ 8670588
+	.incbin "sound/direct_sound_samples/cry_bagon.bin"
+
+	.align 2
+Cry_Shelgon:: @ 8670D5C
+	.incbin "sound/direct_sound_samples/cry_shelgon.bin"
+
+	.align 2
+Cry_Regirock:: @ 8672164
+	.incbin "sound/direct_sound_samples/cry_regirock.bin"
+
+	.align 2
+Cry_Regice:: @ 8674140
+	.incbin "sound/direct_sound_samples/cry_regice.bin"
+
+	.align 2
+Cry_Registeel:: @ 8676140
+	.incbin "sound/direct_sound_samples/cry_registeel.bin"
+
+	.align 2
+Cry_Castform:: @ 8677844
+	.incbin "sound/direct_sound_samples/cry_castform.bin"
+
+	.align 2
+Cry_Volbeat:: @ 86784DC
+	.incbin "sound/direct_sound_samples/cry_volbeat.bin"
+
+	.align 2
+Cry_Illumise:: @ 8679064
+	.incbin "sound/direct_sound_samples/cry_illumise.bin"
+
+	.align 2
+Cry_Poochyena:: @ 867A17C
+	.incbin "sound/direct_sound_samples/cry_poochyena.bin"
+
+	.align 2
+Cry_Mightyena:: @ 867AAC4
+	.incbin "sound/direct_sound_samples/cry_mightyena.bin"
+
+	.align 2
+Cry_Dusclops:: @ 867BE50
+	.incbin "sound/direct_sound_samples/cry_dusclops.bin"
+
+	.align 2
+Cry_Sableye:: @ 867CC08
+	.incbin "sound/direct_sound_samples/cry_sableye.bin"
+
+	.align 2
+Cry_Mawile:: @ 867D7AC
+	.incbin "sound/direct_sound_samples/cry_mawile.bin"
+
+	.align 2
+Cry_Aron:: @ 867E32C
+	.incbin "sound/direct_sound_samples/cry_aron.bin"
+
+	.align 2
+Cry_Lairon:: @ 867EC58
+	.incbin "sound/direct_sound_samples/cry_lairon.bin"
+
+	.align 2
+Cry_Aggron:: @ 8680130
+	.incbin "sound/direct_sound_samples/cry_aggron.bin"
+
+	.align 2
+Cry_Relicanth:: @ 8681AD4
+	.incbin "sound/direct_sound_samples/cry_relicanth.bin"
+
+	.align 2
+Cry_Luvdisc:: @ 8682F04
+	.incbin "sound/direct_sound_samples/cry_luvdisc.bin"
+
+	.align 2
+Cry_Groudon:: @ 86833E0
+	.incbin "sound/direct_sound_samples/cry_groudon.bin"
+
+	.align 2
+Cry_Kyogre:: @ 86858EC
+	.incbin "sound/direct_sound_samples/cry_kyogre.bin"
+
+	.align 2
+Cry_Rayquaza:: @ 8687CA4
+	.incbin "sound/direct_sound_samples/cry_rayquaza.bin"
+
+	.align 2
+Cry_Salamence:: @ 86899D0
+	.incbin "sound/direct_sound_samples/cry_salamence.bin"
+
+	.align 2
+Cry_Breloom:: @ 868B2EC
+	.incbin "sound/direct_sound_samples/cry_breloom.bin"
+
+	.align 2
+Cry_Shroomish:: @ 868BFAC
+	.incbin "sound/direct_sound_samples/cry_shroomish.bin"
+
+	.align 2
+Cry_Linoone:: @ 868C884
+	.incbin "sound/direct_sound_samples/cry_linoone.bin"
+
+	.align 2
+Cry_Tropius:: @ 868E720
+	.incbin "sound/direct_sound_samples/cry_tropius.bin"
+
+	.align 2
+Cry_Wailmer:: @ 86907E4
+	.incbin "sound/direct_sound_samples/cry_wailmer.bin"
+
+	.align 2
+Cry_Zigzagoon:: @ 8692444
+	.incbin "sound/direct_sound_samples/cry_zigzagoon.bin"
+
+	.align 2
+Cry_Exploud:: @ 8692FD4
+	.incbin "sound/direct_sound_samples/cry_exploud.bin"
+
+	.align 2
+Cry_Loudred:: @ 8694C1C
+	.incbin "sound/direct_sound_samples/cry_loudred.bin"
+
+	.align 2
+Cry_Wailord:: @ 8695944
+	.incbin "sound/direct_sound_samples/cry_wailord.bin"
+
+	.align 2
+Cry_Whismur:: @ 8698354
+	.incbin "sound/direct_sound_samples/cry_whismur.bin"
+
+	.align 2
+Cry_Snorunt:: @ 8698B78
+	.incbin "sound/direct_sound_samples/cry_snorunt.bin"
+
+	.align 2
+Cry_Latios:: @ 8699C80
+	.incbin "sound/direct_sound_samples/cry_latios.bin"
+
+	.align 2
+Cry_Jirachi:: @ 869B278
+	.incbin "sound/direct_sound_samples/cry_jirachi.bin"
+
+	.align 2
+Cry_Deoxys:: @ 869BFFC
+	.incbin "sound/direct_sound_samples/cry_deoxys.bin"
+
+	.align 2
+Cry_Chimecho:: @ 869D4D0
+	.incbin "sound/direct_sound_samples/cry_chimecho.bin"
+
+	.align 2
+	.incbin "baserom.gba", 0x69DEE0, 0x17760
+
+gSong_86B5640:: @ 0x86B5640
+	.incbin "baserom.gba", 0x6B5640, 0x20
+
+gSong_86B5660:: @ 0x86B5660
+	.incbin "baserom.gba", 0x6B5660, 0x2C
+
+gSong_86B568C:: @ 0x86B568C
+	.incbin "baserom.gba", 0x6B568C, 0x24
+
+gSong_86B56B0:: @ 0x86B56B0
+	.incbin "baserom.gba", 0x6B56B0, 0x44
+
+gSong_86B56F4:: @ 0x86B56F4
+	.incbin "baserom.gba", 0x6B56F4, 0x2C
+
+gSong_86B5720:: @ 0x86B5720
+	.incbin "baserom.gba", 0x6B5720, 0x1C
+
+gSong_86B573C:: @ 0x86B573C
+	.incbin "baserom.gba", 0x6B573C, 0x1C
+
+gSong_86B5758:: @ 0x86B5758
+	.incbin "baserom.gba", 0x6B5758, 0x1C
+
+gSong_86B5774:: @ 0x86B5774
+	.incbin "baserom.gba", 0x6B5774, 0x34
+
+gSong_86B57A8:: @ 0x86B57A8
+	.incbin "baserom.gba", 0x6B57A8, 0x24
+
+gSong_86B57CC:: @ 0x86B57CC
+	.incbin "baserom.gba", 0x6B57CC, 0x1C
+
+gSong_86B57E8:: @ 0x86B57E8
+	.incbin "baserom.gba", 0x6B57E8, 0x2C
+
+gSong_86B5814:: @ 0x86B5814
+	.incbin "baserom.gba", 0x6B5814, 0x4C
+
+gSong_86B5860:: @ 0x86B5860
+	.incbin "baserom.gba", 0x6B5860, 0x7C
+
+gSong_86B58DC:: @ 0x86B58DC
+	.incbin "baserom.gba", 0x6B58DC, 0x54
+
+gSong_86B5930:: @ 0x86B5930
+	.incbin "baserom.gba", 0x6B5930, 0x54
+
+gSong_86B5984:: @ 0x86B5984
+	.incbin "baserom.gba", 0x6B5984, 0x50
+
+gSong_86B59D4:: @ 0x86B59D4
+	.incbin "baserom.gba", 0x6B59D4, 0x1C
+
+gSong_86B59F0:: @ 0x86B59F0
+	.incbin "baserom.gba", 0x6B59F0, 0x54
+
+gSong_86B5A44:: @ 0x86B5A44
+	.incbin "baserom.gba", 0x6B5A44, 0x48
+
+gSong_86B5A8C:: @ 0x86B5A8C
+	.incbin "baserom.gba", 0x6B5A8C, 0x2C
+
+gSong_86B5AB8:: @ 0x86B5AB8
+	.incbin "baserom.gba", 0x6B5AB8, 0x24
+
+gSong_86B5ADC:: @ 0x86B5ADC
+	.incbin "baserom.gba", 0x6B5ADC, 0x24
+
+gSong_86B5B00:: @ 0x86B5B00
+	.incbin "baserom.gba", 0x6B5B00, 0x84
+
+gSong_86B5B84:: @ 0x86B5B84
+	.incbin "baserom.gba", 0x6B5B84, 0x2C
+
+gSong_86B5BB0:: @ 0x86B5BB0
+	.incbin "baserom.gba", 0x6B5BB0, 0x30
+
+gSong_86B5BE0:: @ 0x86B5BE0
+	.incbin "baserom.gba", 0x6B5BE0, 0x180
+
+gSong_86B5D60:: @ 0x86B5D60
+	.incbin "baserom.gba", 0x6B5D60, 0x24
+
+gSong_86B5D84:: @ 0x86B5D84
+	.incbin "baserom.gba", 0x6B5D84, 0x24
+
+gSong_86B5DA8:: @ 0x86B5DA8
+	.incbin "baserom.gba", 0x6B5DA8, 0x24
+
+gSong_86B5DCC:: @ 0x86B5DCC
+	.incbin "baserom.gba", 0x6B5DCC, 0x30
+
+gSong_86B5DFC:: @ 0x86B5DFC
+	.incbin "baserom.gba", 0x6B5DFC, 0x24
+
+gSong_86B5E20:: @ 0x86B5E20
+	.incbin "baserom.gba", 0x6B5E20, 0x4C
+
+gSong_86B5E6C:: @ 0x86B5E6C
+	.incbin "baserom.gba", 0x6B5E6C, 0x38
+
+gSong_86B5EA4:: @ 0x86B5EA4
+	.incbin "baserom.gba", 0x6B5EA4, 0x54
+
+gSong_86B5EF8:: @ 0x86B5EF8
+	.incbin "baserom.gba", 0x6B5EF8, 0x3C
+
+gSong_86B5F34:: @ 0x86B5F34
+	.incbin "baserom.gba", 0x6B5F34, 0x58
+
+gSong_86B5F8C:: @ 0x86B5F8C
+	.incbin "baserom.gba", 0x6B5F8C, 0x44
+
+gSong_86B5FD0:: @ 0x86B5FD0
+	.incbin "baserom.gba", 0x6B5FD0, 0x3C
+
+gSong_86B600C:: @ 0x86B600C
+	.incbin "baserom.gba", 0x6B600C, 0x40
+
+gSong_86B604C:: @ 0x86B604C
+	.incbin "baserom.gba", 0x6B604C, 0x2C
+
+gSong_86B6078:: @ 0x86B6078
+	.incbin "baserom.gba", 0x6B6078, 0x3C
+
+gSong_86B60B4:: @ 0x86B60B4
+	.incbin "baserom.gba", 0x6B60B4, 0xAC
+
+gSong_86B6160:: @ 0x86B6160
+	.incbin "baserom.gba", 0x6B6160, 0x78
+
+gSong_86B61D8:: @ 0x86B61D8
+	.incbin "baserom.gba", 0x6B61D8, 0x2C
+
+gSong_86B6204:: @ 0x86B6204
+	.incbin "baserom.gba", 0x6B6204, 0x34
+
+gSong_86B6238:: @ 0x86B6238
+	.incbin "baserom.gba", 0x6B6238, 0x2C
+
+gSong_86B6264:: @ 0x86B6264
+	.incbin "baserom.gba", 0x6B6264, 0x44
+
+gSong_86B62A8:: @ 0x86B62A8
+	.incbin "baserom.gba", 0x6B62A8, 0x2C
+
+gSong_86B62D4:: @ 0x86B62D4
+	.incbin "baserom.gba", 0x6B62D4, 0x2C
+
+gSong_86B6300:: @ 0x86B6300
+	.incbin "baserom.gba", 0x6B6300, 0x2C
+
+gSong_86B632C:: @ 0x86B632C
+	.incbin "baserom.gba", 0x6B632C, 0x2C
+
+gSong_86B6358:: @ 0x86B6358
+	.incbin "baserom.gba", 0x6B6358, 0x54
+
+gSong_86B63AC:: @ 0x86B63AC
+	.incbin "baserom.gba", 0x6B63AC, 0x44
+
+gSong_86B63F0:: @ 0x86B63F0
+	.incbin "baserom.gba", 0x6B63F0, 0x34
+
+gSong_86B6424:: @ 0x86B6424
+	.incbin "baserom.gba", 0x6B6424, 0x38
+
+gSong_86B645C:: @ 0x86B645C
+	.incbin "baserom.gba", 0x6B645C, 0x38
+
+gSong_86B6494:: @ 0x86B6494
+	.incbin "baserom.gba", 0x6B6494, 0x38
+
+gSong_86B64CC:: @ 0x86B64CC
+	.incbin "baserom.gba", 0x6B64CC, 0x38
+
+gSong_86B6504:: @ 0x86B6504
+	.incbin "baserom.gba", 0x6B6504, 0x38
+
+gSong_86B653C:: @ 0x86B653C
+	.incbin "baserom.gba", 0x6B653C, 0x38
+
+gSong_86B6574:: @ 0x86B6574
+	.incbin "baserom.gba", 0x6B6574, 0x38
+
+gSong_86B65AC:: @ 0x86B65AC
+	.incbin "baserom.gba", 0x6B65AC, 0x34
+
+gSong_86B65E0:: @ 0x86B65E0
+	.incbin "baserom.gba", 0x6B65E0, 0x24
+
+gSong_86B6604:: @ 0x86B6604
+	.incbin "baserom.gba", 0x6B6604, 0x4C
+
+gSong_86B6650:: @ 0x86B6650
+	.incbin "baserom.gba", 0x6B6650, 0x60
+
+gSong_86B66B0:: @ 0x86B66B0
+	.incbin "baserom.gba", 0x6B66B0, 0x34
+
+gSong_86B66E4:: @ 0x86B66E4
+	.incbin "baserom.gba", 0x6B66E4, 0x30
+
+gSong_86B6714:: @ 0x86B6714
+	.incbin "baserom.gba", 0x6B6714, 0x38
+
+gSong_86B674C:: @ 0x86B674C
+	.incbin "baserom.gba", 0x6B674C, 0x44
+
+gSong_86B6790:: @ 0x86B6790
+	.incbin "baserom.gba", 0x6B6790, 0x30
+
+gSong_86B67C0:: @ 0x86B67C0
+	.incbin "baserom.gba", 0x6B67C0, 0x28
+
+gSong_86B67E8:: @ 0x86B67E8
+	.incbin "baserom.gba", 0x6B67E8, 0x68
+
+gSong_86B6850:: @ 0x86B6850
+	.incbin "baserom.gba", 0x6B6850, 0x3C
+
+gSong_86B688C:: @ 0x86B688C
+	.incbin "baserom.gba", 0x6B688C, 0x40
+
+gSong_86B68CC:: @ 0x86B68CC
+	.incbin "baserom.gba", 0x6B68CC, 0x3C
+
+gSong_86B6908:: @ 0x86B6908
+	.incbin "baserom.gba", 0x6B6908, 0x40
+
+gSong_86B6948:: @ 0x86B6948
+	.incbin "baserom.gba", 0x6B6948, 0x3C
+
+gSong_86B6984:: @ 0x86B6984
+	.incbin "baserom.gba", 0x6B6984, 0x40
+
+gSong_86B69C4:: @ 0x86B69C4
+	.incbin "baserom.gba", 0x6B69C4, 0x68
+
+gSong_86B6A2C:: @ 0x86B6A2C
+	.incbin "baserom.gba", 0x6B6A2C, 0x50
+
+gSong_86B6A7C:: @ 0x86B6A7C
+	.incbin "baserom.gba", 0x6B6A7C, 0x3C
+
+gSong_86B6AB8:: @ 0x86B6AB8
+	.incbin "baserom.gba", 0x6B6AB8, 0x30
+
+gSong_86B6AE8:: @ 0x86B6AE8
+	.incbin "baserom.gba", 0x6B6AE8, 0x4C
+
+gSong_86B6B34:: @ 0x86B6B34
+	.incbin "baserom.gba", 0x6B6B34, 0x24
+
+gSong_86B6B58:: @ 0x86B6B58
+	.incbin "baserom.gba", 0x6B6B58, 0x54
+
+gSong_86B6BAC:: @ 0x86B6BAC
+	.incbin "baserom.gba", 0x6B6BAC, 0x94
+
+gSong_86B6C40:: @ 0x86B6C40
+	.incbin "baserom.gba", 0x6B6C40, 0x3C
+
+gSong_86B6C7C:: @ 0x86B6C7C
+	.incbin "baserom.gba", 0x6B6C7C, 0x24
+
+gSong_86B6CA0:: @ 0x86B6CA0
+	.incbin "baserom.gba", 0x6B6CA0, 0x64
+
+gSong_86B6D04:: @ 0x86B6D04
+	.incbin "baserom.gba", 0x6B6D04, 0x68
+
+gSong_86B6D6C:: @ 0x86B6D6C
+	.incbin "baserom.gba", 0x6B6D6C, 0x28
+
+gSong_86B6D94:: @ 0x86B6D94
+	.incbin "baserom.gba", 0x6B6D94, 0x34
+
+gSong_86B6DC8:: @ 0x86B6DC8
+	.incbin "baserom.gba", 0x6B6DC8, 0x2C
+
+gSong_86B6DF4:: @ 0x86B6DF4
+	.incbin "baserom.gba", 0x6B6DF4, 0x7C
+
+gSong_86B6E70:: @ 0x86B6E70
+	.incbin "baserom.gba", 0x6B6E70, 0xC0
+
+gSong_86B6F30:: @ 0x86B6F30
+	.incbin "baserom.gba", 0x6B6F30, 0xE8
+
+gSong_86B7018:: @ 0x86B7018
+	.incbin "baserom.gba", 0x6B7018, 0x118
+
+gSong_86B7130:: @ 0x86B7130
+	.incbin "baserom.gba", 0x6B7130, 0x24
+
+gSong_86B7154:: @ 0x86B7154
+	.incbin "baserom.gba", 0x6B7154, 0x114
+
+gSong_86B7268:: @ 0x86B7268
+	.incbin "baserom.gba", 0x6B7268, 0x2C
+
+gSong_86B7294:: @ 0x86B7294
+	.incbin "baserom.gba", 0x6B7294, 0x34
+
+gSong_86B72C8:: @ 0x86B72C8
+	.incbin "baserom.gba", 0x6B72C8, 0x64
+
+gSong_86B732C:: @ 0x86B732C
+	.incbin "baserom.gba", 0x6B732C, 0x68
+
+gSong_86B7394:: @ 0x86B7394
+	.incbin "baserom.gba", 0x6B7394, 0x1FC
+
+gSong_86B7590:: @ 0x86B7590
+	.incbin "baserom.gba", 0x6B7590, 0x8C
+
+gSong_86B761C:: @ 0x86B761C
+	.incbin "baserom.gba", 0x6B761C, 0x50
+
+gSong_86B766C:: @ 0x86B766C
+	.incbin "baserom.gba", 0x6B766C, 0x2C
+
+gSong_86B7698:: @ 0x86B7698
+	.incbin "baserom.gba", 0x6B7698, 0x20
+
+gSong_86B76B8:: @ 0x86B76B8
+	.incbin "baserom.gba", 0x6B76B8, 0x3C
+
+gSong_86B76F4:: @ 0x86B76F4
+	.incbin "baserom.gba", 0x6B76F4, 0x94
+
+gSong_86B7788:: @ 0x86B7788
+	.incbin "baserom.gba", 0x6B7788, 0x6C
+
+gSong_86B77F4:: @ 0x86B77F4
+	.incbin "baserom.gba", 0x6B77F4, 0x48
+
+gSong_86B783C:: @ 0x86B783C
+	.incbin "baserom.gba", 0x6B783C, 0xC4
+
+gSong_86B7900:: @ 0x86B7900
+	.incbin "baserom.gba", 0x6B7900, 0x54
+
+gSong_86B7954:: @ 0x86B7954
+	.incbin "baserom.gba", 0x6B7954, 0x80
+
+gSong_86B79D4:: @ 0x86B79D4
+	.incbin "baserom.gba", 0x6B79D4, 0x38
+
+gSong_86B7A0C:: @ 0x86B7A0C
+	.incbin "baserom.gba", 0x6B7A0C, 0x34
+
+gSong_86B7A40:: @ 0x86B7A40
+	.incbin "baserom.gba", 0x6B7A40, 0x40
+
+gSong_86B7A80:: @ 0x86B7A80
+	.incbin "baserom.gba", 0x6B7A80, 0x78
+
+gSong_86B7AF8:: @ 0x86B7AF8
+	.incbin "baserom.gba", 0x6B7AF8, 0x80
+
+gSong_86B7B78:: @ 0x86B7B78
+	.incbin "baserom.gba", 0x6B7B78, 0x58
+
+gSong_86B7BD0:: @ 0x86B7BD0
+	.incbin "baserom.gba", 0x6B7BD0, 0xA4
+
+gSong_86B7C74:: @ 0x86B7C74
+	.incbin "baserom.gba", 0x6B7C74, 0x4C
+
+gSong_86B7CC0:: @ 0x86B7CC0
+	.incbin "baserom.gba", 0x6B7CC0, 0x7C
+
+gSong_86B7D3C:: @ 0x86B7D3C
+	.incbin "baserom.gba", 0x6B7D3C, 0x4C
+
+gSong_86B7D88:: @ 0x86B7D88
+	.incbin "baserom.gba", 0x6B7D88, 0x34
+
+gSong_86B7DBC:: @ 0x86B7DBC
+	.incbin "baserom.gba", 0x6B7DBC, 0x4C
+
+gSong_86B7E08:: @ 0x86B7E08
+	.incbin "baserom.gba", 0x6B7E08, 0x60
+
+gSong_86B7E68:: @ 0x86B7E68
+	.incbin "baserom.gba", 0x6B7E68, 0x4C
+
+gSong_86B7EB4:: @ 0x86B7EB4
+	.incbin "baserom.gba", 0x6B7EB4, 0x84
+
+gSong_86B7F38:: @ 0x86B7F38
+	.incbin "baserom.gba", 0x6B7F38, 0x54
+
+gSong_86B7F8C:: @ 0x86B7F8C
+	.incbin "baserom.gba", 0x6B7F8C, 0xCC
+
+gSong_86B8058:: @ 0x86B8058
+	.incbin "baserom.gba", 0x6B8058, 0xA0
+
+gSong_86B80F8:: @ 0x86B80F8
+	.incbin "baserom.gba", 0x6B80F8, 0x3C
+
+gSong_86B8134:: @ 0x86B8134
+	.incbin "baserom.gba", 0x6B8134, 0x4C
+
+gSong_86B8180:: @ 0x86B8180
+	.incbin "baserom.gba", 0x6B8180, 0x84
+
+gSong_86B8204:: @ 0x86B8204
+	.incbin "baserom.gba", 0x6B8204, 0x70
+
+gSong_86B8274:: @ 0x86B8274
+	.incbin "baserom.gba", 0x6B8274, 0xD4
+
+gSong_86B8348:: @ 0x86B8348
+	.incbin "baserom.gba", 0x6B8348, 0xA4
+
+gSong_86B83EC:: @ 0x86B83EC
+	.incbin "baserom.gba", 0x6B83EC, 0x70
+
+gSong_86B845C:: @ 0x86B845C
+	.incbin "baserom.gba", 0x6B845C, 0x74
+
+gSong_86B84D0:: @ 0x86B84D0
+	.incbin "baserom.gba", 0x6B84D0, 0xE0
+
+gSong_86B85B0:: @ 0x86B85B0
+	.incbin "baserom.gba", 0x6B85B0, 0x3C
+
+gSong_86B85EC:: @ 0x86B85EC
+	.incbin "baserom.gba", 0x6B85EC, 0x68
+
+gSong_86B8654:: @ 0x86B8654
+	.incbin "baserom.gba", 0x6B8654, 0x7C
+
+gSong_86B86D0:: @ 0x86B86D0
+	.incbin "baserom.gba", 0x6B86D0, 0x4C
+
+gSong_86B871C:: @ 0x86B871C
+	.incbin "baserom.gba", 0x6B871C, 0x48
+
+gSong_86B8764:: @ 0x86B8764
+	.incbin "baserom.gba", 0x6B8764, 0x68
+
+gSong_86B87CC:: @ 0x86B87CC
+	.incbin "baserom.gba", 0x6B87CC, 0x9C
+
+gSong_86B8868:: @ 0x86B8868
+	.incbin "baserom.gba", 0x6B8868, 0x164
+
+gSong_86B89CC:: @ 0x86B89CC
+	.incbin "baserom.gba", 0x6B89CC, 0x68
+
+gSong_86B8A34:: @ 0x86B8A34
+	.incbin "baserom.gba", 0x6B8A34, 0x44
+
+gSong_86B8A78:: @ 0x86B8A78
+	.incbin "baserom.gba", 0x6B8A78, 0x7C
+
+gSong_86B8AF4:: @ 0x86B8AF4
+	.incbin "baserom.gba", 0x6B8AF4, 0x6C
+
+gSong_86B8B60:: @ 0x86B8B60
+	.incbin "baserom.gba", 0x6B8B60, 0x80
+
+gSong_86B8BE0:: @ 0x86B8BE0
+	.incbin "baserom.gba", 0x6B8BE0, 0x80
+
+gSong_86B8C60:: @ 0x86B8C60
+	.incbin "baserom.gba", 0x6B8C60, 0x9C
+
+gSong_86B8CFC:: @ 0x86B8CFC
+	.incbin "baserom.gba", 0x6B8CFC, 0x4C
+
+gSong_86B8D48:: @ 0x86B8D48
+	.incbin "baserom.gba", 0x6B8D48, 0x40
+
+gSong_86B8D88:: @ 0x86B8D88
+	.incbin "baserom.gba", 0x6B8D88, 0x78
+
+gSong_86B8E00:: @ 0x86B8E00
+	.incbin "baserom.gba", 0x6B8E00, 0x3C
+
+gSong_86B8E3C:: @ 0x86B8E3C
+	.incbin "baserom.gba", 0x6B8E3C, 0x58
+
+gSong_86B8E94:: @ 0x86B8E94
+	.incbin "baserom.gba", 0x6B8E94, 0xC8
+
+gSong_86B8F5C:: @ 0x86B8F5C
+	.incbin "baserom.gba", 0x6B8F5C, 0xF4
+
+gSong_86B9050:: @ 0x86B9050
+	.incbin "baserom.gba", 0x6B9050, 0x110
+
+gSong_86B9160:: @ 0x86B9160
+	.incbin "baserom.gba", 0x6B9160, 0x88
+
+gSong_86B91E8:: @ 0x86B91E8
+	.incbin "baserom.gba", 0x6B91E8, 0x48
+
+gSong_86B9230:: @ 0x86B9230
+	.incbin "baserom.gba", 0x6B9230, 0x60
+
+gSong_86B9290:: @ 0x86B9290
+	.incbin "baserom.gba", 0x6B9290, 0x4C
+
+gSong_86B92DC:: @ 0x86B92DC
+	.incbin "baserom.gba", 0x6B92DC, 0x88
+
+gSong_86B9364:: @ 0x86B9364
+	.incbin "baserom.gba", 0x6B9364, 0xBC
+
+gSong_86B9420:: @ 0x86B9420
+	.incbin "baserom.gba", 0x6B9420, 0x58
+
+gSong_86B9478:: @ 0x86B9478
+	.incbin "baserom.gba", 0x6B9478, 0x7C
+
+gSong_86B94F4:: @ 0x86B94F4
+	.incbin "baserom.gba", 0x6B94F4, 0xC8
+
+gSong_86B95BC:: @ 0x86B95BC
+	.incbin "baserom.gba", 0x6B95BC, 0xBC
+
+gSong_86B9678:: @ 0x86B9678
+	.incbin "baserom.gba", 0x6B9678, 0xEC
+
+gSong_86B9764:: @ 0x86B9764
+	.incbin "baserom.gba", 0x6B9764, 0x40
+
+gSong_86B97A4:: @ 0x86B97A4
+	.incbin "baserom.gba", 0x6B97A4, 0x5C
+
+gSong_86B9800:: @ 0x86B9800
+	.incbin "baserom.gba", 0x6B9800, 0x38
+
+gSong_86B9838:: @ 0x86B9838
+	.incbin "baserom.gba", 0x6B9838, 0xB4
+
+gSong_86B98EC:: @ 0x86B98EC
+	.incbin "baserom.gba", 0x6B98EC, 0xA0
+
+gSong_86B998C:: @ 0x86B998C
+	.incbin "baserom.gba", 0x6B998C, 0x68
+
+gSong_86B99F4:: @ 0x86B99F4
+	.incbin "baserom.gba", 0x6B99F4, 0x124
+
+gSong_86B9B18:: @ 0x86B9B18
+	.incbin "baserom.gba", 0x6B9B18, 0x7C
+
+gSong_86B9B94:: @ 0x86B9B94
+	.incbin "baserom.gba", 0x6B9B94, 0x5C
+
+gSong_86B9BF0:: @ 0x86B9BF0
+	.incbin "baserom.gba", 0x6B9BF0, 0x38
+
+gSong_86B9C28:: @ 0x86B9C28
+	.incbin "baserom.gba", 0x6B9C28, 0x50
+
+gSong_86B9C78:: @ 0x86B9C78
+	.incbin "baserom.gba", 0x6B9C78, 0x8C
+
+gSong_86B9D04:: @ 0x86B9D04
+	.incbin "baserom.gba", 0x6B9D04, 0x64
+
+gSong_86B9D68:: @ 0x86B9D68
+	.incbin "baserom.gba", 0x6B9D68, 0x78
+
+gSong_86B9DE0:: @ 0x86B9DE0
+	.incbin "baserom.gba", 0x6B9DE0, 0x68
+
+gSong_86B9E48:: @ 0x86B9E48
+	.incbin "baserom.gba", 0x6B9E48, 0x154
+
+gSong_86B9F9C:: @ 0x86B9F9C
+	.incbin "baserom.gba", 0x6B9F9C, 0xD4
+
+gSong_86BA070:: @ 0x86BA070
+	.incbin "baserom.gba", 0x6BA070, 0x110
+
+gSong_86BA180:: @ 0x86BA180
+	.incbin "baserom.gba", 0x6BA180, 0xE4
+
+gSong_86BA264:: @ 0x86BA264
+	.incbin "baserom.gba", 0x6BA264, 0xE0
+
+gSong_86BA344:: @ 0x86BA344
+	.incbin "baserom.gba", 0x6BA344, 0x4C
+
+gSong_86BA390:: @ 0x86BA390
+	.incbin "baserom.gba", 0x6BA390, 0x8C
+
+gSong_86BA41C:: @ 0x86BA41C
+	.incbin "baserom.gba", 0x6BA41C, 0x190
+
+gSong_86BA5AC:: @ 0x86BA5AC
+	.incbin "baserom.gba", 0x6BA5AC, 0x1A0
+
+gSong_86BA74C:: @ 0x86BA74C
+	.incbin "baserom.gba", 0x6BA74C, 0x70
+
+gSong_86BA7BC:: @ 0x86BA7BC
+	.incbin "baserom.gba", 0x6BA7BC, 0x50
+
+gSong_86BA80C:: @ 0x86BA80C
+	.incbin "baserom.gba", 0x6BA80C, 0x124
+
+gSong_86BA930:: @ 0x86BA930
+	.incbin "baserom.gba", 0x6BA930, 0x80
+
+gSong_86BA9B0:: @ 0x86BA9B0
+	.incbin "baserom.gba", 0x6BA9B0, 0xF0
+
+gSong_86BAAA0:: @ 0x86BAAA0
+	.incbin "baserom.gba", 0x6BAAA0, 0x64
+
+gSong_86BAB04:: @ 0x86BAB04
+	.incbin "baserom.gba", 0x6BAB04, 0x5C
+
+gSong_86BAB60:: @ 0x86BAB60
+	.incbin "baserom.gba", 0x6BAB60, 0xB4
+
+gSong_86BAC14:: @ 0x86BAC14
+	.incbin "baserom.gba", 0x6BAC14, 0x1FC
+
+gSong_86BAE10:: @ 0x86BAE10
+	.incbin "baserom.gba", 0x6BAE10, 0x120
+
+gSong_86BAF30:: @ 0x86BAF30
+	.incbin "baserom.gba", 0x6BAF30, 0x170
+
+gSong_86BB0A0:: @ 0x86BB0A0
+	.incbin "baserom.gba", 0x6BB0A0, 0x70
+
+gSong_86BB110:: @ 0x86BB110
+	.incbin "baserom.gba", 0x6BB110, 0x98
+
+gSong_86BB1A8:: @ 0x86BB1A8
+	.incbin "baserom.gba", 0x6BB1A8, 0x38
+
+gSong_86BB1E0:: @ 0x86BB1E0
+	.incbin "baserom.gba", 0x6BB1E0, 0xD8
+
+gSong_86BB2B8:: @ 0x86BB2B8
+	.incbin "baserom.gba", 0x6BB2B8, 0xD8
+
+gSong_86BB390:: @ 0x86BB390
+	.incbin "baserom.gba", 0x6BB390, 0xAC
+
+gSong_86BB43C:: @ 0x86BB43C
+	.incbin "baserom.gba", 0x6BB43C, 0x98
+
+gSong_86BB4D4:: @ 0x86BB4D4
+	.incbin "baserom.gba", 0x6BB4D4, 0x98
+
+gSong_86BB56C:: @ 0x86BB56C
+	.incbin "baserom.gba", 0x6BB56C, 0xA8
+
+gSong_86BB614:: @ 0x86BB614
+	.incbin "baserom.gba", 0x6BB614, 0x4C
+
+gSong_86BB660:: @ 0x86BB660
+	.incbin "baserom.gba", 0x6BB660, 0xFC
+
+gSong_86BB75C:: @ 0x86BB75C
+	.incbin "baserom.gba", 0x6BB75C, 0x94
+
+gSong_86BB7F0:: @ 0x86BB7F0
+	.incbin "baserom.gba", 0x6BB7F0, 0x64
+
+gSong_86BB854:: @ 0x86BB854
+	.incbin "baserom.gba", 0x6BB854, 0x9C
+
+gSong_86BB8F0:: @ 0x86BB8F0
+	.incbin "baserom.gba", 0x6BB8F0, 0x208
+
+gSong_86BBAF8:: @ 0x86BBAF8
+	.incbin "baserom.gba", 0x6BBAF8, 0xFC
+
+gSong_86BBBF4:: @ 0x86BBBF4
+	.incbin "baserom.gba", 0x6BBBF4, 0xF0
+
+gSong_86BBCE4:: @ 0x86BBCE4
+	.incbin "baserom.gba", 0x6BBCE4, 0x84
+
+gSong_86BBD68:: @ 0x86BBD68
+	.incbin "baserom.gba", 0x6BBD68, 0x74
+
+gSong_86BBDDC:: @ 0x86BBDDC
+	.incbin "baserom.gba", 0x6BBDDC, 0x180
+
+gSong_86BBF5C:: @ 0x86BBF5C
+	.incbin "baserom.gba", 0x6BBF5C, 0x104
+
+gSong_86BC060:: @ 0x86BC060
+	.incbin "baserom.gba", 0x6BC060, 0x60
+
+gSong_86BC0C0:: @ 0x86BC0C0
+	.incbin "baserom.gba", 0x6BC0C0, 0x70
+
+gSong_86BC130:: @ 0x86BC130
+	.incbin "baserom.gba", 0x6BC130, 0x11C
+
+gSong_86BC24C:: @ 0x86BC24C
+	.incbin "baserom.gba", 0x6BC24C, 0xA4
+
+gSong_86BC2F0:: @ 0x86BC2F0
+	.incbin "baserom.gba", 0x6BC2F0, 0x170
+
+gSong_86BC460:: @ 0x86BC460
+	.incbin "baserom.gba", 0x6BC460, 0x134
+
+gSong_86BC594:: @ 0x86BC594
+	.incbin "baserom.gba", 0x6BC594, 0x84
+
+gSong_86BC618:: @ 0x86BC618
+	.incbin "baserom.gba", 0x6BC618, 0x58
+
+gSong_86BC670:: @ 0x86BC670
+	.incbin "baserom.gba", 0x6BC670, 0x30
+
+gSong_86BC6A0:: @ 0x86BC6A0
+	.incbin "baserom.gba", 0x6BC6A0, 0x38
+
+gSong_86BC6D8:: @ 0x86BC6D8
+	.incbin "baserom.gba", 0x6BC6D8, 0x8C
+
+gSong_86BC764:: @ 0x86BC764
+	.incbin "baserom.gba", 0x6BC764, 0x38
+
+gSong_86BC79C:: @ 0x86BC79C
+	.incbin "baserom.gba", 0x6BC79C, 0x44
+
+gSong_86BC7E0:: @ 0x86BC7E0
+	.incbin "baserom.gba", 0x6BC7E0, 0x40
+
+gSong_86BC820:: @ 0x86BC820
+	.incbin "baserom.gba", 0x6BC820, 0x28
+
+gSong_86BC848:: @ 0x86BC848
+	.incbin "baserom.gba", 0x6BC848, 0xB8
+
+gSong_86BC900:: @ 0x86BC900
+	.incbin "baserom.gba", 0x6BC900, 0x74
+
+gSong_86BC974:: @ 0x86BC974
+	.incbin "baserom.gba", 0x6BC974, 0x6C
+
+gSong_86BC9E0:: @ 0x86BC9E0
+	.incbin "baserom.gba", 0x6BC9E0, 0x48
+
+gSong_86BCA28:: @ 0x86BCA28
+	.incbin "baserom.gba", 0x6BCA28, 0xE0
+
+gSong_86BCB08:: @ 0x86BCB08
+	.incbin "baserom.gba", 0x6BCB08, 0xC0
+
+gSong_86BCBC8:: @ 0x86BCBC8
+	.incbin "baserom.gba", 0x6BCBC8, 0x34
+
+gSong_86BCBFC:: @ 0x86BCBFC
+	.incbin "baserom.gba", 0x6BCBFC, 0xBC
+
+gSong_86BCCB8:: @ 0x86BCCB8
+	.incbin "baserom.gba", 0x6BCCB8, 0xE0
+
+gSong_86BCD98:: @ 0x86BCD98
+	.incbin "baserom.gba", 0x6BCD98, 0x14C
+
+gSong_86BCEE4:: @ 0x86BCEE4
+	.incbin "baserom.gba", 0x6BCEE4, 0x19C
+
+gSong_86BD080:: @ 0x86BD080
+	.incbin "baserom.gba", 0x6BD080, 0x2D8
+
+gSong_86BD358:: @ 0x86BD358
+	.incbin "baserom.gba", 0x6BD358, 0x18C
+
+gSong_86BD4E4:: @ 0x86BD4E4
+	.incbin "baserom.gba", 0x6BD4E4, 0xD8
+
+gSong_86BD5BC:: @ 0x86BD5BC
+	.incbin "baserom.gba", 0x6BD5BC, 0x6C
+
+gSong_86BD628:: @ 0x86BD628
+	.incbin "baserom.gba", 0x6BD628, 0x570
+
+gSong_86BDB98:: @ 0x86BDB98
+	.incbin "baserom.gba", 0x6BDB98, 0xE2C
+
+gSong_86BE9C4:: @ 0x86BE9C4
+	.incbin "baserom.gba", 0x6BE9C4, 0x10A4
+
+gSong_86BFA68:: @ 0x86BFA68
+	.incbin "baserom.gba", 0x6BFA68, 0x358
+
+gSong_86BFDC0:: @ 0x86BFDC0
+	.incbin "baserom.gba", 0x6BFDC0, 0x220
+
+gSong_86BFFE0:: @ 0x86BFFE0
+	.incbin "baserom.gba", 0x6BFFE0, 0x140
+
+gSong_86C0120:: @ 0x86C0120
+	.incbin "baserom.gba", 0x6C0120, 0xE4
+
+gSong_86C0204:: @ 0x86C0204
+	.incbin "baserom.gba", 0x6C0204, 0xF8
+
+gSong_86C02FC:: @ 0x86C02FC
+	.incbin "baserom.gba", 0x6C02FC, 0x4E8
+
+gSong_86C07E4:: @ 0x86C07E4
+	.incbin "baserom.gba", 0x6C07E4, 0xF3C
+
+gSong_86C1720:: @ 0x86C1720
+	.incbin "baserom.gba", 0x6C1720, 0x1C24
+
+gSong_86C3344:: @ 0x86C3344
+	.incbin "baserom.gba", 0x6C3344, 0xA0C
+
+gSong_86C3D50:: @ 0x86C3D50
+	.incbin "baserom.gba", 0x6C3D50, 0x298
+
+gSong_86C3FE8:: @ 0x86C3FE8
+	.incbin "baserom.gba", 0x6C3FE8, 0xB00
+
+gSong_86C4AE8:: @ 0x86C4AE8
+	.incbin "baserom.gba", 0x6C4AE8, 0x1074
+
+gSong_86C5B5C:: @ 0x86C5B5C
+	.incbin "baserom.gba", 0x6C5B5C, 0xED4
+
+gSong_86C6A30:: @ 0x86C6A30
+	.incbin "baserom.gba", 0x6C6A30, 0xD2C
+
+gSong_86C775C:: @ 0x86C775C
+	.incbin "baserom.gba", 0x6C775C, 0x54
+
+gSong_86C77B0:: @ 0x86C77B0
+	.incbin "baserom.gba", 0x6C77B0, 0xC14
+
+gSong_86C83C4:: @ 0x86C83C4
+	.incbin "baserom.gba", 0x6C83C4, 0x3C0
+
+gSong_86C8784:: @ 0x86C8784
+	.incbin "baserom.gba", 0x6C8784, 0x3B8
+
+gSong_86C8B3C:: @ 0x86C8B3C
+	.incbin "baserom.gba", 0x6C8B3C, 0x4A8
+
+gSong_86C8FE4:: @ 0x86C8FE4
+	.incbin "baserom.gba", 0x6C8FE4, 0xABC
+
+gSong_86C9AA0:: @ 0x86C9AA0
+	.incbin "baserom.gba", 0x6C9AA0, 0x1218
+
+gSong_86CACB8:: @ 0x86CACB8
+	.incbin "baserom.gba", 0x6CACB8, 0x1450
+
+gSong_86CC108:: @ 0x86CC108
+	.incbin "baserom.gba", 0x6CC108, 0x123C
+
+gSong_86CD344:: @ 0x86CD344
+	.incbin "baserom.gba", 0x6CD344, 0x4010
+
+gSong_86D1354:: @ 0x86D1354
+	.incbin "baserom.gba", 0x6D1354, 0xA88
+
+gSong_86D1DDC:: @ 0x86D1DDC
+	.incbin "baserom.gba", 0x6D1DDC, 0x870
+
+gSong_86D264C:: @ 0x86D264C
+	.incbin "baserom.gba", 0x6D264C, 0xF3C
+
+gSong_86D3588:: @ 0x86D3588
+	.incbin "baserom.gba", 0x6D3588, 0xD74
+
+gSong_86D42FC:: @ 0x86D42FC
+	.incbin "baserom.gba", 0x6D42FC, 0xD40
+
+gSong_86D503C:: @ 0x86D503C
+	.incbin "baserom.gba", 0x6D503C, 0x1AE4
+
+gSong_86D6B20:: @ 0x86D6B20
+	.incbin "baserom.gba", 0x6D6B20, 0x2B74
+
+gSong_86D9694:: @ 0x86D9694
+	.incbin "baserom.gba", 0x6D9694, 0x117C
+
+gSong_86DA810:: @ 0x86DA810
+	.incbin "baserom.gba", 0x6DA810, 0x27D0
+
+gSong_86DCFE0:: @ 0x86DCFE0
+	.incbin "baserom.gba", 0x6DCFE0, 0x864
+
+gSong_86DD844:: @ 0x86DD844
+	.incbin "baserom.gba", 0x6DD844, 0x79C
+
+gSong_86DDFE0:: @ 0x86DDFE0
+	.incbin "baserom.gba", 0x6DDFE0, 0x98C
+
+gSong_86DE96C:: @ 0x86DE96C
+	.incbin "baserom.gba", 0x6DE96C, 0xA60
+
+gSong_86DF3CC:: @ 0x86DF3CC
+	.incbin "baserom.gba", 0x6DF3CC, 0x12A4
+
+gSong_86E0670:: @ 0x86E0670
+	.incbin "baserom.gba", 0x6E0670, 0x978
+
+gSong_86E0FE8:: @ 0x86E0FE8
+	.incbin "baserom.gba", 0x6E0FE8, 0x8CC
+
+gSong_86E18B4:: @ 0x86E18B4
+	.incbin "baserom.gba", 0x6E18B4, 0x16F4
+
+gSong_86E2FA8:: @ 0x86E2FA8
+	.incbin "baserom.gba", 0x6E2FA8, 0xA3C
+
+gSong_86E39E4:: @ 0x86E39E4
+	.incbin "baserom.gba", 0x6E39E4, 0xB80
+
+gSong_86E4564:: @ 0x86E4564
+	.incbin "baserom.gba", 0x6E4564, 0x1180
+
+gSong_86E56E4:: @ 0x86E56E4
+	.incbin "baserom.gba", 0x6E56E4, 0x538
+
+gSong_86E5C1C:: @ 0x86E5C1C
+	.incbin "baserom.gba", 0x6E5C1C, 0xEF0
+
+gSong_86E6B0C:: @ 0x86E6B0C
+	.incbin "baserom.gba", 0x6E6B0C, 0xE14
+
+gSong_86E7920:: @ 0x86E7920
+	.incbin "baserom.gba", 0x6E7920, 0xEF0
+
+gSong_86E8810:: @ 0x86E8810
+	.incbin "baserom.gba", 0x6E8810, 0x83C
+
+gSong_86E904C:: @ 0x86E904C
+	.incbin "baserom.gba", 0x6E904C, 0x7D4
+
+gSong_86E9820:: @ 0x86E9820
+	.incbin "baserom.gba", 0x6E9820, 0x200
+
+gSong_86E9A20:: @ 0x86E9A20
+	.incbin "baserom.gba", 0x6E9A20, 0x200
+
+gSong_86E9C20:: @ 0x86E9C20
+	.incbin "baserom.gba", 0x6E9C20, 0x370
+
+gSong_86E9F90:: @ 0x86E9F90
+	.incbin "baserom.gba", 0x6E9F90, 0x170
+
+gSong_86EA100:: @ 0x86EA100
+	.incbin "baserom.gba", 0x6EA100, 0x904
+
+gSong_86EAA04:: @ 0x86EAA04
+	.incbin "baserom.gba", 0x6EAA04, 0x438
+
+gSong_86EAE3C:: @ 0x86EAE3C
+	.incbin "baserom.gba", 0x6EAE3C, 0x8C
+
+gSong_86EAEC8:: @ 0x86EAEC8
+	.incbin "baserom.gba", 0x6EAEC8, 0x1D0
+
+gSong_86EB098:: @ 0x86EB098
+	.incbin "baserom.gba", 0x6EB098, 0xBC
+
+gSong_86EB154:: @ 0x86EB154
+	.incbin "baserom.gba", 0x6EB154, 0xF74
+
+gSong_86EC0C8:: @ 0x86EC0C8
+	.incbin "baserom.gba", 0x6EC0C8, 0xF7C
+
+gSong_86ED044:: @ 0x86ED044
+	.incbin "baserom.gba", 0x6ED044, 0xA5C
+
+gSong_86EDAA0:: @ 0x86EDAA0
+	.incbin "baserom.gba", 0x6EDAA0, 0x480
+
+gSong_86EDF20:: @ 0x86EDF20
+	.incbin "baserom.gba", 0x6EDF20, 0xF2C
+
+gSong_86EEE4C:: @ 0x86EEE4C
+	.incbin "baserom.gba", 0x6EEE4C, 0x1404
+
+gSong_86F0250:: @ 0x86F0250
+	.incbin "baserom.gba", 0x6F0250, 0x4F0
+
+gSong_86F0740:: @ 0x86F0740
+	.incbin "baserom.gba", 0x6F0740, 0xEC0
+
+gSong_86F1600:: @ 0x86F1600
+	.incbin "baserom.gba", 0x6F1600, 0x121C
+
+gSong_86F281C:: @ 0x86F281C
+	.incbin "baserom.gba", 0x6F281C, 0xEF4
+
+gSong_86F3710:: @ 0x86F3710
+	.incbin "baserom.gba", 0x6F3710, 0x1028
+
+gSong_86F4738:: @ 0x86F4738
+	.incbin "baserom.gba", 0x6F4738, 0xF30
+
+gSong_86F5668:: @ 0x86F5668
+	.incbin "baserom.gba", 0x6F5668, 0x1C4
+
+gSong_86F582C:: @ 0x86F582C
+	.incbin "baserom.gba", 0x6F582C, 0x2188
+
+gSong_86F79B4:: @ 0x86F79B4
+	.incbin "baserom.gba", 0x6F79B4, 0x1178
+
+gSong_86F8B2C:: @ 0x86F8B2C
+	.incbin "baserom.gba", 0x6F8B2C, 0x12B8
 
-gUnknown_848E144:: @ 848E144
-	.incbin "baserom.gba", 0x48E144, 0x600
+gSong_86F9DE4:: @ 0x86F9DE4
+	.incbin "baserom.gba", 0x6F9DE4, 0x444
 
-gUnknown_848E744:: @ 848E744
-	.incbin "baserom.gba", 0x48E744, 0x600
+gSong_86FA228:: @ 0x86FA228
+	.incbin "baserom.gba", 0x6FA228, 0x948
 
-gUnknown_848ED44:: @ 848ED44
-	.incbin "baserom.gba", 0x48ED44, 0x14558
+gSong_86FAB70:: @ 0x86FAB70
+	.incbin "baserom.gba", 0x6FAB70, 0xA00
 
-gMPlayTable:: @ 84A329C
-	.incbin "baserom.gba", 0x4A329C, 0x30
+gSong_86FB570:: @ 0x86FB570
+	.incbin "baserom.gba", 0x6FB570, 0x840
 
-gSongTable:: @ 84A32CC
-	.incbin "baserom.gba", 0x4A32CC, 0x243840
+gSong_86FBDB0:: @ 0x86FBDB0
+	.incbin "baserom.gba", 0x6FBDB0, 0xDC
 
-gUnknown_86E6B0C:: @ 86E6B0C
-	.incbin "baserom.gba", 0x6E6B0C, 0x15398
+gSong_86FBE8C:: @ 0x86FBE8C
+	.incbin "baserom.gba", 0x6FBE8C, 0x18
diff --git a/data/specials.inc b/data/specials.inc
index 171a6fd8e..96d0ef253 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -2,11 +2,11 @@
 .global SPECIAL_\ptr
 .set SPECIAL_\ptr, __special__
 .set __special__, __special__ + 1
-    .4byte \ptr
-    .endm
+	.4byte \ptr
+	.endm
 
 .set __special__, 0
-    .align 2
+	.align 2
 
 gSpecials:: @ 815FD60
 	def_special sp000_heal_pokemon
@@ -40,7 +40,7 @@ gSpecials:: @ 815FD60
 	def_special sub_8081064
 	def_special sub_80810CC
 	def_special sub_80810F4
-	def_special sub_80098B8
+	def_special CloseLink
 	def_special sub_80819C8
 	def_special sub_8081978
 	def_special sub_80819B8
@@ -139,7 +139,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special sub_80BDB1C
 	def_special nullsub_75
-	def_special sub_809A540
+	def_special RegisteredItemHandleBikeSwap
 	def_special CalculatePlayerPartyCount
 	def_special CountPartyNonEggMons
 	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
@@ -191,7 +191,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special sub_80CA74C
 	def_special GetDaycareMonNicknames
-	def_special sub_80464B4
+	def_special GetDaycareState
 	def_special RejectEggFromDayCare
 	def_special GiveEggFromDaycare
 	def_special SetDaycareCompatibilityString
@@ -203,7 +203,7 @@ gSpecials:: @ 815FD60
 	def_special GetDaycareCost
 	def_special TakePokemonFromDaycare
 	def_special ScriptHatchMon
-	def_special sub_8046FD4
+	def_special EggHatch
 	def_special sub_8046EAC
 	def_special sub_80CD228
 	def_special IsEnoughForCostInVar0x8005
@@ -221,7 +221,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
-	def_special sub_80CA3D8
+	def_special Special_GetPokedexCount
 	def_special sub_80CA524
 	def_special sub_80CA86C
 	def_special sub_80CA9A8
@@ -306,7 +306,7 @@ gSpecials:: @ 815FD60
 	def_special ScrSpecial_AreLeadMonEVsMaxedOut
 	def_special sub_8069740
 	def_special sub_8069768
-	def_special sub_8141D9C
+	def_special InitRoamer
 	def_special nullsub_75
 	def_special sub_80CA804
 	def_special nullsub_75
@@ -327,8 +327,8 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special sub_807B6C0
-	def_special sp13E_warp_to_last_warp
-	def_special sp13F_fall_to_last_warp
+	def_special DoDiveWarp
+	def_special DoFallWarp
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special sub_80E5E70
@@ -363,7 +363,7 @@ gSpecials:: @ 815FD60
 	def_special GetDaycarePokemonCount
 	def_special sub_80CB63C
 	def_special sub_80CBD80
-	def_special sub_80CBDB0
+	def_special ScrSpecial_GetStarter
 	def_special sub_80CBDCC
 	def_special sub_810C444
 	def_special sub_80CC7B4
@@ -383,17 +383,17 @@ gSpecials:: @ 815FD60
 	def_special SetFlavorTextFlagFromSpecialVars
 	def_special UpdatePickStateFromSpecialVar8005
 	def_special sub_8054C48
-	def_special sub_8046B40
-	def_special sub_8046B70
-	def_special sub_8046B94
-	def_special sub_8046BBC
-	def_special sub_8046BDC
-	def_special sub_8146E78
+	def_special PutMonInRoute5Daycare
+	def_special GetCostToWithdrawRoute5DaycareMon
+	def_special IsThereMonInRoute5Daycare
+	def_special GetNumLevelsGainedForRoute5DaycareMon
+	def_special TakePokemonFromRoute5Daycare
+	def_special ScrSpecial_SeaGallopFerry
 	def_special sub_80CC48C
 	def_special sub_812B220
 	def_special sub_812B234
 	def_special sub_812B248
-	def_special sub_8143FC8
+	def_special ValidateReceivedWonderCard
 	def_special sub_810B810
 	def_special sub_811999C
 	def_special sp182_move_string
@@ -410,7 +410,7 @@ gSpecials:: @ 815FD60
 	def_special sub_8127888
 	def_special sub_80803FC
 	def_special sub_812B35C
-	def_special sub_815D334
+	def_special Special_SSAnneDepartureCutscene
 	def_special sub_8149A18
 	def_special sub_806E25C
 	def_special sub_815D9E8
@@ -420,7 +420,7 @@ gSpecials:: @ 815FD60
 	def_special sub_812B478
 	def_special sub_812B484
 	def_special sub_810B82C
-	def_special sub_8099FAC
+	def_special CheckHasAtLeastOneBerry
 	def_special sub_815F094
 	def_special sub_815F114
 	def_special sub_815EEB0
diff --git a/data/start_menu.s b/data/start_menu.s
new file mode 100644
index 000000000..e004a6628
--- /dev/null
+++ b/data/start_menu.s
@@ -0,0 +1,28 @@
+	.section .rodata
+	.align 2
+gUnknown_83A7344:: @ 83A7344
+	.incbin "baserom.gba", 0x3A7344, 0x48
+
+gUnknown_83A738C:: @ 83A738C
+	.incbin "baserom.gba", 0x3A738C, 0x8
+
+gUnknown_83A7394:: @ 83A7394
+	.incbin "baserom.gba", 0x3A7394, 0x24
+
+gUnknown_83A73B8:: @ 83A73B8
+	.incbin "baserom.gba", 0x3A73B8, 0x4
+
+gUnknown_83A73BC:: @ 83A73BC
+	.incbin "baserom.gba", 0x3A73BC, 0x10
+
+gUnknown_83A73CC:: @ 83A73CC
+	.incbin "baserom.gba", 0x3A73CC, 0x8
+
+gUnknown_83A73D4:: @ 83A73D4
+	.incbin "baserom.gba", 0x3A73D4, 0x4
+
+gUnknown_83A73D8:: @ 83A73D8
+	.incbin "baserom.gba", 0x3A73D8, 0x4
+
+gUnknown_83A73DC:: @ 83A73DC
+	.incbin "baserom.gba", 0x3A73DC, 0x284
diff --git a/data/strings.s b/data/strings.s
new file mode 100644
index 000000000..9490372e7
--- /dev/null
+++ b/data/strings.s
@@ -0,0 +1,2191 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+gExpandedPlaceholder_Empty:: @ 8415A20
+	.incbin "baserom.gba", 0x415A20, 0x1
+
+gExpandedPlaceholder_Kun:: @ 8415A21
+	.incbin "baserom.gba", 0x415A21, 0x1
+
+gExpandedPlaceholder_Chan:: @ 8415A22
+	.incbin "baserom.gba", 0x415A22, 0xA
+
+gExpandedPlaceholder_Ruby:: @ 8415A2C
+	.incbin "baserom.gba", 0x415A2C, 0x5
+
+gExpandedPlaceholder_Aqua:: @ 8415A31
+	.incbin "baserom.gba", 0x415A31, 0x5
+
+gExpandedPlaceholder_Magma:: @ 8415A36
+	.incbin "baserom.gba", 0x415A36, 0x6
+
+gExpandedPlaceholder_Archie:: @ 8415A3C
+	.incbin "baserom.gba", 0x415A3C, 0x7
+
+gExpandedPlaceholder_Maxie:: @ 8415A43
+	.incbin "baserom.gba", 0x415A43, 0x6
+
+gExpandedPlaceholder_Kyogre:: @ 8415A49
+	.incbin "baserom.gba", 0x415A49, 0x7
+
+gExpandedPlaceholder_Groudon:: @ 8415A50
+	.incbin "baserom.gba", 0x415A50, 0x8
+
+gExpandedPlaceholder_Red:: @ 8415A58
+	.incbin "baserom.gba", 0x415A58, 0x4
+
+gExpandedPlaceholder_Green:: @ 8415A5C
+	.incbin "baserom.gba", 0x415A5C, 0x6
+
+gText_EggNickname:: @ 8415A62
+	.incbin "baserom.gba", 0x415A62, 0x4
+
+gText_Pokemon:: @ 8415A66
+	.incbin "baserom.gba", 0x415A66, 0x8
+
+gUnknown_8415A6E:: @ 8415A6E
+	.incbin "baserom.gba", 0x415A6E, 0x9
+
+gUnknown_8415A77:: @ 8415A77
+	.incbin "baserom.gba", 0x415A77, 0x20
+
+gUnknown_8415A97:: @ 8415A97
+	.incbin "baserom.gba", 0x415A97, 0xD
+
+gUnknown_8415AA4:: @ 8415AA4
+	.incbin "baserom.gba", 0x415AA4, 0x27
+
+gUnknown_8415ACB:: @ 8415ACB
+	.incbin "baserom.gba", 0x415ACB, 0x134
+
+gUnknown_8415BFF:: @ 8415BFF
+	.incbin "baserom.gba", 0x415BFF, 0x43
+
+gUnknown_8415C42:: @ 8415C42
+	.incbin "baserom.gba", 0x415C42, 0x22
+
+gUnknown_8415C64:: @ 8415C64
+	.incbin "baserom.gba", 0x415C64, 0x84
+
+gUnknown_8415CE8:: @ 8415CE8
+	.incbin "baserom.gba", 0x415CE8, 0x44
+
+gText_Controls:: @ 8415D2C
+	.string "CONTROLS$"
+
+	.align 2
+gUnknown_8415D38:: @ 8415D2C
+	.string "{KEYGFX_DPAD_UP_DOWN}えらぶ {KEYGFX_A_BUTTON}けってい$"
+
+	.align 2
+gText_ABUTTONNext:: @ 8415D48
+	.string "{KEYGFX_A_BUTTON}NEXT$"
+
+	.align 2
+gText_ABUTTONNext_BBUTTONBack:: @ 8415D50
+	.string "{KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}BACK$"
+
+	.align 2
+gText_UPDOWNPick_ABUTTONNext_BBUTTONBack:: @ 8415D60
+	.string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}CANCEL$"
+
+	.align 2
+gText_UPDOWNPick_ABUTTONBBUTTONCancel:: @ 8415D78
+	.string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}{KEYGFX_B_BUTTON}CANCEL$"
+
+	.align 2
+gText_ABUTTONExit:: @ 8415D8C
+	.string "{KEYGFX_A_BUTTON}EXIT$"
+
+gText_Boy:: @ 8415D93
+	.string "BOY$"
+
+gText_Girl:: @ 8415D97
+	.string "GIRL$"
+
+gUnknown_8415D9C:: @ 8415D9C
+	.incbin "baserom.gba", 0x415D9C, 0x1C
+
+gUnknown_8415DB8:: @ 8415DB8
+	.incbin "baserom.gba", 0x415DB8, 0xC
+
+gUnknown_8415DC4:: @ 8415DC4
+	.incbin "baserom.gba", 0x415DC4, 0x6
+
+gUnknown_8415DCA:: @ 8415DCA
+	.incbin "baserom.gba", 0x415DCA, 0x7
+
+gUnknown_8415DD1:: @ 8415DD1
+	.incbin "baserom.gba", 0x415DD1, 0x6
+
+gUnknown_8415DD7:: @ 8415DD7
+	.incbin "baserom.gba", 0x415DD7, 0x166
+
+gUnknown_8415F3D:: @ 8415F3D
+	.incbin "baserom.gba", 0x415F3D, 0xD
+
+gUnknown_8415F4A:: @ 8415F4A
+	.incbin "baserom.gba", 0x415F4A, 0x7
+
+gText_PickOKExit:: @ 8415F51
+	.incbin "baserom.gba", 0x415F51, 0x15
+
+gUnknown_8415F66:: @ 8415F66
+	.incbin "baserom.gba", 0x415F66, 0x6
+
+gUnknown_8415F6C:: @ 8415F6C
+	.incbin "baserom.gba", 0x415F6C, 0x23
+
+gUnknown_8415F8F:: @ 8415F8F
+	.incbin "baserom.gba", 0x415F8F, 0x9
+
+gUnknown_8415F98:: @ 8415F98
+	.incbin "baserom.gba", 0x415F98, 0x3
+
+gUnknown_8415F9B:: @ 8415F9B
+	.incbin "baserom.gba", 0x415F9B, 0x5
+
+gUnknown_8415FA0:: @ 8415FA0
+	.incbin "baserom.gba", 0x415FA0, 0xD
+
+gUnknown_8415FAD:: @ 8415FAD
+	.incbin "baserom.gba", 0x415FAD, 0x6
+
+gUnknown_8415FB3:: @ 8415FB3
+	.incbin "baserom.gba", 0x415FB3, 0x15
+
+gUnknown_8415FC8:: @ 8415FC8
+	.incbin "baserom.gba", 0x415FC8, 0x7
+
+gUnknown_8415FCF:: @ 8415FCF
+	.incbin "baserom.gba", 0x415FCF, 0x19
+
+gUnknown_8415FE8:: @ 8415FE8
+	.incbin "baserom.gba", 0x415FE8, 0x5
+
+gUnknown_8415FED:: @ 8415FED
+	.incbin "baserom.gba", 0x415FED, 0x5
+
+gUnknown_8415FF2:: @ 8415FF2
+	.incbin "baserom.gba", 0x415FF2, 0xD
+
+gUnknown_8415FFF:: @ 8415FFF
+	.incbin "baserom.gba", 0x415FFF, 0x3
+
+gUnknown_8416002:: @ 8416002
+	.incbin "baserom.gba", 0x416002, 0x6
+
+gUnknown_8416008:: @ 8416008
+	.incbin "baserom.gba", 0x416008, 0x88
+
+gUnknown_8416090:: @ 8416090
+	.incbin "baserom.gba", 0x416090, 0x24
+
+gUnknown_84160B4:: @ 84160B4
+	.incbin "baserom.gba", 0x4160B4, 0x14
+
+gUnknown_84160C8:: @ 84160C8
+	.incbin "baserom.gba", 0x4160C8, 0x24
+
+gUnknown_84160EC:: @ 84160EC
+	.incbin "baserom.gba", 0x4160EC, 0x8
+
+gUnknown_84160F4:: @ 84160F4
+	.incbin "baserom.gba", 0x4160F4, 0x8
+
+gUnknown_84160FC:: @ 84160FC
+	.incbin "baserom.gba", 0x4160FC, 0x8
+
+gUnknown_8416104:: @ 8416104
+	.incbin "baserom.gba", 0x416104, 0x47
+
+gUnknown_841614B:: @ 841614B
+	.incbin "baserom.gba", 0x41614B, 0x2F
+
+gUnknown_841617A:: @ 841617A
+	.incbin "baserom.gba", 0x41617A, 0x7
+
+gUnknown_8416181:: @ 8416181
+	.incbin "baserom.gba", 0x416181, 0x7
+
+gUnknown_8416188:: @ 8416188
+	.incbin "baserom.gba", 0x416188, 0x8
+
+gUnknown_8416190:: @ 8416190
+	.string "TIME$"
+
+gUnknown_8416195::
+	.string "どこへ とびますか?$"
+
+gOtherText_Use::
+	.string "USE$"
+
+gUnknown_84161A4::
+	.string "TOSS$"
+
+gUnknown_84161A9::
+	.string "REGISTER$"
+
+gOtherText_Give::
+	.string "GIVE$"
+
+gUnknown_84161B7::
+	.string "けってい$"
+
+gUnknown_84161BC::
+	.string "WALK$"
+
+gFameCheckerText_Cancel:: @ 84161C1
+	.string "CANCEL$"
+
+gOtherText_Exit:: @ 84161C8
+	.string "EXIT$"
+
+gUnknown_84161CD:: @ 84161CD
+	.string "$"
+
+gUnknown_84161CE::
+	.string "キャンセル$"
+
+gUnknown_84161D4::
+	.string "ITEM$"
+
+gUnknown_84161D9::
+	.string "MAIL$"
+
+gUnknown_84161DE::
+	.string "TAKE$"
+
+gUnknown_84161E3::
+	.string "STORE$"
+
+gUnknown_84161E9::
+	.string "CHECK$"
+
+gUnknown_84161EF:: @ 84161EF
+	.string "NONE$"
+
+gUnknown_84161F4::
+	.string "OPEN$"
+
+gUnknown_84161F9::
+	.string "DESELECT$"
+
+gUnknown_8416202:: @ 8416202
+	.string "???$"
+
+gUnknown_8416206::
+	.string "?????$"
+
+gUnknown_841620C:: @ 841620C
+	.string "/$"
+
+gUnknown_841620E:: @ 841620E
+	.string "-$"
+
+gUnknown_8416210:: @ 8416210
+	.string "--$"
+
+gText_ThreeHyphens:: @ 8416213
+	.string "---$"
+
+gUnknown_8416217:: @ 8416217
+	.string "-------$"
+
+gUnknown_841621F:: @ 841621F
+	.string "♂$"
+
+gUnknown_8416221:: @ 8416221
+	.string "♀$"
+
+gText_Lv:: @ 8416223
+	.string "{EXTRA_LV}$"
+
+gOtherText_UnkF9_08_Clear_01:: @ 8416226
+	.string "{EXTRA_NO}{CLEAR 0x01}$"
+
+gUnknown_841622C::
+	.string "{EXTRA_PLUS}$"
+
+gUnknown_841622F::
+	.string "{ESCAPE 0x03}$"
+
+gUnknown_8416233::
+	.string "{EXTRA_ID}{EXTRA_NO}$"
+
+gUnknown_8416238:: @ 8416238
+	.string "{EXTRA_PP}$"
+
+gFameCheckerText_ListMenuCursor:: @ 841623B
+	.string "▶$"
+
+gUnknown_841623D:: @ 841623D
+	.string "YES\n"
+	.string "NO$"
+
+gUnknown_8416244::
+	.string "Go back to the\n"
+	.string "previous menu.$"
+
+gUnknown_8416262:: @ 8416262
+	.string "What would you like to do?$"
+
+gUnknown_841627D::
+	.string "POKéDEX$"
+
+gUnknown_8416285:: @ 8416285
+	.string "BAG$"
+
+gUnknown_8416289::
+	.string "ポケナビ$"
+
+gUnknown_841628E::
+	.string "{PLAYER}$"
+
+gUnknown_8416291::
+	.string "SAVE$"
+
+gUnknown_8416296::
+	.string "OPTION$"
+
+gUnknown_841629D::
+	.string "EXIT$"
+
+gUnknown_84162A2::
+	.string "RETIRE$"
+
+gUnknown_84162A9:: @ 84162A9
+	.string "{STR_VAR_1}/{STR_VAR_2}\n"
+	.string "BALLS  {STR_VAR_3}$"
+
+gText_TimesStrVar1:: @ 84162B9
+	.string "×{STR_VAR_1}$"
+
+gUnknown_84162BD:: @ 84162BD
+	.string " BERRY$"
+
+gText_Coins:: @ 84162C4
+	.incbin "baserom.gba", 0x4162C4, 0x24
+
+gText_DepositItem:: @ 84162E8
+	.string "DEPOSIT ITEM$"
+
+gUnknown_84162F5:: @ 84162F5
+	.incbin "baserom.gba", 0x4162F5, 0xA
+
+gOtherText_StrVar1:: @ 84162FF
+	.string "{STR_VAR_1}"
+
+gText_IsSelected:: @ 8416301
+	.string " is\n"
+	.string "selected.$"
+
+gUnknown_841630F:: @ 841630F
+	.incbin "baserom.gba", 0x41630F, 0x1B
+
+gText_ThereIsNoPokemon:: @ 841632A
+	.string "There is no\n"
+	.string "POKéMON.$"
+
+gOtherText_WhereShouldTheStrVar1BePlaced:: @ 841633F
+	.string "Where should the {STR_VAR_1}\n"
+	.string "be placed?$"
+
+gText_ItemCantBeHeld:: @ 841635E
+	.string "The {STR_VAR_1} can't be held.$"
+
+gUnknown_8416374:: @ 8416374
+	.incbin "baserom.gba", 0x416374, 0x1B
+
+gUnknown_841638F:: @ 841638F
+	.incbin "baserom.gba", 0x41638F, 0x18
+
+gUnknown_84163A7:: @ 84163A7
+	.incbin "baserom.gba", 0x4163A7, 0x14
+
+gUnknown_84163BB:: @ 84163BB
+	.incbin "baserom.gba", 0x4163BB, 0x20
+
+gUnknown_84163DB:: @ 84163DB
+	.incbin "baserom.gba", 0x4163DB, 0x19
+
+gUnknown_84163F4:: @ 84163F4
+	.incbin "baserom.gba", 0x4163F4, 0x15
+
+gUnknown_8416409:: @ 8416409
+	.incbin "baserom.gba", 0x416409, 0x1C
+
+gUnknown_8416425:: @ 8416425
+	.incbin "baserom.gba", 0x416425, 0x2C
+
+gUnknown_8416451:: @ 8416451
+	.incbin "baserom.gba", 0x416451, 0x25
+
+gUnknown_8416476:: @ 8416476
+	.incbin "baserom.gba", 0x416476, 0x48
+
+gUnknown_84164BE:: @ 84164BE
+	.incbin "baserom.gba", 0x4164BE, 0x55
+
+gUnknown_8416513:: @ 8416513
+	.incbin "baserom.gba", 0x416513, 0x24
+
+gUnknown_8416537:: @ 8416537
+	.incbin "baserom.gba", 0x416537, 0x55
+
+gUnknown_841658C:: @ 841658C
+	.incbin "baserom.gba", 0x41658C, 0x12
+
+gUnknown_841659E:: @ 841659E
+	.incbin "baserom.gba", 0x41659E, 0x34
+
+gUnknown_84165D2:: @ 84165D2
+	.incbin "baserom.gba", 0x4165D2, 0x2E
+
+gUnknown_8416600:: @ 8416600
+	.incbin "baserom.gba", 0x416600, 0x31
+
+gUnknown_8416631:: @ 8416631
+	.incbin "baserom.gba", 0x416631, 0x13
+
+gUnknown_8416644:: @ 8416644
+	.incbin "baserom.gba", 0x416644, 0x11
+
+gOtherText_Powder:: @ 8416655
+	.string "POWDER$"
+
+gUnknown_841665C:: @ 841665C
+	.string "Played the POKé FLUTE.\p"
+	.string "Now, that's a catchy tune!{PAUSE_UNTIL_PRESS}$"
+
+gUnknown_8416690:: @ 8416690
+	.string "Played the POKé FLUTE.$"
+
+gUnknown_84166A7:: @ 84166A7
+	.string "The POKé FLUTE awakened sleeping\n"
+	.string "POKéMON.{PAUSE_UNTIL_PRESS}$"
+
+gText_TMCase:: @ 84166D3
+	.string "TM CASE$"
+
+gText_Close:: @ 84166DB
+	.string "CLOSE$"
+
+gText_TMCaseWillBePutAway:: @ 84166E1
+	.string "The TM CASE will be\n"
+	.string "put away.$"
+
+gText_FontSize0:: @ 84166FF
+	.string "{SIZE 0}$"
+
+gText_FontSize2:: @ 8416703
+	.string "{SIZE 2}$"
+
+gUnknown_8416707:: @ 8416707
+	.string "  $"
+
+gUnknown_841670A:: @ 841670A
+	.incbin "baserom.gba", 0x41670A, 0xC
+
+gUnknown_8416716:: @ 8416716
+	.incbin "baserom.gba", 0x416716, 0x33
+
+gUnknown_8416749:: @ 8416749
+	.incbin "baserom.gba", 0x416749, 0xE
+
+gUnknown_8416757:: @ 8416757
+	.incbin "baserom.gba", 0x416757, 0xF
+
+gUnknown_8416766:: @ 8416766
+	.incbin "baserom.gba", 0x416766, 0x28
+
+gUnknown_841678E:: @ 841678E
+	.incbin "baserom.gba", 0x41678E, 0x59
+
+gUnknown_84167E7:: @ 84167E7
+	.incbin "baserom.gba", 0x4167E7, 0x5B
+
+gUnknown_8416842:: @ 8416842
+	.incbin "baserom.gba", 0x416842, 0x1F
+
+gUnknown_8416861:: @ 8416861
+	.incbin "baserom.gba", 0x416861, 0x3D
+
+gUnknown_841689E:: @ 841689E
+	.incbin "baserom.gba", 0x41689E, 0x53
+
+gText_OhNoICantBuyThat:: @ 84168F1
+	.string "{STR_VAR_1}? Oh, no.\n"
+	.string "I can't buy that.{PAUSE_UNTIL_PRESS}$"
+
+gText_HowManyWouldYouLikeToSell:: @ 8416911
+	.string "{STR_VAR_1}?\n"
+	.string "How many would you like to sell?$"
+
+gText_ICanPayThisMuch_WouldThatBeOkay:: @ 8416936
+	.string "I can pay ¥{STR_VAR_3}.\n"
+	.string "Would that be okay?$"
+
+gText_TurnedOverItemsWorthYen:: @ 8416959
+	.incbin "baserom.gba", 0x416959, 0x21
+
+gText_PokedollarVar1:: @ 841697A
+	.incbin "baserom.gba", 0x41697A, 0x48
+
+gUnknown_84169C2:: @ 84169C2
+	.incbin "baserom.gba", 0x4169C2, 0x3
+
+gUnknown_84169C5:: @ 84169C5
+	.incbin "baserom.gba", 0x4169C5, 0x8
+
+gUnknown_84169CD:: @ 84169CD
+	.incbin "baserom.gba", 0x4169CD, 0x8
+
+gUnknown_84169D5:: @ 84169D5
+	.incbin "baserom.gba", 0x4169D5, 0x4
+
+gUnknown_84169D9:: @ 84169D9
+	.incbin "baserom.gba", 0x4169D9, 0x3
+
+gUnknown_84169DC:: @ 84169DC
+	.incbin "baserom.gba", 0x4169DC, 0x1C
+
+gUnknown_84169F8:: @ 84169F8
+	.string "This can't be used on\n"
+	.string "that POKéMON.{PAUSE_UNTIL_PRESS}$"
+
+gUnknown_8416A1E:: @ 8416A1E
+	.incbin "baserom.gba", 0x416A1E, 0x1C
+
+gUnknown_8416A3A:: @ 8416A3A
+	.incbin "baserom.gba", 0x416A3A, 0x1B
+
+gUnknown_8416A55:: @ 8416A55
+	.incbin "baserom.gba", 0x416A55, 0x20
+
+gUnknown_8416A75:: @ 8416A75
+	.incbin "baserom.gba", 0x416A75, 0x23
+
+gUnknown_8416A98:: @ 8416A98
+	.incbin "baserom.gba", 0x416A98, 0x33
+
+gUnknown_8416ACB:: @ 8416ACB
+	.incbin "baserom.gba", 0x416ACB, 0x17
+
+gUnknown_8416AE2:: @ 8416AE2
+	.incbin "baserom.gba", 0x416AE2, 0x34
+
+gUnknown_8416B16:: @ 8416B16
+	.incbin "baserom.gba", 0x416B16, 0x28
+
+gUnknown_8416B3E:: @ 8416B3E
+	.incbin "baserom.gba", 0x416B3E, 0x26
+
+gUnknown_8416B64:: @ 8416B64
+	.incbin "baserom.gba", 0x416B64, 0x22
+
+gUnknown_8416B86:: @ 8416B86
+	.incbin "baserom.gba", 0x416B86, 0x20
+
+gUnknown_8416BA6:: @ 8416BA6
+	.incbin "baserom.gba", 0x416BA6, 0x1D
+
+gUnknown_8416BC3:: @ 8416BC3
+	.incbin "baserom.gba", 0x416BC3, 0x38
+
+gUnknown_8416BFB:: @ 8416BFB
+	.incbin "baserom.gba", 0x416BFB, 0x2F
+
+gUnknown_8416C2A:: @ 8416C2A
+	.incbin "baserom.gba", 0x416C2A, 0x1F
+
+gUnknown_8416C49:: @ 8416C49
+	.incbin "baserom.gba", 0x416C49, 0x46
+
+gUnknown_8416C8F:: @ 8416C8F
+	.incbin "baserom.gba", 0x416C8F, 0x1D
+
+gUnknown_8416CAC:: @ 8416CAC
+	.incbin "baserom.gba", 0x416CAC, 0x1B
+
+gUnknown_8416CC7:: @ 8416CC7
+	.incbin "baserom.gba", 0x416CC7, 0x23
+
+gUnknown_8416CEA:: @ 8416CEA
+	.incbin "baserom.gba", 0x416CEA, 0x2D
+
+gUnknown_8416D17:: @ 8416D17
+	.incbin "baserom.gba", 0x416D17, 0x38
+
+gUnknown_8416D4F:: @ 8416D4F
+	.incbin "baserom.gba", 0x416D4F, 0x29
+
+gUnknown_8416D78:: @ 8416D78
+	.incbin "baserom.gba", 0x416D78, 0x3B
+
+gUnknown_8416DB3:: @ 8416DB3
+	.incbin "baserom.gba", 0x416DB3, 0xF
+
+gUnknown_8416DC2:: @ 8416DC2
+	.incbin "baserom.gba", 0x416DC2, 0x35
+
+gUnknown_8416DF7:: @ 8416DF7
+	.incbin "baserom.gba", 0x416DF7, 0x74
+
+gUnknown_8416E6B:: @ 8416E6B
+	.incbin "baserom.gba", 0x416E6B, 0x19
+
+gUnknown_8416E84:: @ 8416E84
+	.incbin "baserom.gba", 0x416E84, 0x20
+
+gUnknown_8416EA4:: @ 8416EA4
+	.incbin "baserom.gba", 0x416EA4, 0x22
+
+gUnknown_8416EC6:: @ 8416EC6
+	.incbin "baserom.gba", 0x416EC6, 0x4A
+
+gUnknown_8416F10:: @ 8416F10
+	.incbin "baserom.gba", 0x416F10, 0x17
+
+gUnknown_8416F27:: @ 8416F27
+	.string "{STR_VAR_1}'s HP was restored\n"
+	.string "by {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$"
+
+gUnknown_8416F4E:: @ 8416F4E
+	.incbin "baserom.gba", 0x416F4E, 0x21
+
+gUnknown_8416F6F:: @ 8416F6F
+	.incbin "baserom.gba", 0x416F6F, 0x1D
+
+gUnknown_8416F8C:: @ 8416F8C
+	.incbin "baserom.gba", 0x416F8C, 0xE
+
+gUnknown_8416F9A:: @ 8416F9A
+	.incbin "baserom.gba", 0x416F9A, 0x18
+
+gUnknown_8416FB2:: @ 8416FB2
+	.incbin "baserom.gba", 0x416FB2, 0x15
+
+gUnknown_8416FC7:: @ 8416FC7
+	.incbin "baserom.gba", 0x416FC7, 0x26
+
+gUnknown_8416FED:: @ 8416FED
+	.incbin "baserom.gba", 0x416FED, 0x15
+
+gUnknown_8417002:: @ 8417002
+	.incbin "baserom.gba", 0x417002, 0x15
+
+gUnknown_8417017:: @ 8417017
+	.incbin "baserom.gba", 0x417017, 0x1B
+
+gUnknown_8417032:: @ 8417032
+	.incbin "baserom.gba", 0x417032, 0x20
+
+gUnknown_8417052:: @ 8417052
+	.incbin "baserom.gba", 0x417052, 0x23
+
+gUnknown_8417075:: @ 8417075
+	.incbin "baserom.gba", 0x417075, 0x47
+
+gUnknown_84170BC:: @ 84170BC
+	.incbin "baserom.gba", 0x4170BC, 0x24
+
+gUnknown_84170E0:: @ 84170E0
+	.incbin "baserom.gba", 0x4170E0, 0x377
+
+gUnknown_8417457:: @ 8417457
+	.incbin "baserom.gba", 0x417457, 0x3D
+
+gUnknown_8417494:: @ 8417494
+	.incbin "baserom.gba", 0x417494, 0x181
+
+gUnknown_8417615:: @ 8417615
+	.incbin "baserom.gba", 0x417615, 0x2B
+
+gUnknown_8417640:: @ 8417640
+	.incbin "baserom.gba", 0x417640, 0x34
+
+gUnknown_8417674:: @ 8417674
+	.incbin "baserom.gba", 0x417674, 0x7
+
+gUnknown_841767B:: @ 841767B
+	.incbin "baserom.gba", 0x41767B, 0x12
+
+gUnknown_841768D:: @ 841768D
+	.incbin "baserom.gba", 0x41768D, 0x9
+
+gUnknown_8417696:: @ 8417696
+	.incbin "baserom.gba", 0x417696, 0x22
+
+gUnknown_84176B8:: @ 84176B8
+	.incbin "baserom.gba", 0x4176B8, 0x17
+
+gUnknown_84176CF:: @ 84176CF
+	.incbin "baserom.gba", 0x4176CF, 0x2F
+
+gUnknown_84176FE:: @ 84176FE
+	.incbin "baserom.gba", 0x4176FE, 0x76
+
+gUnknown_8417774:: @ 8417774
+	.incbin "baserom.gba", 0x417774, 0x16
+
+gText_NoMoreRoomInBag:: @ 841778A
+	.string "There is no more\n"
+	.string "room in the BAG.$"
+
+gText_WithdrawHowMany:: @ 84177AC
+	.string "Withdraw how many\n"
+	.string "{STR_VAR_1}(s)?$"
+
+gText_WithdrewQuantItem:: @ 84177C5
+	.string "Withdrew {STR_VAR_2}\n"
+	.string "{STR_VAR_1}(s).$"
+
+gOtherText_Read::
+	.string "READ$"
+
+gOtherText_MoveToBag::
+	.string "MOVE TO BAG$"
+
+gOtherText_Give2::
+	.string "GIVE$"
+
+gUnknown_84177EE:: @ 84177EE
+	.incbin "baserom.gba", 0x4177EE, 0x18
+
+gUnknown_8417806:: @ 8417806
+	.incbin "baserom.gba", 0x417806, 0x2A
+
+gUnknown_8417830:: @ 8417830
+	.incbin "baserom.gba", 0x417830, 0x28
+
+gUnknown_8417858:: @ 8417858
+	.incbin "baserom.gba", 0x417858, 0x13
+
+gUnknown_841786B:: @ 841786B
+	.incbin "baserom.gba", 0x41786B, 0x3C
+
+gText_WithdrawItem:: @ 84178A7
+	.string "WITHDRAW\n"
+	.string "ITEM$"
+
+gText_Withdraw::
+	.string "WITHDRAW$"
+
+gText_ReturnToPC:: @ 84178BE
+	.string "Return to the PC.$"
+
+gUnknown_84178D0:: @ 84178D0
+	.incbin "baserom.gba", 0x4178D0, 0xA
+
+gUnknown_84178DA:: @ 84178DA
+	.incbin "baserom.gba", 0x4178DA, 0x5E
+
+gUnknown_8417938:: @ 8417938
+	.incbin "baserom.gba", 0x417938, 0x4
+
+gUnknown_841793C:: @ 841793C
+	.incbin "baserom.gba", 0x41793C, 0x263
+
+gUnknown_8417B9F:: @ 8417B9F
+	.incbin "baserom.gba", 0x417B9F, 0xD
+
+gUnknown_8417BAC:: @ 8417BAC
+	.incbin "baserom.gba", 0x417BAC, 0xA
+
+gUnknown_8417BB6:: @ 8417BB6
+	.incbin "baserom.gba", 0x417BB6, 0x8
+
+gUnknown_8417BBE:: @ 8417BBE
+	.incbin "baserom.gba", 0x417BBE, 0xD
+
+gUnknown_8417BCB:: @ 8417BCB
+	.incbin "baserom.gba", 0x417BCB, 0x8
+
+gUnknown_8417BD3:: @ 8417BD3
+	.incbin "baserom.gba", 0x417BD3, 0x5A
+
+gUnknown_8417C2D:: @ 8417C2D
+	.incbin "baserom.gba", 0x417C2D, 0x1C0
+
+gUnknown_8417DED:: @ 8417DED
+	.incbin "baserom.gba", 0x417DED, 0x1CC
+
+gUnknown_8417FB9:: @ 8417FB9
+	.incbin "baserom.gba", 0x417FB9, 0x2
+
+gUnknown_8417FBB:: @ 8417FBB
+	.incbin "baserom.gba", 0x417FBB, 0x8
+
+gUnknown_8417FC3:: @ 8417FC3
+	.incbin "baserom.gba", 0x417FC3, 0x9
+
+gUnknown_8417FCC:: @ 8417FCC
+	.incbin "baserom.gba", 0x417FCC, 0x4
+
+gUnknown_8417FD0:: @ 8417FD0
+	.incbin "baserom.gba", 0x417FD0, 0xA5
+
+gUnknown_8418075:: @ 8418075
+	.incbin "baserom.gba", 0x418075, 0xFF
+
+gUnknown_8418174:: @ 8418174
+	.incbin "baserom.gba", 0x418174, 0x14
+
+gUnknown_8418188:: @ 8418188
+	.incbin "baserom.gba", 0x418188, 0x1C
+
+gUnknown_84181A4:: @ 84181A4
+	.incbin "baserom.gba", 0x4181A4, 0x12
+
+gUnknown_84181B6:: @ 84181B6
+	.incbin "baserom.gba", 0x4181B6, 0x8
+
+gUnknown_84181BE:: @ 84181BE
+	.incbin "baserom.gba", 0x4181BE, 0x5
+
+gFameCheckerText_FameCheckerWillBeClosed:: @ 84181C3
+	.string "The FAME CHECKER will be closed.$"
+
+gFameCheckerText_ClearTextbox:: @ 84181E4
+	.string "\n"
+	.string "                              $"
+
+gUnknown_8418204:: @ 8418204
+	.incbin "baserom.gba", 0x00418204, 0x48c
+
+gUnknown_8418690:: @ 8418690
+	.incbin "baserom.gba", 0x418690, 0x20
+
+gUnknown_84186B0:: @ 84186B0
+	.incbin "baserom.gba", 0x4186B0, 0x1D
+
+gUnknown_84186CD:: @ 84186CD
+	.incbin "baserom.gba", 0x4186CD, 0x26A
+
+gUnknown_8418937:: @ 8418937
+	.incbin "baserom.gba", 0x418937, 0x1F
+
+gUnknown_8418956:: @ 8418956
+	.incbin "baserom.gba", 0x418956, 0x8A
+
+gUnknown_84189E0:: @ 84189E0
+	.incbin "baserom.gba", 0x4189E0, 0xE
+
+gUnknown_84189EE:: @ 84189EE
+	.incbin "baserom.gba", 0x4189EE, 0x22D
+
+gUnknown_8418C1B:: @ 8418C1B
+	.string "POKéMON CENTER$"
+
+gUnknown_8418C2A:: @ 8418C2A
+	.incbin "baserom.gba", 0x418C2A, 0x59
+
+gUnknown_8418C83:: @ 8418C83
+	.incbin "baserom.gba", 0x418C83, 0x56
+
+gUnknown_8418CD9:: @ 8418CD9
+	.string "The backup memory is damaged or\n"
+	.string "the game's battery has run dry.\n"
+	.string "The game can be played, but its\n"
+	.string "progress cannot be saved.\n"
+	.string "“Please press the A Button.”$"
+
+gUnknown_8418D70:: @ 8418D70
+	.incbin "baserom.gba", 0x418D70, 0x99
+
+gUnknown_8418E09:: @ 8418E09
+	.incbin "baserom.gba", 0x418E09, 0x6E
+
+gUnknown_8418E77:: @ 8418E77
+	.incbin "baserom.gba", 0x418E77, 0x13
+
+gUnknown_8418E8A:: @ 8418E8A
+	.incbin "baserom.gba", 0x418E8A, 0x1
+
+gUnknown_8418E8B:: @ 8418E8B
+	.incbin "baserom.gba", 0x418E8B, 0x2
+
+gUnknown_8418E8D:: @ 8418E8D
+	.incbin "baserom.gba", 0x418E8D, 0x8
+
+gUnknown_8418E95:: @ 8418E95
+	.incbin "baserom.gba", 0x418E95, 0x9
+
+gUnknown_8418E9E:: @ 8418E9E
+	.incbin "baserom.gba", 0x418E9E, 0x9
+
+gUnknown_8418EA7:: @ 8418EA7
+	.incbin "baserom.gba", 0x418EA7, 0x9
+
+gUnknown_8418EB0:: @ 8418EB0
+	.incbin "baserom.gba", 0x418EB0, 0x5
+
+gUnknown_8418EB5:: @ 8418EB5
+	.incbin "baserom.gba", 0x418EB5, 0x7
+
+gUnknown_8418EBC:: @ 8418EBC
+	.incbin "baserom.gba", 0x418EBC, 0x7
+
+gUnknown_8418EC3:: @ 8418EC3
+	.string "No data$"
+
+gUnknown_8418ECB:: @ 8418ECB
+	@ Viridian Forest
+	.string "A deep and sprawling forest that\n"
+	.string "extends around VIRIDIAN CITY.\n"
+	.string "A natural maze, many people\n"
+	.string "become lost inside.$"
+
+gUnknown_8418F3A:: @ 8418F3A
+	@ Mt. Moon
+	.string "A mystical mountain that is known\n"
+	.string "for its frequent meteor falls.\n"
+	.string "The shards of stars that fall\n"
+	.string "here are known as MOON STONES.$"
+
+gUnknown_8418FB8:: @ 8418FB8
+	@ Diglett's Cave
+	.string "A seemingly plain tunnel that was\n"
+	.string "dug by wild DIGLETT.\n"
+	.string "It is famous for connecting\n"
+	.string "ROUTES 2 and 11.$"
+
+gUnknown_841901C:: @ 841901C
+	@ Victory Road
+	.string "A tunnel situated on ROUTE 23.\n"
+	.string "It earned its name because it\n"
+	.string "must be traveled by all TRAINERS\n"
+	.string "aiming for the top.$"
+
+gUnknown_841908E:: @ 841908E
+	@ Pokémon Mansion
+	.string "A decrepit, burned-down mansion\n"
+	.string "on CINNABAR ISLAND.\n"
+	.string "It got its name because a famous\n"
+	.string "POKéMON researcher lived there.$"
+
+gUnknown_8419103:: @ 8419103
+	@ Safari Zone
+	.string "An amusement park outside FUCHSIA\n"
+	.string "CITY where many rare POKéMON can\n"
+	.string "be observed in the wild.\n"
+	.string "Catch them in a popular game!$"
+
+gUnknown_841917D:: @ 841917D
+	@ Rock Tunnel
+	.string "A naturally formed underground\n"
+	.string "tunnel. Because it has not been\n"
+	.string "developed, it is inky dark inside.\n"
+	.string "A light is needed to get through.$"
+
+gUnknown_8419201:: @ 8419201
+	@ Seafoam Islands
+	.string "A pair of islands that is situated\n"
+	.string "on ROUTE 20.\n"
+	.string "The two islands are shaped the\n"
+	.string "same, as if they were twins.$"
+
+gUnknown_841926D:: @ 841926D
+	@ Pokémon Tower
+	.string "A tower that houses the graves of\n"
+	.string "countless POKéMON.\n"
+	.string "Many people visit it daily to pay\n"
+	.string "their respects to the fallen.$"
+
+gUnknown_84192E2:: @ 84192E2
+	@ Cerulean Cave
+	.string "A mysterious cave that is filled\n"
+	.string "with terribly tough POKéMON.\n"
+	.string "It is so dangerous, the POKéMON\n"
+	.string "LEAGUE is in charge of it.$"
+
+gUnknown_841935B:: @ 841935B
+	@ Power Plant
+	.string "A power plant that was abandoned\n"
+	.string "years ago, though some of the\n"
+	.string "machines still work. It is infested\n"
+	.string "with electric POKéMON.$"
+
+gUnknown_84193D5:: @ 84193D5
+	@ Mt. Ember
+	.string "Supposedly an inactive volcano.\n"
+	.string "However, there are persistent\n"
+	.string "reports that the peak blazes\n"
+	.string "with fire at night.$"
+
+gUnknown_8419444:: @ 8419444
+	@ Berry Forest
+	.string "A forest on a small islet off the\n"
+	.string "coast of THREE ISLAND. BERRIES\n"
+	.string "grow wildly in profusion, quickly\n"
+	.string "replenishing those that fall off.$"
+
+gUnknown_84194C9:: @ 84194C9
+	@ Icefall Cave
+	.string "A cave which is covered by water\n"
+	.string "and ice on FOUR ISLAND.\n"
+	.string "It seems like the end of the cave\n"
+	.string "is connected to the ocean.$"
+
+gUnknown_841953F:: @ 841953F
+	@ Lost Cave
+	.string "A bewildering cave off the coast\n"
+	.string "of RESORT GORGEOUS.\n"
+	.string "Some curious thrill seekers have\n"
+	.string "never emerged from it.$"
+
+gUnknown_84195AC:: @ 84195AC
+	@ Tanoby Ruins
+	.string "An ancient ruin that is rumored to\n"
+	.string "be home to a peculiar POKéMON.\n"
+	.string "However, so far, the POKéMON\n"
+	.string "remains an unconfirmed rumor.$"
+
+gUnknown_8419629:: @ 8419629
+	@ Altering Cave
+	.string "This island has been known by this\n"
+	.string "name since the distant past.\n"
+	.string "No one today knows where it got\n"
+	.string "this name, however.$"
+
+gUnknown_841969D:: @ 841969D
+	@ Pattern Bush
+	.string "A lush and bush-like area. \n"
+	.string "In it are patterns where no grass\n"
+	.string "grows. Some study it in the belief\n"
+	.string "that a secret is concealed.$"
+
+gUnknown_841971A:: @ 841971A
+	@ Dotted Hole
+	.string "A mysterious, just-discovered\n"
+	.string "ruin from an ancient time.\n"
+	.string "It got its name from the six dots\n"
+	.string "on its door.$"
+
+gUnknown_8419782:: @ 8419782
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Met in a trade.$"
+
+gUnknown_841979D:: @ 841979D
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Met in a trade.$"
+
+gUnknown_84197B8:: @ 84197B8
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Met in a fateful encounter when\n"
+	.string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$"
+
+gUnknown_84197ED:: @ 84197ED
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Met in a fateful encounter when\n"
+	.string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$"
+
+gUnknown_8419822:: @ 8419822
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Met in {UNKNOWN_F7 0x02} at {EXTRA_LV} {UNKNOWN_F7 0x01}.$"
+
+gUnknown_8419841:: @ 8419841
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Met in {UNKNOWN_F7 0x02} at {EXTRA_LV} {UNKNOWN_F7 0x01}.$"
+
+gUnknown_8419860:: @ 8419860
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Apparently met in {UNKNOWN_F7 0x02}\n"
+	.string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$"
+
+gUnknown_841988A:: @ 841988A
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Apparently met in {UNKNOWN_F7 0x02}\n"
+	.string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$"
+
+gUnknown_84198B4:: @ 84198B4
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Hatched: {UNKNOWN_F7 0x02}\n"
+	.string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$"
+
+gUnknown_84198D5:: @ 84198D5
+	.string "{UNKNOWN_F7 0x00} nature.\n"
+	.string "Hatched: {UNKNOWN_F7 0x02}\n"
+	.string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$"
+
+@ TODO: Replace this gibberish with the proper Hiragana
+gUnknown_84198F6:: @ 84198F6
+	.string "{UNKNOWN_F7 0x00}ßÓÁÉË {EXTRA_LV}{UNKNOWN_F7 0x01}çÑÊ\n"
+	.string "{UNKNOWN_F7 0x02}で ÉÇっŒ ùÂだ$"
+
+gUnknown_8419913:: @ 8419913
+	.string "{UNKNOWN_F7 0x00}ÓÁÉË {EXTRA_LV}{UNKNOWN_F7 0x01}çÑÊ\n"
+	.string "{UNKNOWN_F7 0x02}で ÉÇっŒ ùÂだ$"
+
+gUnknown_841992F:: @ 841992F
+	.string "{UNKNOWN_F7 0x00} nature. Met in a fateful\n"
+	.string "encounter (hatched: {UNKNOWN_F7 0x02}\n"
+	.string "at {EXTRA_LV} {UNKNOWN_F7 0x01}).$"
+
+gUnknown_841996D:: @ 841996D
+	.string "{UNKNOWN_F7 0x00} nature. Met in a fateful\n"
+	.string "encounter (hatched: {UNKNOWN_F7 0x02}\n"
+	.string "at {EXTRA_LV} {UNKNOWN_F7 0x01}).$"
+
+gUnknown_84199AB:: @ 84199AB
+	.string "{UNKNOWN_F7 0x00} nature. Apparently met in\n"
+	.string "a fateful encounter (hatched:\n"
+	.string "{UNKNOWN_F7 0x02} at {EXTRA_LV} {UNKNOWN_F7 0x01}).$"
+
+gUnknown_84199F4:: @ 84199F4
+	.incbin "baserom.gba", 0x4199F4, 0x217
+
+gUnknown_8419C0B:: @ 8419C0B
+	.incbin "baserom.gba", 0x419C0B, 0x8
+
+gUnknown_8419C13:: @ 8419C13
+	.incbin "baserom.gba", 0x419C13, 0xA
+
+gUnknown_8419C1D:: @ 8419C1D
+	.incbin "baserom.gba", 0x419C1D, 0xD
+
+gUnknown_8419C2A:: @ 8419C2A
+	.incbin "baserom.gba", 0x419C2A, 0xF
+
+gUnknown_8419C39:: @ 8419C39
+	.incbin "baserom.gba", 0x419C39, 0xC
+
+gUnknown_8419C45:: @ 8419C45
+	.incbin "baserom.gba", 0x419C45, 0x8
+
+gUnknown_8419C4D:: @ 8419C4D
+	.incbin "baserom.gba", 0x419C4D, 0xC
+
+gUnknown_8419C59:: @ 8419C59
+	.incbin "baserom.gba", 0x419C59, 0x9
+
+gUnknown_8419C62:: @ 8419C62
+	.incbin "baserom.gba", 0x419C62, 0x10
+
+gUnknown_8419C72:: @ 8419C72
+	.incbin "baserom.gba", 0x419C72, 0x9
+
+gUnknown_8419C7B:: @ 8419C7B
+	.incbin "baserom.gba", 0x419C7B, 0x7
+
+gUnknown_8419C82:: @ 8419C82
+	.incbin "baserom.gba", 0x419C82, 0x10
+
+gUnknown_8419C92:: @ 8419C92
+	.incbin "baserom.gba", 0x419C92, 0x10
+
+gUnknown_8419CA2:: @ 8419CA2
+	.incbin "baserom.gba", 0x419CA2, 0x7
+
+gUnknown_8419CA9:: @ 8419CA9
+	.incbin "baserom.gba", 0x419CA9, 0x10
+
+gUnknown_8419CB9:: @ 8419CB9
+	.incbin "baserom.gba", 0x419CB9, 0x21
+
+gUnknown_8419CDA:: @ 8419CDA
+	.incbin "baserom.gba", 0x419CDA, 0x7
+
+gUnknown_8419CE1:: @ 8419CE1
+	.incbin "baserom.gba", 0x419CE1, 0x6
+
+gUnknown_8419CE7:: @ 8419CE7
+	.incbin "baserom.gba", 0x419CE7, 0x6
+
+gUnknown_8419CED:: @ 8419CED
+	.incbin "baserom.gba", 0x419CED, 0x2
+
+gUnknown_8419CEF:: @ 8419CEF
+	.incbin "baserom.gba", 0x419CEF, 0x8
+
+gUnknown_8419CF7:: @ 8419CF7
+	.incbin "baserom.gba", 0x419CF7, 0x1
+
+gUnknown_8419CF8:: @ 8419CF8
+	.incbin "baserom.gba", 0x419CF8, 0x5
+
+gUnknown_8419CFD:: @ 8419CFD
+	.incbin "baserom.gba", 0x419CFD, 0xD
+
+gUnknown_8419D0A:: @ 8419D0A
+	.incbin "baserom.gba", 0x419D0A, 0x10
+
+gUnknown_8419D1A:: @ 8419D1A
+	.incbin "baserom.gba", 0x419D1A, 0x35
+
+gUnknown_8419D4F:: @ 8419D4F
+	.incbin "baserom.gba", 0x419D4F, 0x8
+
+gUnknown_8419D57:: @ 8419D57
+	.incbin "baserom.gba", 0x419D57, 0xF
+
+gUnknown_8419D66:: @ 8419D66
+	.incbin "baserom.gba", 0x419D66, 0x17
+
+gUnknown_8419D7D:: @ 8419D7D
+	.incbin "baserom.gba", 0x419D7D, 0xC
+
+gUnknown_8419D89:: @ 8419D89
+	.incbin "baserom.gba", 0x419D89, 0x43
+
+gUnknown_8419DCC:: @ 8419DCC
+	.incbin "baserom.gba", 0x419DCC, 0x86
+
+gUnknown_8419E52:: @ 8419E52
+	.incbin "baserom.gba", 0x419E52, 0x5
+
+gUnknown_8419E57:: @ 8419E57
+	.incbin "baserom.gba", 0x419E57, 0xFD
+
+gUnknown_8419F54:: @ 8419F54
+	.string "SAVING…\n"
+	.string "DON'T TURN OFF THE POWER.$"
+
+// Start menu option descriptions
+gUnknown_8419F76:: @ 8419F76 // Pokedex
+	.string "A device that records POKéMON secrets\n"
+	.string "upon meeting or catching them.$"
+
+gUnknown_8419FBB:: @ 8419FBB // Pokemon
+	.string "Check and organize POKéMON that are\n"
+	.string "traveling with you in your party.$"
+
+gUnknown_841A001:: @ 841A001 // Bag
+	.string "Equipped with pockets for storing items\n"
+	.string "you bought, received, or found.$"
+
+gUnknown_841A049:: @ 841A049 // {PLAYER}
+	.string "Check your money and other game data.$"
+
+gUnknown_841A06F:: @ 841A06F // Save
+	.string "Save your game with a complete record\n"
+	.string "of your progress to take a break.$"
+
+gUnknown_841A0B7:: @ 841A0B7 // Options
+	.string "Adjust various game settings such as text\n"
+	.string "speed, game rules, etc.$"
+
+gUnknown_841A0F9:: @ 841A0F9 // Quit
+	.string "Close this MENU window.$"
+
+gUnknown_841A111:: @ 841A111 // Retire
+	.string "Retire from the SAFARI GAME and return to\n"
+	.string "the registration counter.$"
+
+	.include "data/text/quest_log.inc"
+
+gUnknown_841B285:: @ 841B285
+	.incbin "baserom.gba", 0x41B285, 0xE
+
+gUnknown_841B293:: @ 841B293
+	.incbin "baserom.gba", 0x41B293, 0x2
+
+gUnknown_841B295:: @ 841B295
+	.incbin "baserom.gba", 0x41B295, 0x12
+
+gUnknown_841B2A7:: @ 841B2A7
+	.incbin "baserom.gba", 0x41B2A7, 0x35
+
+gUnknown_841B2DC:: @ 841B2DC
+	.incbin "baserom.gba", 0x41B2DC, 0x9
+
+gUnknown_841B2E5:: @ 841B2E5
+	.incbin "baserom.gba", 0x41B2E5, 0x8
+
+gUnknown_841B2ED:: @ 841B2ED
+	.incbin "baserom.gba", 0x41B2ED, 0x4
+
+gUnknown_841B2F1:: @ 841B2F1
+	.incbin "baserom.gba", 0x41B2F1, 0x15
+
+gUnknown_841B306:: @ 841B306
+	.incbin "baserom.gba", 0x41B306, 0xF
+
+gUnknown_841B315:: @ 841B315
+	.incbin "baserom.gba", 0x41B315, 0x6
+
+gUnknown_841B31B:: @ 841B31B
+	.incbin "baserom.gba", 0x41B31B, 0xE
+
+gUnknown_841B329:: @ 841B329
+	.incbin "baserom.gba", 0x41B329, 0x5
+
+gUnknown_841B32E:: @ 841B32E
+	.incbin "baserom.gba", 0x41B32E, 0x7C
+
+gUnknown_841B3AA:: @ 841B3AA
+	.incbin "baserom.gba", 0x41B3AA, 0x14
+
+gUnknown_841B3BE:: @ 841B3BE
+	.incbin "baserom.gba", 0x41B3BE, 0x152
+
+gUnknown_841B510:: @ 841B510
+	.incbin "baserom.gba", 0x41B510, 0x6
+
+gUnknown_841B516:: @ 841B516
+	.incbin "baserom.gba", 0x41B516, 0x8
+
+gUnknown_841B51E:: @ 841B51E
+	.incbin "baserom.gba", 0x41B51E, 0x6
+
+gUnknown_841B524:: @ 841B524
+	.incbin "baserom.gba", 0x41B524, 0x7
+
+gUnknown_841B52B:: @ 841B52B
+	.incbin "baserom.gba", 0x41B52B, 0x6
+
+gUnknown_841B531:: @ 841B531
+	.incbin "baserom.gba", 0x41B531, 0x4
+
+gUnknown_841B535:: @ 841B535
+	.incbin "baserom.gba", 0x41B535, 0x6
+
+gUnknown_841B53B:: @ 841B53B
+	.incbin "baserom.gba", 0x41B53B, 0x6
+
+gUnknown_841B541:: @ 841B541
+	.incbin "baserom.gba", 0x41B541, 0xA
+
+gUnknown_841B54B:: @ 841B54B
+	.incbin "baserom.gba", 0x41B54B, 0x9
+
+gUnknown_841B554:: @ 841B554
+	.incbin "baserom.gba", 0x41B554, 0x62
+
+gUnknown_841B5B6:: @ 841B5B6
+	.incbin "baserom.gba", 0x41B5B6, 0x58
+
+gUnknown_841B60E:: @ 841B60E
+	.incbin "baserom.gba", 0x41B60E, 0xB
+
+gUnknown_841B619:: @ 841B619
+	.incbin "baserom.gba", 0x41B619, 0x6B
+
+gUnknown_841B684:: @ 841B684
+	.incbin "baserom.gba", 0x41B684, 0xB
+
+gUnknown_841B68F:: @ 841B68F
+	.incbin "baserom.gba", 0x41B68F, 0x9
+
+gUnknown_841B698:: @ 841B698
+	.incbin "baserom.gba", 0x41B698, 0x6
+
+gUnknown_841B69E:: @ 841B69E
+	.incbin "baserom.gba", 0x41B69E, 0x1B
+
+gUnknown_841B6B9:: @ 841B6B9
+	.incbin "baserom.gba", 0x41B6B9, 0x1C
+
+gUnknown_841B6D5:: @ 841B6D5
+	.incbin "baserom.gba", 0x41B6D5, 0x7
+
+gUnknown_841B6DC:: @ 841B6DC
+	.incbin "baserom.gba", 0x41B6DC, 0x7
+
+gUnknown_841B6E3:: @ 841B6E3
+	.incbin "baserom.gba", 0x41B6E3, 0x8
+
+gUnknown_841B6EB:: @ 841B6EB
+	.incbin "baserom.gba", 0x41B6EB, 0x1
+
+gUnknown_841B6EC:: @ 841B6EC
+	.incbin "baserom.gba", 0x41B6EC, 0x7
+
+gUnknown_841B6F3:: @ 841B6F3
+	.incbin "baserom.gba", 0x41B6F3, 0xA
+
+gText_HatchedFromEgg:: @ 841B6FD
+	.incbin "baserom.gba", 0x41B6FD, 0x19
+
+gText_NickHatchPrompt:: @ 841B716
+	.incbin "baserom.gba", 0x41B716, 0x31
+
+gUnknown_841B747:: @ 841B747
+	.incbin "baserom.gba", 0x41B747, 0x24
+
+gUnknown_841B76B:: @ 841B76B
+	.incbin "baserom.gba", 0x41B76B, 0xE
+
+gUnknown_841B779:: @ 841B779
+	.incbin "baserom.gba", 0x41B779, 0x2B
+
+	.include "data/text/teachy_tv.inc"
+
+gString_Bill:: @ 841CB3C
+	.string "BILL$"
+
+gString_Someone:: @ 841CB41
+	.string "SOMEONE$"
+
+gString_Help:: @ 841CB49
+	.string "HELP$"
+
+gString_HelpSystem_ClearTo8:: @ 841CB4E
+	.string "{CLEAR_TO 8}$"
+
+gUnknown_841CB52:: @ 841CB52
+	.string " points$"
+
+gUnknown_841CB5A:: @ 841CB5A
+	.string " time(s)$"
+
+gUnknown_841CB63:: @ 841CB63
+	.string "POKéMON JUMP RECORDS$"
+
+	.string "Jumps in a row:$"
+
+	.string "Best score:$"
+
+	.string "EXCELLENTS in a row:$"
+
+gUnknown_841CBA9:: @ 841CBA9
+	.string "Awesome score! You've\n"
+	.string "won {UNKNOWN_F7 01} {UNKNOWN_F7 00}!$"
+
+gUnknown_841CBCA:: @ 841CBCA
+	.string "There's no room left now.$"
+
+gUnknown_841CBE4:: @ 841CBE4
+	.string "You can't hold any more!$"
+
+gUnknown_841CBFD:: @ 841CBFD
+	.string "Want to play again?$"
+
+gUnknown_841CC11:: @ 841CC11
+	.string "Somebody dropped out.\n"
+	.string "The link will be canceled.$"
+
+gUnknown_841CC42:: @ 841CC42
+	.string "SAVING…\n"
+	.string "DON'T TURN OFF THE POWER.$"
+
+gUnknown_841CC64:: @ 841CC64
+	.string "Communication standby…$"
+
+	.string "SAVING...\n"
+	.string "DON'T TURN OFF THE POWER.$"
+
+	.string "DODRIO BERRY-PICKING RECORDS$"
+
+	.string "BERRIES picked:$"
+
+	.string "Best score:$"
+
+	.string "BERRIES picked in a row with\n"
+	.string "five players:$"
+
+gUnknown_841CD03:: @ 841CD03
+	.string "Announcing BERRY-PICKING results!$"
+
+gUnknown_841CD25:: @ 841CD25
+	.string "10P     30P     50P     {EXTRA 0xDD}50P$"
+
+gUnknown_841CD43:: @ 841CD43
+	.string "Announcing rankings!$"
+
+gUnknown_841CD58:: @ 841CD58
+	.string "Announcing prizes!$"
+
+	.string "1:$"
+
+	.string "2:$"
+
+	.string "3:$"
+
+	.string "4:$"
+
+	.string "5:$"
+
+gUnknown_841CD7A:: @ 841CD7A
+	.string "The first-place winner gets\n"
+	.string "this {UNKNOWN_F7 00}!$"
+
+gUnknown_841CD9F:: @ 841CD9F
+	.string "You can't hold any more...$"
+
+gUnknown_841CDBA:: @ 841CDBA
+	.string "It filled its storage space.$"
+
+gUnknown_841CDD7:: @ 841CDD7
+	.string "Want to play again?$"
+
+gUnknown_841CDEB:: @ 841CDEB
+	.string "Somebody dropped out.\n"
+	.string "The link will be canceled.$"
+
+gUnknown_841CE1C:: @ 841CE1C
+	.string " points$"
+
+gUnknown_841CE24:: @ 841CE24
+	.string "Communication standby…$"
+
+	.string " Are you ready to BERRY-CRUSH?\n"
+	.string "Please pick a BERRY for use.\p"
+	.string "$"
+
+	.string "Please wait while each member\n"
+	.string "chooses a BERRY.$"
+
+	.string " {PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\n"
+	.string "silky-smooth BERRY POWDER.{RESUME_MUSIC}\p"
+	.string "Your total amount of BERRY POWDER\n"
+	.string "is {STR_VAR_2}.\p"
+	.string "$"
+
+	.string " Recording your game results in the\n"
+	.string "save file.\n"
+	.string "Please wait.$"
+
+	.string " Want to play BERRY CRUSH again?$"
+
+	.string "You have no BERRIES.\n"
+	.string "The game will be canceled.$"
+
+	.string "A member dropped out.\n"
+	.string "The game will be canceled.$"
+
+	.string "   Time's up.\p"
+	.string "Good BERRY POWDER could not be\n"
+	.string "made…\p"
+	.string "$"
+
+	.string "   Communication standby…$"
+
+	.align 2
+gUnknown_841D020:: @ 841D020
+	.incbin "baserom.gba", 0x41D020, 0xC
+
+gUnknown_841D02C:: @ 841D02C
+	.incbin "baserom.gba", 0x41D02C, 0x24
+
+gUnknown_841D050:: @ 841D050
+	.incbin "baserom.gba", 0x41D050, 0x8
+
+gUnknown_841D058:: @ 841D058
+	.incbin "baserom.gba", 0x41D058, 0x10
+
+gUnknown_841D068:: @ 841D068
+	.incbin "baserom.gba", 0x41D068, 0xC
+
+gUnknown_841D074:: @ 841D074
+	.incbin "baserom.gba", 0x41D074, 0x4
+
+gUnknown_841D078:: @ 841D078
+	.incbin "baserom.gba", 0x41D078, 0x8
+
+gUnknown_841D080:: @ 841D080
+	.incbin "baserom.gba", 0x41D080, 0x8
+
+gUnknown_841D088:: @ 841D088
+	.incbin "baserom.gba", 0x41D088, 0x8
+
+gUnknown_841D090:: @ 841D090
+	.incbin "baserom.gba", 0x41D090, 0x8
+
+gUnknown_841D098:: @ 841D098
+	.incbin "baserom.gba", 0x41D098, 0xC
+
+gUnknown_841D0A4:: @ 841D0A4
+	.incbin "baserom.gba", 0x41D0A4, 0x4
+
+gUnknown_841D0A8:: @ 841D0A8
+	.incbin "baserom.gba", 0x41D0A8, 0x18
+
+gUnknown_841D0C0:: @ 841D0C0
+	.incbin "baserom.gba", 0x41D0C0, 0x58
+
+gUnknown_841D118:: @ 841D118
+	.incbin "baserom.gba", 0x41D118, 0xC
+
+gUnknown_841D124:: @ 841D124
+	.incbin "baserom.gba", 0x41D124, 0x18
+
+gUnknown_841D13C:: @ 841D13C
+	.incbin "baserom.gba", 0x41D13C, 0xC
+
+gUnknown_841D148:: @ 841D148
+	.incbin "baserom.gba", 0x41D148, 0x6
+
+gUnknown_841D14E:: @ 841D14E
+	.incbin "baserom.gba", 0x41D14E, 0x1B
+
+gUnknown_841D169:: @ 841D169
+	.incbin "baserom.gba", 0x41D169, 0x15
+
+gUnknown_841D17E:: @ 841D17E
+	.incbin "baserom.gba", 0x41D17E, 0xF
+
+gUnknown_841D18D:: @ 841D18D
+	.incbin "baserom.gba", 0x41D18D, 0xB
+
+gUnknown_841D198:: @ 841D198
+	.incbin "baserom.gba", 0x41D198, 0xCB8
+
+gJPText_MysteryGift:: @ 841DE50
+	.string "$"
+
+gJPText_DecideStop:: @ 841DE51
+	.string "$"
+
+gUnknown_841DE52:: @ 841DE52
+	.string "$"
+
+gUnknown_841DE53:: @ 841DE53
+	.string "$"
+
+gUnknown_841DE54:: @ 841DE54
+	.string "$"
+
+gUnknown_841DE55:: @ 841DE55
+	.incbin "baserom.gba", 0x41DE55, 0x27 @ japanese
+
+gUnknown_841DE7C:: @ 841DE7C
+	.string "$"
+
+gUnknown_841DE7D:: @ 841DE7D
+	.string "$"
+
+gUnknown_841DE7E:: @ 841DE7E
+	.incbin "baserom.gba", 0x0041de7e, 0x17 @ japanese
+
+gUnknown_841DE95:: @ 841DE95
+	.string "$"
+
+gUnknown_841DE96:: @ 841DE96
+	.string "$"
+
+gUnknown_841DE97:: @ 841DE97
+	.string "$"
+
+gUnknown_841DE98:: @ 841DE98
+	.string "$"
+
+gUnknown_841DE99:: @ 841DE99
+	.string "$"
+
+gUnknown_841DE9A:: @ 841DE9A
+	.string "$"
+
+gUnknown_841DE9B:: @ 841DE9B
+	.string "$"
+
+gUnknown_841DE9C:: @ 841DE9C
+	.string "$"
+
+gUnknown_841DE9D:: @ 841DE9D
+	.string "Communication error…\n"
+	.string "Please check all connections,\n"
+	.string "then turn the power OFF and ON.$"
+
+gUnknown_841DEF0:: @ 841DEF0
+	.string "Communication error…$"
+
+gUnknown_841DF05:: @ 841DF05
+	.string "Move closer to your link partner(s).\n"
+	.string "Avoid obstacles between partners.$"
+
+gUnknown_841DF4C:: @ 841DF4C
+	.string "A Button: Registration Counter$"
+
+gUnknown_841DF6B:: @ 841DF6B
+	.string "A Button: Title Screen$"
+
+gUnknown_841DF82:: @ 841DF82
+	.string "{STR_VAR_1}P LINK$"
+
+gUnknown_841DF8B:: @ 841DF8B
+	.string "BRONZE$"
+
+gUnknown_841DF92:: @ 841DF92
+	.string "COPPER$"
+
+gUnknown_841DF99:: @ 841DF99
+	.string "SILVER$"
+
+gUnknown_841DFA0:: @ 841DFA0
+	.string "GOLD$"
+
+gUnknown_841DFA5:: @ 841DFA5
+	.string "{KEYGFX_A_BUTTON}NEXT$"
+
+gUnknown_841DFAC:: @ 841DFAC
+	.string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}END$"
+
+gUnknown_841DFBE:: @ 841DFBE
+	.string "{KEYGFX_A_BUTTON}{KEYGFX_B_BUTTON}CANCEL$"
+
+gUnknown_841DFC9:: @ 841DFC9
+	.string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}CANCEL$"
+
+	@ easy chat categories
+	.string "POKéMON$"
+
+	.string "TRAINER$"
+
+	.string "STATUS$"
+
+	.string "BATTLE$"
+
+	.string "GREETINGS$"
+
+	.string "PEOPLE$"
+
+	.string "VOICES$"
+
+	.string "SPEECH$"
+
+	.string "ENDINGS$"
+
+	.string "FEELINGS$"
+
+	.string "CONDITIONS$"
+
+	.string "ACTIONS$"
+
+	.string "LIFESTYLE$"
+
+	.string "HOBBIES$"
+
+	.string "TIME$"
+
+	.string "MISC.$"
+
+	.string "ADJECTIVES$"
+
+	.string "EVENTS$"
+
+	.string "MOVE 1$"
+
+	.string "MOVE 2$"
+
+	.string "TRENDY SAYING$"
+
+	.string "POKéMON2$"
+
+	@ trade-related
+gUnknown_841E093:: @ 841E093
+	.string "???$"
+
+	.string "$"
+
+	.string "Lv$"
+
+	.string "---$"
+
+gUnknown_841E09F:: @ 841E09F
+	.string "????$"
+
+	.string "$"
+
+gUnknown_841E0A5:: @ 841E0A5
+	.string "Is this trade okay?$"
+
+	.string "CANCEL$"
+
+	.string "Choose a POKéMON.$"
+
+	.string "SUMMARY$"
+
+	.string "TRADE$"
+
+	.string "Cancel trade?$"
+
+	.string "Press the B Button to exit.$"
+
+	.string "SUMMARY$"
+
+	.string "TRADE$"
+
+	.string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Communication standby…\n"
+	.string "Please wait.$"
+
+	.string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}The trade has been canceled.$"
+
+	.string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}That's your only POKéMON\n"
+	.string "for battle.$"
+
+	.string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Waiting for your friend\n"
+	.string "to finish…$"
+
+	.string "Your friend wants\n"
+	.string "to trade POKéMON.$"
+
+gUnknown_841E1E9:: @ 841E1E9
+	.string "{STR_VAR_2} will be\n"
+	.string "sent to {STR_VAR_1}.$"
+
+gUnknown_841E200:: @ 841E200
+	.string "Bye-bye, {STR_VAR_2}!$"
+
+gUnknown_841E20D:: @ 841E20D
+	.string "{STR_VAR_1} sent over {STR_VAR_3}.$"
+
+gUnknown_841E21E:: @ 841E21E
+	.string "Take good care of {STR_VAR_3}!$"
+
+gUnknown_841E234:: @ 841E234
+	.string "From $"
+
+gUnknown_841E23A:: @ 841E23A
+	.string "$"
+
+gUnknown_841E23B:: @ 841E23B
+	.string "$"
+
+gUnknown_841E23C:: @ 841E23C
+	.string "$"
+
+gUnknown_841E23D:: @ 841E23D
+	.string "$"
+
+gUnknown_841E23E:: @ 841E23E
+	.string "$"
+
+gUnknown_841E23F:: @ 841E23F
+	.string "$"
+
+gUnknown_841E240:: @ 841E240
+	.string "$"
+
+gUnknown_841E241:: @ 841E241
+	.string "$"
+
+gUnknown_841E242:: @ 841E242
+	.string "$"
+
+gUnknown_841E243:: @ 841E243
+	.string "$"
+
+gUnknown_841E244:: @ 841E244
+	.string "$"
+
+gUnknown_841E245:: @ 841E245
+	.string "Wireless Communication Status$"
+
+gUnknown_841E263:: @ 841E263
+	.string "People trading:$"
+
+gUnknown_841E273:: @ 841E273
+	.string "People battling:$"
+
+gUnknown_841E284:: @ 841E284
+	.string "People in the UNION ROOM:$"
+
+gUnknown_841E29E:: @ 841E29E
+	.string "People communicating:$"
+
+gUnknown_841E2B4:: @ 841E2B4
+	.string "{UNKNOWN_F7 0x00} players$"
+
+gUnknown_841E2BF:: @ 841E2BF
+	.string "{UNKNOWN_F7 0x01} player$"
+
+gUnknown_841E2C9:: @ 841E2C9
+	.string "{UNKNOWN_F7 0x02} players$"
+
+gUnknown_841E2D4:: @ 841E2D4
+	.string "{UNKNOWN_F7 0x03} players$"
+
+gUnknown_841E2DF:: @ 841E2DF
+	.incbin "baserom.gba", 0x41e2df, 0xd
+
+gUnknown_841E2EC:: @ 841E2EC
+	.incbin "baserom.gba", 0x41e2ec, 0x9
+
+gUnknown_841E2F5:: @ 841E2F5
+	.incbin "baserom.gba", 0x41e2f5, 0x2d
+
+gUnknown_841E322:: @ 841E322
+	.string "{EXTRA_ID}$"
+
+gUnknown_841E325:: @ 841E325
+	.string "Communication standby…$"
+
+gDaycareText_GetAlongVeryWell:: @ 841E33C
+	.string "The two seem to get along\n"
+	.string "very well.$"
+
+gDaycareText_GetAlong:: @ 841E361
+	.string "The two seem to get along.$"
+
+gDaycareText_DontLikeOther:: @ 841E37C
+	.string "The two don't seem to like\n"
+	.string "each other much.$"
+
+gDaycareText_PlayOther:: @ 841E3A8
+	.string "The two prefer to play with other\n"
+	.string "POKéMON than each other.$"
+
+gUnknown_841E3E3:: @ 841E3E3
+	.incbin "baserom.gba", 0x41E3E3, 0x18
+
+gUnknown_841E3FB:: @ 841E3FB
+	.incbin "baserom.gba", 0x41E3FB, 0xA
+
+gUnknown_841E405:: @ 841E405
+	.incbin "baserom.gba", 0x41E405, 0xF
+
+gUnknown_841E414:: @ 841E414
+	.incbin "baserom.gba", 0x41E414, 0x6D
+
+gUnknown_841E481:: @ 841E481
+	.incbin "baserom.gba", 0x41E481, 0x12
+
+gUnknown_841E493:: @ 841E493
+	.incbin "baserom.gba", 0x41E493, 0x2D
+
+gUnknown_841E4C0:: @ 841E4C0
+	.incbin "baserom.gba", 0x41E4C0, 0x22
+
+gUnknown_841E4E2:: @ 841E4E2
+	.incbin "baserom.gba", 0x41E4E2, 0x2A
+
+gUnknown_841E50C:: @ 841E50C
+	.incbin "baserom.gba", 0x41E50C, 0x2C
+
+gUnknown_841E538:: @ 841E538
+	.incbin "baserom.gba", 0x41E538, 0x3A
+
+gUnknown_841E572:: @ 841E572
+	.incbin "baserom.gba", 0x41E572, 0x1B
+
+gUnknown_841E58D:: @ 841E58D
+	.incbin "baserom.gba", 0x41E58D, 0x17
+
+gFameCheckerText_MainScreenUI:: @ 841E5A4
+	.string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$"
+
+gFameCheckerText_PickScreenUI:: @ 841E5B9
+	.string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$"
+
+gFameCheckerText_FlavorTextUI:: @ 841E5D2
+	.string "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {KEYGFX_B_BUTTON}CANCEL$"
+
+gFameCheckerOakName:: @ 841E5E9
+	.string "OAK$"
+
+gFameCheckerDaisyName:: @ 841E5ED
+	.string "DAISY$"
+
+gFameCheckerBillName:: @ 841E5F3
+	.string "BILL$"
+
+gFameCheckerMrFujiName:: @ 841E5F8
+	.string "FUJI$"
+
+gText_VarietyOfEventsImportedWireless:: @ 841E5FD
+	.string "A variety of events will be imported\n"
+	.string "over Wireless Communication.$"
+
+gText_WonderCardsInPossession:: @ 841E63F
+	.string "Read the WONDER CARDS in your\n"
+	.string "possession.$"
+
+gText_ReadNewsThatArrived:: @ 841E669
+	.string "Read the NEWS that arrived.$"
+
+gText_ReturnToTitle:: @ 841E685
+	.string "Return to the title screen.$"
+
+gText_DontHaveCardNewOneInput:: @ 841E6A1
+	.string "You don't have a WONDER CARD,\n"
+	.string "so a new CARD will be input.$"
+
+gText_DontHaveNewsNewOneInput:: @ 841E6DC
+	.string "You don't have any WONDER NEWS,\n"
+	.string "so new NEWS will be input.$"
+
+gText_WhereShouldCardBeAccessed:: @ 841E717
+	.string "Where should the WONDER CARD\n"
+	.string "be accessed?$"
+
+gText_WhereShouldNewsBeAccessed:: @ 841E741
+	.string "Where should the WONDER NEWS\n"
+	.string "be accessed?$"
+
+gUnknown_841E76B:: @ 841E76B
+	.string "Link standby...\n"
+	.string "... ... B Button: Cancel$"
+
+gText_Communicating:: @ 841E794
+	.string "Communicating…$"
+
+gText_CommunicationCompleted:: @ 841E7A3
+	.string "Communication completed.$"
+
+gText_CommunicationError:: @ 841E7BC
+	.string "Communication error.$"
+
+gText_CommunicationCanceled:: @ 841E7D1
+	.string "Communication has been canceled.$"
+
+gText_ThrowAwayWonderCard:: @ 841E7F2
+	.string "Throw away the WONDER CARD\n"
+	.string "and input a new CARD?$"
+
+gText_HaventReceivedCardsGift:: @ 841E823
+	.string "You haven't received the CARD's gift\n"
+	.string "yet. Input a new CARD anyway?$"
+
+gText_WonderCardReceivedFrom:: @ 841E866
+	.string "A WONDER CARD has been received\n"
+	.string "from {STR_VAR_1}.$"
+
+gText_WonderNewsReceivedFrom:: @ 841E88F
+	.string "A WONDER NEWS item has been\n"
+	.string "received from {STR_VAR_1}.$"
+
+gText_WonderCardReceived:: @ 841E8BD
+	.string "A new WONDER CARD has been\n"
+	.string "received.$"
+
+gText_WonderNewsReceived:: @ 841E8E2
+	.string "A new WONDER NEWS item has been\n"
+	.string "received.$"
+
+gText_NewStampReceived:: @ 841E90C
+	.string "A new STAMP has been received.$"
+
+gText_NewTrainerReceived:: @ 841E92B
+	.string "A new TRAINER has arrived.$"
+
+gText_AlreadyHadCard:: @ 841E946
+	.string "You already had that\n"
+	.string "WONDER CARD.$"
+
+gText_AlreadyHadNews:: @ 841E968
+	.string "You already had that\n"
+	.string "WONDER NEWS item.$"
+
+gText_AlreadyHadStamp:: @ 841E98F
+	.string "You already had that\n"
+	.string "STAMP.$"
+
+gText_NoMoreRoomForStamps:: @ 841E9AB
+	.string "There's no more room for adding\n"
+	.string "STAMPS.$"
+
+gText_RecordUploadedViaWireless:: @ 841E9D3
+	.string "Your record has been uploaded via\n"
+	.string "WIRELESS COMMUNICATION.$"
+
+gText_CantAcceptCardFromTrainer:: @ 841EA0D
+	.string "You can't accept a WONDER CARD\n"
+	.string "from this TRAINER.$"
+
+gText_CantAcceptNewsFromTrainer:: @ 841EA3F
+	.string "You can't accept WONDER NEWS\n"
+	.string "from this TRAINER.$"
+
+gText_NothingSentOver:: @ 841EA6F
+	.string "Nothing was sent over…$"
+
+gText_WhatToDoWithCards:: @ 841EA86
+	.string "What would you like to do\n"
+	.string "with the WONDER CARDS?$"
+
+gText_WhatToDoWithNews:: @ 841EAB7
+	.string "What would you like to do\n"
+	.string "with the WONDER NEWS?$"
+
+gText_SendingWonderCard:: @ 841EAE7
+	.string "Sending your WONDER CARD…$"
+
+gText_SendingWonderNews:: @ 841EB01
+	.string "Sending your WONDER NEWS item…$"
+
+gText_WonderCardSentTo:: @ 841EB20
+	.string "Your WONDER CARD has been sent\n"
+	.string "to {STR_VAR_1}.$"
+
+gText_WonderNewsSentTo:: @ 841EB46
+	.string "Your WONDER NEWS item has been\n"
+	.string "sent to {STR_VAR_1}.$"
+
+gText_StampSentTo:: @ 841EB71
+	.string "A STAMP has been sent to {STR_VAR_1}.$"
+
+gText_GiftSentTo:: @ 841EB8E
+	.string "A GIFT has been sent to {STR_VAR_1}.$"
+
+gText_OtherTrainerHasCard:: @ 841EBAA
+	.string "The other TRAINER has the same\n"
+	.string "WONDER CARD already.$"
+
+gText_OtherTrainerHasNews:: @ 841EBDE
+	.string "The other TRAINER has the same\n"
+	.string "WONDER NEWS already.$"
+
+gText_OtherTrainerHasStamp:: @ 841EC12
+	.string "The other TRAINER has the same\n"
+	.string "STAMP already.$"
+
+gText_OtherTrainerCanceled:: @ 841EC40
+	.string "The other TRAINER canceled\n"
+	.string "communication.$"
+
+gText_CantSendGiftToTrainer:: @ 841EC6A
+	.string "You can't send a MYSTERY GIFT to\n"
+	.string "this TRAINER.$"
+
+gText_IfThrowAwayCardEventWontHappen:: @ 841EC99
+	.string "If you throw away the CARD,\n"
+	.string "its event won't happen. Okay?$"
+
+gText_OkayToDiscardNews:: @ 841ECD3
+	.string "Is it okay to discard this\n"
+	.string "NEWS item?$"
+
+gText_HaventReceivedGiftOkayToDiscard:: @ 841ECF9
+	.string "You haven't received the\n"
+	.string "GIFT. Is it okay to discard?$"
+
+gText_DataWillBeSaved:: @ 841ED2F
+	.string "Data will be saved.\n"
+	.string "Please wait.$"
+
+gText_SaveCompletedPressA:: @ 841ED50
+	.string "Save completed.\n"
+	.string "Please press the A Button.$"
+
+gText_WonderCardThrownAway:: @ 841ED7B
+	.string "The WONDER CARD was thrown away.$"
+
+gText_WonderNewsThrownAway:: @ 841ED9C
+	.string "The WONDER NEWS was thrown away.$"
+
+gText_MysteryGift:: @ 841EDBD
+	.string "MYSTERY GIFT$"
+
+gText_PickOKCancel:: @ 841EDCA
+	.string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}EXIT$"
+
+gText_WonderCards::
+	.string "WONDER CARDS$"
+
+gText_WonderNews::
+	.string "WONDER NEWS$"
+
+gText_WirelessCommunication::
+	.string "WIRELESS COMMUNICATION$"
+
+gText_Friend2::
+	.string "FRIEND$"
+
+gText_Exit3::
+	.string "EXIT$"
+
+gText_Receive::
+	.string "RECEIVE$"
+
+gText_Send::
+	.string "SEND$"
+
+gText_Toss::
+	.string "TOSS$"
+
+gUnknown_841EE2B:: @ 841EE2B
+	.incbin "baserom.gba", 0x41EE2B, 0x17
diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc
index d73c05dbd..8da7dded8 100644
--- a/data/text/fame_checker.inc
+++ b/data/text/fame_checker.inc
@@ -11,7 +11,7 @@ gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145
 gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
 	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}PROF. OAK may not look like much,\n"
-	.string "but he’s the authority on POKéMON.\p"
+	.string "but he's the authority on POKéMON.\p"
 	.string "Many POKéMON TRAINERS hold him in\n"
 	.string "high regard.$"
 
@@ -22,19 +22,19 @@ gFameCheckerFlavorText_ProfOak3:: @ 0x81AD258
 
 gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
-	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK’s taken a lot of\n"
+	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK's taken a lot of\n"
 	.string "interest in you, child.\p"
 	.string "That old duff was once tough and\n"
 	.string "handsome.\p"
 	.string "But that was decades ago.\n"
-	.string "He’s a shadow of his former self.$"
+	.string "He's a shadow of his former self.$"
 
 gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}PROF. OAK is going to have his own\n"
 	.string "radio show soon.\p"
 	.string "The program will be called PROF.\n"
-	.string "OAK’S POKéMON SEMINAR.$"
+	.string "OAK'S POKéMON SEMINAR.$"
 
 gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
@@ -52,7 +52,7 @@ gFameCheckerFlavorText_Daisy2:: @ 0x81AD516
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}She was gently grooming POKéMON…\n"
 	.string "She was a little angel.\p"
-	.string "That little girl’s name…\n"
+	.string "That little girl's name…\n"
 	.string "I think it was DAISY.$"
 
 gFameCheckerFlavorText_Daisy3:: @ 0x81AD5A7
@@ -68,8 +68,8 @@ gFameCheckerFlavorText_Daisy4:: @ 0x81AD608
 	.string "to buy some TEA.$"
 
 gFameCheckerFlavorText_Daisy5:: @ 0x81AD69F
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
-	.string "{COLOR RED}{SHADOW GREEN}The Spring POKéMON CONTEST’s\n"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
+	.string "{COLOR RED}{SHADOW GREEN}The Spring POKéMON CONTEST's\n"
 	.string "Grand Champion is DAISY OAK of\l"
 	.string "PALLET TOWN!$"
 
@@ -85,28 +85,28 @@ gFameCheckerFlavorText_Brock1:: @ 0x81AD771
 	.string "in even my POKéMON.\p"
 	.string "My POKéMON are all rock hard and\n"
 	.string "have true-grit determination.\p"
-	.string "That’s right - my POKéMON are all\n"
+	.string "That's right - my POKéMON are all\n"
 	.string "the ROCK type!$"
 
 gFameCheckerFlavorText_Brock2:: @ 0x81AD840
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}There aren’t many serious POKéMON\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}There aren't many serious POKéMON\n"
 	.string "TRAINERS here.\p"
-	.string "They’re all like BUG CATCHERS,\n"
+	.string "They're all like BUG CATCHERS,\n"
 	.string "you know, just hobbyists.\p"
-	.string "But PEWTER GYM’s BROCK isn’t like\n"
+	.string "But PEWTER GYM's BROCK isn't like\n"
 	.string "that, not one bit.$"
 
 gFameCheckerFlavorText_Brock3:: @ 0x81AD908
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BROCK is cool. He’s not just tough.\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BROCK is cool. He's not just tough.\n"
 	.string "People like and respect him.\p"
 	.string "I want to become a GYM LEADER\n"
 	.string "like him.$"
 
 gFameCheckerFlavorText_Brock4:: @ 0x81AD99A
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hi, I’m excavating for fossils here\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hi, I'm excavating for fossils here\n"
 	.string "under MT. MOON.\p"
 	.string "Sometimes, BROCK of PEWTER GYM\n"
 	.string "lends me a hand.$"
@@ -129,25 +129,25 @@ gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6
 
 gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}MISTY is a TRAINER who’s going to\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}MISTY is a TRAINER who's going to\n"
 	.string "keep improving.\p"
-	.string "She won’t lose to someone like you!$"
+	.string "She won't lose to someone like you!$"
 
 gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Strong TRAINERS and WATER POKéMON\n"
 	.string "are common sights in these parts.\p"
 	.string "They say that MISTY of the\n"
 	.string "CERULEAN GYM trains here.$"
 
 gFameCheckerFlavorText_Misty4:: @ 0x81ADC72
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}This cape is a famous date spot.\p"
 	.string "MISTY, the GYM LEADER, has high\n"
 	.string "hopes about this place.$"
 
 gFameCheckerFlavorText_Misty5:: @ 0x81ADCEB
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{COLOR RED}{SHADOW GREEN}MISTY is said to worship LORELEI\n"
 	.string "of the ELITE FOUR.$"
 
@@ -180,7 +180,7 @@ gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC
 	.string "He set up double locks everywhere.$"
 
 gFameCheckerFlavorText_LtSurge5:: @ 0x81ADF6A
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{COLOR RED}{SHADOW GREEN}LT. SURGE is rumored to have been\n"
 	.string "a pilot while home in America.\p"
 	.string "He used the electricity generated\n"
@@ -202,7 +202,7 @@ gFameCheckerFlavorText_Erika1:: @ 0x81AE072
 gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
 	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Our LEADER ERIKA might be quiet,\n"
-	.string "but she’s famous around here.$"
+	.string "but she's famous around here.$"
 
 gFameCheckerFlavorText_Erika3:: @ 0x81AE15B
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
@@ -217,7 +217,7 @@ gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5
 	.string "they were unattractive.$"
 
 gFameCheckerFlavorText_Erika5:: @ 0x81AE247
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{COLOR RED}{SHADOW GREEN}Rumor has it that if you peek into\n"
 	.string "CELADON GYM, you can often\l"
 	.string "see ERIKA snoozing.$"
@@ -235,7 +235,7 @@ gFameCheckerFlavorText_Koga1:: @ 0x81AE31D
 
 gFameCheckerFlavorText_Koga2:: @ 0x81AE37D
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Even though I’ve lost, I will keep\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Even though I've lost, I will keep\n"
 	.string "training according to the teachings\l"
 	.string "of KOGA, my ninja master.$"
 
@@ -243,11 +243,11 @@ gFameCheckerFlavorText_Koga3:: @ 0x81AE407
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
 	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}My father is the GYM LEADER of\n"
 	.string "this town.\p"
-	.string "I’m training to use POISON POKéMON\n"
+	.string "I'm training to use POISON POKéMON\n"
 	.string "as well as my father.$"
 
 gFameCheckerFlavorText_Koga4:: @ 0x81AE48D
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{COLOR RED}{SHADOW GREEN}KOGA is said to have a thorough\n"
 	.string "knowledge of medicine.\p"
 	.string "He even concocts medicine to nurse\n"
@@ -255,12 +255,12 @@ gFameCheckerFlavorText_Koga4:: @ 0x81AE48D
 
 gFameCheckerFlavorText_Koga5:: @ 0x81AE51B
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The SAFARI ZONE’s huge, wouldn’t\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The SAFARI ZONE's huge, wouldn't\n"
 	.string "you say?\p"
-	.string "FUCHSIA’s GYM LEADER, KOGA, \n"
+	.string "FUCHSIA's GYM LEADER, KOGA, \n"
 	.string "patrols the grounds every so often.\p"
 	.string "Thanks to him, we can play here\n"
-	.string "knowing that we’re safe.$"
+	.string "knowing that we're safe.$"
 
 gFameCheckerFlavorText_Sabrina0:: @ 0x81AE5E8
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
@@ -288,7 +288,7 @@ gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762
 	.string "I will show you my powers!$"
 
 gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{COLOR RED}{SHADOW GREEN}People say that SABRINA can\n"
 	.string "communicate with her POKéMON\l"
 	.string "during battle without speaking.$"
@@ -321,20 +321,20 @@ gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
 
 gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}CINNABAR GYM’s BLAINE is quite the\n"
+	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}CINNABAR GYM's BLAINE is quite the\n"
 	.string "odd fellow.\p"
-	.string "He’s lived on the island since way\n"
+	.string "He's lived on the island since way\n"
 	.string "before the LAB was built.$"
 
 gFameCheckerFlavorText_Blaine4:: @ 0x81AEAEE
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
-	.string "{COLOR RED}{SHADOW GREEN}It’s a photo of BLAINE and\n"
+	.string "{COLOR RED}{SHADOW GREEN}It's a photo of BLAINE and\n"
 	.string "MR. FUJI.\p"
-	.string "They’re standing shoulder to\n"
+	.string "They're standing shoulder to\n"
 	.string "shoulder with big grins.$"
 
 gFameCheckerFlavorText_Blaine5:: @ 0x81AEB69
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{COLOR RED}{SHADOW GREEN}BLAINE is said to remove his dark\n"
 	.string "shades only when he is thinking up\l"
 	.string "new quiz questions.$"
@@ -350,10 +350,10 @@ gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28
 
 gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Where was this person born?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}We’ve had a great and powerful\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}We've had a great and powerful\n"
 	.string "TRAINER grow up on this island.\p"
-	.string "I bet even you’d know her.\n"
-	.string "It’s LORELEI of the ELITE FOUR!$"
+	.string "I bet even you'd know her.\n"
+	.string "It's LORELEI of the ELITE FOUR!$"
 
 gFameCheckerFlavorText_Lorelei3:: @ 0x81AED27
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
@@ -383,7 +383,7 @@ gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25
 
 gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I’ve lived and trained with my\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I've lived and trained with my\n"
 	.string "fighting POKéMON!$"
 
 gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6
@@ -394,14 +394,14 @@ gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6
 
 gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BRUNO, who’s a senior ahead of me,\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BRUNO, who's a senior ahead of me,\n"
 	.string "visits the SPA on occasion.\p"
 	.string "He comes to rehab injuries, both\n"
-	.string "his own and his POKéMON’s.$"
+	.string "his own and his POKéMON's.$"
 
 gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
-	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He’s one of the ELITE FOUR.\n"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
+	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He's one of the ELITE FOUR.\n"
 	.string "His name is BRUNO.\p"
 	.string "He went away disappointed when he\n"
 	.string "found out that they were all sold\l"
@@ -419,30 +419,30 @@ gFameCheckerFlavorText_Agatha0:: @ 0x81AF200
 
 gFameCheckerFlavorText_Agatha1:: @ 0x81AF248
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}AGATHA’s GHOST-type POKéMON are\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}AGATHA's GHOST-type POKéMON are\n"
 	.string "horrifically terrifying in toughness.$"
 
 gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}That old lady’s also got a really\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}That old lady's also got a really\n"
 	.string "short fuse, too.\p"
-	.string "It doesn’t take anything to get\n"
+	.string "It doesn't take anything to get\n"
 	.string "that scary lady hollering.$"
 
 gFameCheckerFlavorText_Agatha3:: @ 0x81AF34E
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{COLOR RED}{SHADOW GREEN}In her youth, AGATHA and PROF.\n"
 	.string "OAK were rivals who vied for\l"
 	.string "supremacy as TRAINERS.$"
 
 gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
-	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK’s taken a lot of\n"
+	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK's taken a lot of\n"
 	.string "interest in you, child.\p"
 	.string "That old duff was once tough and\n"
 	.string "handsome.\p"
 	.string "But that was decades ago.\n"
-	.string "He’s a shadow of his former self.$"
+	.string "He's a shadow of his former self.$"
 
 gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
@@ -460,19 +460,19 @@ gFameCheckerFlavorText_Lance1:: @ 0x81AF567
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You know that dragons are\n"
 	.string "mythical POKéMON.\p"
-	.string "They’re hard to catch and raise,\n"
+	.string "They're hard to catch and raise,\n"
 	.string "but their powers are superior.\p"
-	.string "They’re virtually indestructible.\n"
-	.string "There’s no being clever with them.$"
+	.string "They're virtually indestructible.\n"
+	.string "There's no being clever with them.$"
 
 gFameCheckerFlavorText_Lance2:: @ 0x81AF641
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
 	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He stands for justice!\n"
-	.string "He’s cool, and yet passionate!\l"
-	.string "He’s the greatest, LANCE!$"
+	.string "He's cool, and yet passionate!\l"
+	.string "He's the greatest, LANCE!$"
 
 gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
 	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}We have a customer, LANCE, who\n"
 	.string "occasionally comes.\p"
 	.string "He always buys capes.\p"
@@ -481,19 +481,19 @@ gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA
 
 gFameCheckerFlavorText_Lance4:: @ 0x81AF758
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
-	.string "{COLOR RED}{SHADOW GREEN}LANCE’s grandfather is thought to\n"
+	.string "{COLOR RED}{SHADOW GREEN}LANCE's grandfather is thought to\n"
 	.string "be the elder of a famous clan of\l"
 	.string "dragon masters.$"
 
 gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}From what I’ve heard, LANCE has\n"
-	.string "a cousin who’s a GYM LEADER\l"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}From what I've heard, LANCE has\n"
+	.string "a cousin who's a GYM LEADER\l"
 	.string "somewhere far away.$"
 
 gFameCheckerFlavorText_Bill0:: @ 0x81AF83E
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}After all, BILL’s world-famous as a\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}After all, BILL's world-famous as a\n"
 	.string "POKéMANIAC.\p"
 	.string "He invented the POKéMON Storage\n"
 	.string "System on PC, too.$"
@@ -505,7 +505,7 @@ gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA
 
 gFameCheckerFlavorText_Bill2:: @ 0x81AF929
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}He’s my grandson!\p"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}He's my grandson!\p"
 	.string "He always liked collecting things,\n"
 	.string "even as a child!$"
 
@@ -518,19 +518,19 @@ gFameCheckerFlavorText_Bill3:: @ 0x81AF998
 
 gFameCheckerFlavorText_Bill4:: @ 0x81AFA20
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL’s hometown is GOLDENROD CITY,\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL's hometown is GOLDENROD CITY,\n"
 	.string "where his folks still live.\p"
-	.string "I’ve heard that it’s quite the\n"
+	.string "I've heard that it's quite the\n"
 	.string "festive, bustling city.$"
 
 gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Apparently, BILL simply can’t\n"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Apparently, BILL simply can't\n"
 	.string "stomach milk at all.$"
 
 gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
-	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He’s really kind.\p"
+	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He's really kind.\p"
 	.string "He looks after abandoned and\n"
 	.string "orphaned POKéMON.$"
 
@@ -539,8 +539,8 @@ gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}This old guy marched right up to\n"
 	.string "our HIDEOUT.\p"
 	.string "Then, he starts ranting about how\n"
-	.string "TEAM ROCKET’s abusing POKéMON.\p"
-	.string "So, we’re just talking it over as\n"
+	.string "TEAM ROCKET's abusing POKéMON.\p"
+	.string "So, we're just talking it over as\n"
 	.string "adults.$"
 
 gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38
@@ -548,19 +548,19 @@ gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38
 	.string "{COLOR RED}{SHADOW GREEN}POKéMON FAN MAGAZINE\n"
 	.string "Monthly Grand Prize Drawing!\p"
 	.string "The application form is…\p"
-	.string "Gone! It’s been clipped out.\n"
+	.string "Gone! It's been clipped out.\n"
 	.string "Someone must have applied already.$"
 
 gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9
-	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I hear that MR. FUJI’s not from\n"
+	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I hear that MR. FUJI's not from\n"
 	.string "these parts originally, either.$"
 
 gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
-	.string "{COLOR RED}{SHADOW GREEN}It’s a photo of BLAINE and\n"
+	.string "{COLOR RED}{SHADOW GREEN}It's a photo of BLAINE and\n"
 	.string "MR. FUJI.\p"
-	.string "They’re standing shoulder to\n"
+	.string "They're standing shoulder to\n"
 	.string "shoulder with big grins.$"
 
 gFameCheckerFlavorText_MrFuji5:: @ 0x81AFDC4
@@ -574,7 +574,7 @@ gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET captures POKéMON from\n"
 	.string "around the world.\p"
-	.string "They’re important tools for keeping\n"
+	.string "They're important tools for keeping\n"
 	.string "our criminal enterprise going.\p"
 	.string "I am the leader, GIOVANNI!$"
 
@@ -587,7 +587,7 @@ gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23
 
 gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET’s BOSS is terribly\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET's BOSS is terribly\n"
 	.string "cruel!\p"
 	.string "To him, POKéMON are just tools to\n"
 	.string "be used.$"
@@ -605,10 +605,10 @@ gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6
 
 gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You… You’re not GIOVANNI’s kid,\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You… You're not GIOVANNI's kid,\n"
 	.string "are you?\p"
-	.string "No, that can’t be right.\n"
-	.string "GIOVANNI’s kid has red hair.$"
+	.string "No, that can't be right.\n"
+	.string "GIOVANNI's kid has red hair.$"
 
 
 gFameCheckerPersonName_ProfOak:: @ 0x81B0188
@@ -631,9 +631,9 @@ gFameCheckerPersonQuote_Daisy:: @ 0x81B025D
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: DAISY\n"
 	.string "To: {PLAYER}\p"
 	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}While I was comfortably enjoying\n"
-	.string "my tea breaks, you’ve grown very\l"
+	.string "my tea breaks, you've grown very\l"
 	.string "skilled and powerful.\p"
-	.string "I hope you’ll remain a good rival\n"
+	.string "I hope you'll remain a good rival\n"
 	.string "to my little brother.$"
 
 gFameCheckerPersonName_Brock:: @ 0x81B030F
@@ -644,7 +644,7 @@ gFameCheckerPersonQuote_Brock:: @ 0x81B031B
 	.string "To: {PLAYER}\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}In this big world of ours, there\n"
 	.string "must be many tough TRAINERS.\p"
-	.string "Let’s both keep training and\n"
+	.string "Let's both keep training and\n"
 	.string "making ourselves stronger!$"
 
 gFameCheckerPersonName_Misty:: @ 0x81B03B3
@@ -653,9 +653,9 @@ gFameCheckerPersonName_Misty:: @ 0x81B03B3
 gFameCheckerPersonQuote_Misty:: @ 0x81B03BF
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: MISTY\n"
 	.string "To: {PLAYER}\p"
-	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I’m going to keep training here at\n"
+	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I'm going to keep training here at\n"
 	.string "this GYM.\p"
-	.string "When I get better, I’d love to hit\n"
+	.string "When I get better, I'd love to hit\n"
 	.string "the road and travel.$"
 
 gFameCheckerPersonName_LtSurge:: @ 0x81B0446
@@ -666,7 +666,7 @@ gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456
 	.string "To: {PLAYER}\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hey, kid!\n"
 	.string "You electrified me in our battle!\p"
-	.string "I didn’t know that there were\n"
+	.string "I didn't know that there were\n"
 	.string "gutsy TRAINERS like you.\p"
 	.string "It made me change my mind about\n"
 	.string "you!$"
@@ -713,7 +713,7 @@ gFameCheckerPersonQuote_Blaine:: @ 0x81B0708
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BLAINE\n"
 	.string "To: {PLAYER}\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My fire POKéMON!\n"
-	.string "They’ll become even more powerful!\p"
+	.string "They'll become even more powerful!\p"
 	.string "And now, a quiz. How many kinds of\n"
 	.string "FIRE-type POKéMON are there?$"
 
@@ -727,7 +727,7 @@ gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD
 	.string "help.\p"
 	.string "But that has nothing to do with our\n"
 	.string "battles.\p"
-	.string "You’d better watch out next time!$"
+	.string "You'd better watch out next time!$"
 
 gFameCheckerPersonName_Bruno:: @ 0x81B0845
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BRUNO$"
@@ -736,7 +736,7 @@ gFameCheckerPersonQuote_Bruno:: @ 0x81B0851
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BRUNO\n"
 	.string "To: {PLAYER}\p"
 	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The super power of your POKéMON\n"
-	.string "and you I’ve experienced myself.\p"
+	.string "and you I've experienced myself.\p"
 	.string "Next time, maybe I should show you\n"
 	.string "how to train yourself.$"
 
@@ -746,7 +746,7 @@ gFameCheckerPersonName_Agatha:: @ 0x81B08EE
 gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: AGATHA\n"
 	.string "To: {PLAYER}\p"
-	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}When you grow older, don’t you\n"
+	.string "{SIZE 05}{COLOR RED}{SHADOW GREEN}When you grow older, don't you\n"
 	.string "dare go soft like that coot OAK!\p"
 	.string "Be like me and keep battling on!$"
 
@@ -756,11 +756,11 @@ gFameCheckerPersonName_Lance:: @ 0x81B097F
 gFameCheckerPersonQuote_Lance:: @ 0x81B098B
 	.string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LANCE\n"
 	.string "To: {PLAYER}\p"
-	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I’m considering going back to my\n"
+	.string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I'm considering going back to my\n"
 	.string "hometown.\p"
 	.string "I want to retrain my DRAGON-type\n"
 	.string "POKéMON and strengthen them.\p"
-	.string "I’d like to invite you to my\n"
+	.string "I'd like to invite you to my\n"
 	.string "hometown one day.$"
 
 gFameCheckerPersonName_Bill:: @ 0x81B0A45
@@ -1432,7 +1432,7 @@ gUnknown_81B17E9:: @ 81B17E9
 gUnknown_81B187F:: @ 81B187F
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
-	.string "ELITE FOUR’s LORELEI!\p"
+	.string "ELITE FOUR's LORELEI!\p"
 	.string "Known for her logical, calculated,\n"
 	.string "and cool battling style, LORELEI\l"
 	.string "has a surprising secret!$"
@@ -1440,7 +1440,7 @@ gUnknown_81B187F:: @ 81B187F
 gUnknown_81B1913:: @ 81B1913
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
-	.string "ELITE FOUR’s BRUNO!\p"
+	.string "ELITE FOUR's BRUNO!\p"
 	.string "BRUNO apparently joined the ELITE\n"
 	.string "FOUR out of his burning ambition to\l"
 	.string "battle the best TRAINERS.$"
@@ -1448,7 +1448,7 @@ gUnknown_81B1913:: @ 81B1913
 gUnknown_81B19A8:: @ 81B19A8
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
-	.string "ELITE FOUR’s AGATHA!\p"
+	.string "ELITE FOUR's AGATHA!\p"
 	.string "In her youth, AGATHA and PROF.\n"
 	.string "OAK were rivals who vied for\l"
 	.string "supremacy as TRAINERS.$"
@@ -1456,8 +1456,8 @@ gUnknown_81B19A8:: @ 81B19A8
 gUnknown_81B1A31:: @ 81B1A31
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
-	.string "ELITE FOUR’s LANCE!\p"
-	.string "LANCE’s grandfather is thought to\n"
+	.string "ELITE FOUR's LANCE!\p"
+	.string "LANCE's grandfather is thought to\n"
 	.string "be the elder of a famous clan of\l"
 	.string "dragon masters.$"
 
@@ -1473,7 +1473,7 @@ gUnknown_81B1B3D:: @ 81B1B3D
 	.string "years ago…\p"
 	.string "POKéMON JOURNAL\n"
 	.string "CONTEST Special!\p"
-	.string "The Spring POKéMON CONTEST’s\n"
+	.string "The Spring POKéMON CONTEST's\n"
 	.string "Grand Champion is DAISY OAK of\l"
 	.string "PALLET TOWN!$"
 
@@ -1502,7 +1502,7 @@ gUnknown_81B1CC1:: @ 81B1CC1
 	.string "Press START to open the MENU!$"
 
 gUnknown_81B1CEC:: @ 81B1CEC
-	.string "Signs are useful, aren’t they?$"
+	.string "Signs are useful, aren't they?$"
 
 gUnknown_81B1D0B:: @ 81B1D0B
 	.string "Look, look!\p"
@@ -1514,14 +1514,14 @@ gUnknown_81B1D51:: @ 81B1D51
 	.string "Press START to open the MENU!$"
 
 gUnknown_81B1D7D:: @ 81B1D7D
-	.string "It’s a POKéMON PRINTER!\p"
+	.string "It's a POKéMON PRINTER!\p"
 	.string "It can put a print of your POKéMON\n"
 	.string "on the back of your TRAINER CARD.\p"
 	.string "It costs only ¥50.\n"
 	.string "Would you like to try it?$"
 
 gUnknown_81B1E07:: @ 81B1E07
-	.string "You don’t have enough money.$"
+	.string "You don't have enough money.$"
 
 gUnknown_81B1E24:: @ 81B1E24
 	.string "Please choose the print type.$"
@@ -1542,20 +1542,20 @@ gUnknown_81B1EB3:: @ 81B1EB3
 
 gUnknown_81B1EF8:: @ 81B1EF8
 	.string "Oh, excellent!\n"
-	.string "You’ve come to the right place!\p"
+	.string "You've come to the right place!\p"
 	.string "Look, look! See? See?\n"
 	.string "These are my STICKERS!\l"
 	.string "Look how many I got!\p"
 	.string "I bet you want some.\n"
 	.string "I bet you do!\p"
-	.string "I’ll give a STICKER if you can tell\n"
+	.string "I'll give a STICKER if you can tell\n"
 	.string "me something awesome about\l"
 	.string "yourself.\p"
 	.string "What will you brag about?$"
 
 gUnknown_81B1FEF:: @ 81B1FEF
 	.string "Brag about something for me.\n"
-	.string "I’ll give you a STICKER.$"
+	.string "I'll give you a STICKER.$"
 
 gUnknown_81B2025:: @ 81B2025
 	.string "Oh, hi!\n"
@@ -1566,27 +1566,27 @@ gUnknown_81B2025:: @ 81B2025
 gUnknown_81B206E:: @ 81B206E
 	.string "Oh, wow, you made it into the\n"
 	.string "HALL OF FAME.\p"
-	.string "That’s pretty good, yup!\n"
-	.string "I’ll give you one of these.$"
+	.string "That's pretty good, yup!\n"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B20CF:: @ 81B20CF
-	.string "Oh, wow, you’ve entered the\n"
+	.string "Oh, wow, you've entered the\n"
 	.string "HALL OF FAME often!\p"
-	.string "That’s impressive, yup!\n"
-	.string "I’ll give you one of these.$"
+	.string "That's impressive, yup!\n"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B2133:: @ 81B2133
-	.string "Whoa! You’ve made it into the\n"
+	.string "Whoa! You've made it into the\n"
 	.string "HALL OF FAME that often?\l"
-	.string "That’s seriously incredible, yup!\p"
+	.string "That's seriously incredible, yup!\p"
 	.string "You own the POKéMON LEAGUE!\n"
-	.string "I’ll give you one of these.$"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B21C4:: @ 81B21C4
-	.string "No way! You’ve gone into the\n"
+	.string "No way! You've gone into the\n"
 	.string "HALL OF FAME that many times?\p"
-	.string "You’re beyond incredible, yup!\n"
-	.string "That’s it, I have to give you this.$"
+	.string "You're beyond incredible, yup!\n"
+	.string "That's it, I have to give you this.$"
 
 gUnknown_81B2242:: @ 81B2242
 	.string "The HALL OF FAME STICKER was\n"
@@ -1599,33 +1599,33 @@ gUnknown_81B227C:: @ 81B227C
 
 gUnknown_81B22B0:: @ 81B22B0
 	.string "Oh, no, no can do.\p"
-	.string "You’re practically a living legend.\n"
+	.string "You're practically a living legend.\n"
 	.string "I have no SITCKERS left to give.$"
 
 gUnknown_81B2308:: @ 81B2308
 	.string "Oh, wow, there are POKéMON EGGS?\n"
-	.string "I didn’t know that!\p"
-	.string "That’s pretty good, yup!\n"
-	.string "I’ll give you one of these.$"
+	.string "I didn't know that!\p"
+	.string "That's pretty good, yup!\n"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B2372:: @ 81B2372
-	.string "You’ve hatched that many EGGS?\n"
+	.string "You've hatched that many EGGS?\n"
 	.string "You really must like them!\p"
-	.string "That’s impressive, yup!\n"
-	.string "I’ll give you one of these.$"
+	.string "That's impressive, yup!\n"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B23E0:: @ 81B23E0
-	.string "Whoa! You’ve hatched a whole\n"
+	.string "Whoa! You've hatched a whole\n"
 	.string "bunch of EGGS!\p"
-	.string "You’re an EGG-hatching machine!\n"
-	.string "I’ll give you one of these.$"
+	.string "You're an EGG-hatching machine!\n"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B2448:: @ 81B2448
 	.string "Wh… You hatched that many EGGS?\p"
-	.string "What’s behind your love of EGGS?\n"
-	.string "It’s beyond incredible, yup!\p"
-	.string "You’re too awesome, I tell you.\n"
-	.string "That’s it, I have to give you this.$"
+	.string "What's behind your love of EGGS?\n"
+	.string "It's beyond incredible, yup!\p"
+	.string "You're too awesome, I tell you.\n"
+	.string "That's it, I have to give you this.$"
 
 gUnknown_81B24EA:: @ 81B24EA
 	.string "The EGG STICKER was applied\n"
@@ -1638,34 +1638,34 @@ gUnknown_81B251B:: @ 81B251B
 
 gUnknown_81B254F:: @ 81B254F
 	.string "Oh, no, no can do.\p"
-	.string "You’re practically a living legend.\n"
+	.string "You're practically a living legend.\n"
 	.string "I have no SITCKERS left to give.$"
 
 gUnknown_81B25A7:: @ 81B25A7
-	.string "Oh, wow, you’ve had success\n"
+	.string "Oh, wow, you've had success\n"
 	.string "link battling?\p"
-	.string "You’re pretty strong, yup!\n"
-	.string "I’ll give you one of these.$"
+	.string "You're pretty strong, yup!\n"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B2609:: @ 81B2609
-	.string "You’ve beaten your friends a lot\n"
+	.string "You've beaten your friends a lot\n"
 	.string "link battling, huh?\p"
-	.string "You’re impressively strong, yup!\n"
-	.string "I’ll give you one of these.$"
+	.string "You're impressively strong, yup!\n"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B267B:: @ 81B267B
-	.string "Whoa! You’ve beaten your friends\n"
+	.string "Whoa! You've beaten your friends\n"
 	.string "a frightful number of times.\p"
 	.string "Have you lost friends over this?\n"
-	.string "I’ll give you one of these.$"
+	.string "I'll give you one of these.$"
 
 gUnknown_81B26F6:: @ 81B26F6
 	.string "Wh… Wickedly whoa!\n"
-	.string "You’ve won mind-blowingly often!\p"
+	.string "You've won mind-blowingly often!\p"
 	.string "It just knocks me out thinking\n"
 	.string "about how tough you are.\p"
-	.string "You’re the stuff of nightmares!\n"
-	.string "That’s it, I have to give you this.$"
+	.string "You're the stuff of nightmares!\n"
+	.string "That's it, I have to give you this.$"
 
 gUnknown_81B27A6:: @ 81B27A6
 	.string "The VICTORY STICKER was applied\n"
@@ -1678,23 +1678,5 @@ gUnknown_81B27DB:: @ 81B27DB
 
 gUnknown_81B280F:: @ 81B280F
 	.string "Oh, no, no can do.\p"
-	.string "You’re practically a living legend.\n"
+	.string "You're practically a living legend.\n"
 	.string "I have no SITCKERS left to give.$"
-
-gUnknown_81B2867:: @ 81B2867
-
-gUnknown_81B2E1C:: @ 81B2E1C
-	.incbin "baserom.gba", 0x001b2867, 0x5b5
-	.string "How do I do this?$"
-
-gUnknown_81B2E2E:: @ 81B2E2E
-	.string "What does this term mean?$"
-
-gUnknown_81B2E48:: @ 81B2E48
-	.string "About this game$"
-
-gUnknown_81B2E58:: @ 81B2E58
-	.string "Type Matchup List$"
-
-gUnknown_81B2E6A:: @ 81B2E6A
-	.string "EXIT$"
diff --git a/data/text/help_system.inc b/data/text/help_system.inc
new file mode 100644
index 000000000..a85af88a8
--- /dev/null
+++ b/data/text/help_system.inc
@@ -0,0 +1,1879 @@
+gUnknown_81B2DF8:: @ 81B2DF8
+	.string "What should I do in this situation?$"
+
+gUnknown_81B2E1C:: @ 81B2E1C
+	.string "How do I do this?$"
+
+gUnknown_81B2E2E:: @ 81B2E2E
+	.string "What does this term mean?$"
+
+gUnknown_81B2E48:: @ 81B2E48
+	.string "About this game$"
+
+gUnknown_81B2E58:: @ 81B2E58
+	.string "Type Matchup List$"
+
+gUnknown_81B2E6A:: @ 81B2E6A
+	.string "EXIT$"
+
+gUnknown_81B2E6F:: @ 81B2E6F
+	.string "CANCEL$"
+
+gUnknown_81B2E76::
+	.string "じぶんの ちからで やってみよう！$"
+
+gUnknown_81B2E88:: @ 81B2E88
+	.string "Select to obtain hints for getting\n"
+	.string "over challenging situations.$"
+
+gUnknown_81B2EC8:: @ 81B2EC8
+	.string "Detailed instructions are given for\n"
+	.string "various operations.$"
+
+gUnknown_81B2F00:: @ 81B2F00
+	.string "Detailed descriptions are given for\n"
+	.string "terms that appear in the game.$"
+
+gUnknown_81B2F43:: @ 81B2F43
+	.string "Detailed descriptions are given\n"
+	.string "about this game.$"
+
+gUnknown_81B2F74:: @ 81B2F74
+	.string "The matchups of  POKéMON types\n"
+	.string "and moves are listed.$"
+
+gUnknown_81B2FA9:: @ 81B2FA9
+	.string "Select to exit the HELP System.$"
+
+gUnknown_81B2FC9:: @ 81B2FC9
+	.string "Greetings! This is the HELP System.\n"
+	.string "Call me up whenever and wherever you\l"
+	.string "need by p"
+
+gUnknown_81B301B:: @ 81B301B
+	.string "ressing the L or R Button.\l"
+	.string "The help messages change to suit the\l"
+	.string "situation, so check them often, please.$"
+
+gUnknown_81B3083:: @ 81B3083
+	.string "I'm playing for the first time. Help!$"
+
+gUnknown_81B30A9:: @ 81B30A9
+	.string "What should I be doing?$"
+
+gUnknown_81B30C1:: @ 81B30C1
+	.string "I can't get out of a room!$"
+
+gUnknown_81B30DC:: @ 81B30DC
+	.string "I can't find the person I want.$"
+
+gUnknown_81B30FC:: @ 81B30FC
+	.string "I've talked to everyone. Now what?$"
+
+gUnknown_81B311F:: @ 81B311F
+	.string "There's someone blocking my way!$"
+
+gUnknown_81B3140:: @ 81B3140
+	.string "I can't go on!$"
+
+gUnknown_81B314F:: @ 81B314F
+	.string "I'm out of things to do.$"
+
+gUnknown_81B3168:: @ 81B3168
+	.string "What happened to the item I got?$"
+
+gUnknown_81B3189:: @ 81B3189
+	.string "What are the basics of my adventure?$"
+
+gUnknown_81B31AE:: @ 81B31AE
+	.string "How are roads and forests different?$"
+
+gUnknown_81B31D3:: @ 81B31D3
+	.string "How are caves different?$"
+
+gUnknown_81B31EC:: @ 81B31EC
+	.string "How do I progress?$"
+
+gUnknown_81B31FF:: @ 81B31FF
+	.string "When can I use items?$"
+
+gUnknown_81B3215:: @ 81B3215
+	.string "What's a battle?$"
+
+gUnknown_81B3226:: @ 81B3226
+	.string "How do I prepare for battle?$"
+
+gUnknown_81B3243:: @ 81B3243
+	.string "What is a POKéMON's vitality?$"
+
+gUnknown_81B3261:: @ 81B3261
+	.string "My POKéMON are hurt!$"
+
+gUnknown_81B3276:: @ 81B3276
+	.string "What is a status problem?$"
+
+gUnknown_81B3290:: @ 81B3290
+	.string "What happens if all my POKéMON faint?$"
+
+gUnknown_81B32B6:: @ 81B32B6
+	.string "I can't catch POKéMON!$"
+
+gUnknown_81B32CD:: @ 81B32CD
+	.string "I ran out of POTIONS.$"
+
+gUnknown_81B32E3:: @ 81B32E3
+	.string "Can I buy POKé BALLS?$"
+
+gUnknown_81B32F9:: @ 81B32F9
+	.string "What's a TRAINER?$"
+
+gUnknown_81B330B:: @ 81B330B
+	.string "How do I win against a TRAINER?$"
+
+gUnknown_81B332B:: @ 81B332B
+	.string "Where do POKéMON appear?$"
+
+gUnknown_81B3344:: @ 81B3344
+	.string "What are POKéMON moves?$"
+
+gUnknown_81B335C:: @ 81B335C
+	.string "What are HIDDEN moves?$"
+
+gUnknown_81B3373:: @ 81B3373
+	.string "What moves should I use?$"
+
+gUnknown_81B338C:: @ 81B338C
+	.string "I want to add more moves.$"
+
+gUnknown_81B33A6:: @ 81B33A6
+	.string "I want to make my POKéMON stronger.$"
+
+gUnknown_81B33CA:: @ 81B33CA
+	.string "The foe POKéMON are too strong!$"
+
+gUnknown_81B33EA:: @ 81B33EA
+	.string "What do I do in a cave?$"
+
+gUnknown_81B3402:: @ 81B3402
+	.string "There's nothing that I want to know!$"
+
+gUnknown_81B3427:: @ 81B3427
+	.string "What's a POKéMON CENTER?$"
+
+gUnknown_81B3440:: @ 81B3440
+	.string "What's a POKéMON MART?$"
+
+gUnknown_81B3457:: @ 81B3457
+	.string "I want to end the game.$"
+
+gUnknown_81B346F:: @ 81B346F
+	.string "What's a POKéMON?$"
+
+gUnknown_81B3481:: @ 81B3481
+	.string "What is that person like?$"
+
+gUnknown_81B349B:: @ 81B349B
+	.string "What does a HIDDEN move do?$"
+
+gUnknown_81B34B7:: @ 81B34B7
+	.string "What do I do in a SAFARI GAME?$"
+
+gUnknown_81B34D6:: @ 81B34D6
+	.string "What are the SAFARI GAME rules?$"
+
+gUnknown_81B34F6:: @ 81B34F6
+	.string "I want to end this SAFARI GAME!$"
+
+gUnknown_81B3516:: @ 81B3516
+	.string "What is a GYM?$"
+
+gUnknown_81B3525:: @ 81B3525
+	.string "You become the main character,\n"
+	.string "exploring the world of POKéMON.\l"
+	.string "By talking to people and solving\l"
+	.string "mysteries, new paths will open to you.\l"
+	.string "Strive for the goal together with your\l"
+	.string "wonderful POKéMON.$"
+
+gUnknown_81B35E6:: @ 81B35E6
+	.string "When you come across another person,\n"
+	.string "go up to them and press the A Button.\l"
+	.string "That will get them to talk and interact\l"
+	.string "with your character. You may also\l"
+	.string "examine various items and objects in\l"
+	.string "the same way. Talk to people and check\l"
+	.string "things often to obtain information.$"
+
+gUnknown_81B36EB:: @ 81B36EB
+	.string "On the stairs or the exits of a\n"
+	.string "building is a red mat. Move your\l"
+	.string "character to stand on top of the\l"
+	.string "red mat. Press the {EXTRA_PLUS} Control Pad \l"
+	.string "toward the stairs or the exit to\l"
+	.string "advance.$"
+
+gUnknown_81B379A:: @ 81B379A
+	.string "This isn't something you should worry\n"
+	.string "about too much.\l"
+	.string "Talk to other people, check signs,\l"
+	.string "check things, and so on.\l"
+	.string "Sometimes, you may need to just move\l"
+	.string "to a new town or place.$"
+
+gUnknown_81B3849:: @ 81B3849
+	.string "Try moving on to a new road, town, or\n"
+	.string "place.$"
+
+gUnknown_81B3876:: @ 81B3876
+	.string "There could be something in the town\n"
+	.string "or inside a building that is the cause.\l"
+	.string "Try talking to the people in the area\l"
+	.string "again. If there is a problem that they\l"
+	.string "need solved, you may have to help.\l"
+	.string "Afterwards, try talking to the person\l"
+	.string "blocking your way again.$"
+
+gUnknown_81B3972:: @ 81B3972
+	.string "Try talking to people by going up to\n"
+	.string "them and pressing the A Button.\l"
+	.string "Also, try checking things like odd trees\l"
+	.string "and strange rocks with the A Button.\l"
+	.string "Press the {EXTRA_PLUS} Control Pad and try going\l"
+	.string "to places that look impassable, too.$"
+
+gUnknown_81B3A51:: @ 81B3A51
+	.string "Try going to places where you \n"
+	.string "haven't visited yet.\l"
+	.string "Also, check everything that looks\l"
+	.string "suspicious by pressing the A Button.$"
+
+gUnknown_81B3ACC:: @ 81B3ACC
+	.string "Any item that you are given by another\n"
+	.string "character goes in your BAG.\l"
+	.string "The item is automatically sorted and\l"
+	.string "placed in one of three pockets.\l"
+	.string "For instructions on the BAG's use,\l"
+	.string "please refer to the HELP System's\l"
+	.string "“How do I do this?” heading.$"
+
+gUnknown_81B3BB6:: @ 81B3BB6
+	.string "If POKéMON are hurt in battle,\n"
+	.string "take them to a POKéMON CENTER and\l"
+	.string "have them healed by the staff.\l"
+	.string "Get in the habit of saving your\l"
+	.string "game and recording your progress.\l"
+	.string "Stock up on healing items at\l"
+	.string "POKéMON MARTS before traveling far.$"
+
+gUnknown_81B3C99:: @ 81B3C99
+	.string "Forests are basically the same as\n"
+	.string "roads but they can be like mazes.\l"
+	.string "All forests have a way out, so don't\l"
+	.string "give up if you get lost.$"
+
+gUnknown_81B3D1B:: @ 81B3D1B
+	.string "Caves are dark and dangerous. Wild\n"
+	.string "POKéMON can appear anywhere in them.\l"
+	.string "If there is an emergency, rush to a\l"
+	.string "POKéMON CENTER or use items.\l"
+	.string "New towns await discovery beyond some\l"
+	.string "caves, so don't give up.$"
+
+gUnknown_81B3DE3:: @ 81B3DE3
+	.string "The object of the game is to train\n"
+	.string "your POKéMON and move forward.\l"
+	.string "You must collect info and solve\l"
+	.string "problems. For example, what do you\l"
+	.string "need to get around an obstacle?\l"
+	.string "What would get that impeding\l"
+	.string "person out of the way?$"
+
+gUnknown_81B3EBC:: @ 81B3EBC
+	.string "There are several kinds of items.\n"
+	.string "Some can be used only on the field.\l"
+	.string "Some are only for use during battle.\l"
+	.string "Some can be used anytime.\l"
+	.string "Try using an item - if it can't be used,\l"
+	.string "you will be alerted.$"
+
+gUnknown_81B3F7F:: @ 81B3F7F
+	.string "In a battle, POKéMON try to reduce\n"
+	.string "one another's vitality, expressed as\l"
+	.string "HP. If a POKéMON's HP falls to zero,\l"
+	.string "it faints, and the other POKéMON\l"
+	.string "wins. By winning a battle, POKéMON\l"
+	.string "earn EXP. Points, which help them\l"
+	.string "level up (grow stronger).$"
+
+gUnknown_81B406C:: @ 81B406C
+	.string "First, fully heal the POKéMON in your\n"
+	.string "party (the POKéMON with you) at any\l"
+	.string "POKéMON CENTER.\l"
+	.string "You should also buy healing items for\l"
+	.string "emergencies at a POKéMON MART.$"
+
+gUnknown_81B410B:: @ 81B410B
+	.string "A POKéMON's vitality is expressed in HP.\n"
+	.string "If a POKéMON is hurt in battle, HP is\l"
+	.string "subtracted. If its HP drops to zero,\l"
+	.string "the POKéMON faints.\l"
+	.string "Heal hurt or fainted POKéMON at a\l"
+	.string "POKéMON CENTER or by using items.$"
+
+gUnknown_81B41D7:: @ 81B41D7
+	.string "A POKéMON CENTER is like an inn for\n"
+	.string "POKéMON. It will fully heal POKéMON of\l"
+	.string "any status problems and fully restore\l"
+	.string "their HP using a special machine.\l"
+	.string "This service is free, so get in the\l"
+	.string "habit of healing your POKéMON often.$"
+
+gUnknown_81B42B3:: @ 81B42B3
+	.string "A status problem refers to an ailment\n"
+	.string "that is inflicted on a POKéMON by its\l"
+	.string "foe's attack. These include burns,\l"
+	.string "paralysis, poisoning, sleep, and\l"
+	.string "freezing. These can be healed by\l"
+	.string "visiting a POKéMON CENTER or using\l"
+	.string "the appropriate item.$"
+
+gUnknown_81B439D:: @ 81B439D
+	.string "If all the POKéMON in your party\n"
+	.string "(all the POKéMON with you) faint, you\l"
+	.string "lose some MONEY, and you are\l"
+	.string "returned home or to a POKéMON\l"
+	.string "CENTER. To reduce that chance, visit\l"
+	.string "POKéMON CENTERS often. Also, get\l"
+	.string "in the habit of saving often.$"
+
+gUnknown_81B4483:: @ 81B4483
+	.string "If a wild POKéMON escapes from a POKé\n"
+	.string "BALL, it's obviously still feisty.\l"
+	.string "Try reducing its HP some more, and\l"
+	.string "try to weaken it with paralysis or sleep\l"
+	.string "before trying to catch it.\l"
+	.string "If the POKé BALL rocks for a while,\l"
+	.string "the quarry is close to being caught!$"
+
+gUnknown_81B457C:: @ 81B457C
+	.string "There are shops, known as POKéMON\n"
+	.string "MARTS, that sell items.\l"
+	.string "You will not find POKéMON MARTS on\l"
+	.string "roads, in forests, or in caves.\l"
+	.string "Stock up on needed items while you are\l"
+	.string "visiting a town with a POKéMON MART.$"
+
+gUnknown_81B4645:: @ 81B4645
+	.string "You may buy POKé BALLS at any\n"
+	.string "POKéMON MART in any town.\l"
+	.string "You will not find POKéMON MARTS on\l"
+	.string "roads, in forests, or in caves.\l"
+	.string "Stock up on POKé BALLS while you are\l"
+	.string "visiting a town with a POKéMON MART.$"
+
+gUnknown_81B470A:: @ 81B470A
+	.string "A TRAINER is a person who raises\n"
+	.string "POKéMON through battling.\l"
+	.string "TRAINERS will challenge you \l"
+	.string "wherever they are - it could be on\l"
+	.string "a road, in forests, caves, anywhere.\l"
+	.string "If your eyes meet, you have to accept\l"
+	.string "their challenge. So be careful!$"
+
+gUnknown_81B47F0:: @ 81B47F0
+	.string "To beat a TRAINER in battle, use\n"
+	.string "POKéMON that have type advantages\l"
+	.string "over the foe's POKéMON. You may also\l"
+	.string "use highly trained POKéMON with\l"
+	.string "overwhelming power. Outnumbering the\l"
+	.string "foe's POKéMON is another obvious\l"
+	.string "tactic.$"
+
+gUnknown_81B48C6:: @ 81B48C6
+	.string "Wild POKéMON will appear in tall grass,\n"
+	.string "on roads, and in forests. They will\l"
+	.string "appear anywhere in dark caves.\l"
+	.string "There are no wild POKéMON or TRAINERS\l"
+	.string "in towns, so they are safe places.$"
+
+gUnknown_81B497A:: @ 81B497A
+	.string "POKéMON may learn up to four different\n"
+	.string "techniques, or moves. There is a great\l"
+	.string "variety of moves including attacks and\l"
+	.string "those with special effects. The kinds\l"
+	.string "of moves that can be learned vary\l"
+	.string "for each POKéMON. Some moves\l"
+	.string "can be learned from machines.$"
+
+gUnknown_81B4A72:: @ 81B4A72
+	.string "HIDDEN moves are those that are\n"
+	.string "especially important for your\l"
+	.string "adventure. To use such a move outside\l"
+	.string "of battle, open the “POKéMON” MENU\l"
+	.string "and make the POKéMON that knows the\l"
+	.string "move use it. A fainted POKéMON may use\l"
+	.string "a HIDDEN move outside of battle.$"
+
+gUnknown_81B4B65:: @ 81B4B65
+	.string "Select “FIGHT,” and the MENU of moves\n"
+	.string "will appear. Consider the type\l"
+	.string "matchups, and use the most effective\l"
+	.string "moves. You can check the effects of\l"
+	.string "moves by opening “POKéMON,”\l"
+	.string "picking a POKéMON, opening “SUMMARY,”\l"
+	.string "then opening “POKéMON SKILLS.”$"
+
+gUnknown_81B4C54:: @ 81B4C54
+	.string "The most a POKéMON can learn is four\n"
+	.string "moves. They are learned as the\l"
+	.string "POKéMON levels up. It can also be\l"
+	.string "taught a move using a TM (Technical\l"
+	.string "Machine) or HM (Hidden Machine).\l"
+	.string "There are also people who teach moves.$"
+
+gUnknown_81B4D26:: @ 81B4D26
+	.string "The key to making your POKéMON\n"
+	.string "strong is to battle and win often.\l"
+	.string "The EXP. (Experience) Points earned\l"
+	.string "by winning battles accumulate to\l"
+	.string "level up POKéMON that participated in\l"
+	.string "them. Battle wild POKéMON often to\l"
+	.string "level up your party.$"
+
+gUnknown_81B4E0B:: @ 81B4E0B
+	.string "If your foes are too strong, try\n"
+	.string "leveling up your POKéMON some more.\l"
+	.string "Go back the way you came and battle\l"
+	.string "wild POKéMON to level up your party.\l"
+	.string "You may also battle TRAINERS whom you\l"
+	.string "have not battled before.$"
+
+gUnknown_81B4ED8:: @ 81B4ED8
+	.string "Unlike roads and forests, wild POKéMON\n"
+	.string "can appear anywhere in caves.\l"
+	.string "If your POKéMON are hurt in a cave,\l"
+	.string "rush to a POKéMON CENTER or use items\l"
+	.string "to heal them right away. It is very\l"
+	.string "dangerous to force your luck in caves.$"
+
+gUnknown_81B4FB2:: @ 81B4FB2
+	.string "Trust your own knowledge and power.\n"
+	.string "Believe in yourself and find your way!$"
+
+gUnknown_81B4FFD:: @ 81B4FFD
+	.string "A POKéMON CENTER is identified by its\n"
+	.string "red roof and a “P.C” sign. Every\l"
+	.string "POKéMON CENTER offers such services as\l"
+	.string "fully healing POKéMON and free PC use,\l"
+	.string "making it essential for your travels.\l"
+	.string "On the upper floor are facilities for\l"
+	.string "linking with friends and others.$"
+
+gUnknown_81B50FF:: @ 81B50FF
+	.string "A POKéMON MART is identified by its\n"
+	.string "blue roof and a “MART” sign.\l"
+	.string "Items can be bought and sold at any\l"
+	.string "POKéMON MART. Some MARTS carry items\l"
+	.string "that are available only in their towns.$"
+
+gUnknown_81B51B1:: @ 81B51B1
+	.string "You can safely end your game by\n"
+	.string "selecting “SAVE” on the MENU.\l"
+	.string "Once you have saved, the game can be\l"
+	.string "safely turned off. When the game is\l"
+	.string "turned back on, you can resume from\l"
+	.string "where you last saved.$"
+
+gUnknown_81B5272:: @ 81B5272
+	.string "POKéMON are living beings about which\n"
+	.string "many mysteries still remain. You may\l"
+	.string "see them in grass, the sea, and caves.\l"
+	.string "They appear to obey the wishes of the\l"
+	.string "TRAINERS that caught them.$"
+
+gUnknown_81B5325:: @ 81B5325
+	.string "Use the FAME CHECKER among the\n"
+	.string "KEY ITEMS in your BAG.\l"
+	.string "It may give you a hint, so try it out.$"
+
+gUnknown_81B5382:: @ 81B5382
+	.string "A HIDDEN move is taught to a POKéMON\n"
+	.string "using an HM (Hidden Machine).\l"
+	.string "A HIDDEN move is important for helping\l"
+	.string "your adventure. For example, one is\l"
+	.string "used to light up dark caves. Another\l"
+	.string "cuts down small trees. There is one\l"
+	.string "for traveling on water, and so on.$"
+
+gUnknown_81B547C:: @ 81B547C
+	.string "Try to catch wild POKéMON by throwing\n"
+	.string "the special SAFARI BALLS.\l"
+	.string "You may keep any item you find, too.$"
+
+gUnknown_81B54E1:: @ 81B54E1
+	.string "Your SAFARI GAME ends once you have\n"
+	.string "traveled a certain distance or thrown\l"
+	.string "all your SAFARI BALLS.\l"
+	.string "Open the MENU to check the remaining\l"
+	.string "number of steps and SAFARI BALLS.$"
+
+gUnknown_81B5589:: @ 81B5589
+	.string "If you would like to cut your SAFARI\n"
+	.string "GAME short, open the MENU and select\l"
+	.string "“RETIRE” at the top of the list.$"
+
+gUnknown_81B55F4:: @ 81B55F4
+	.string "POKéMON GYMS are operated by the\n"
+	.string "POKéMON LEAGUE and are training\l"
+	.string "facilities for TRAINERS. They are all\l"
+	.string "across the land in cities and towns.\l"
+	.string "Each one is headed by a LEADER, who\l"
+	.string "is a very skilled TRAINER. Beat the\l"
+	.string "LEADER to collect a BADGE.$"
+
+gUnknown_81B56E3:: @ 81B56E3
+	.string " Using “POKéDEX”$"
+
+gUnknown_81B56F4:: @ 81B56F4
+	.string " Using “POKéMON”$"
+
+gUnknown_81B5705:: @ 81B5705
+	.string "  Using “SUMMARY”$"
+
+gUnknown_81B5717:: @ 81B5717
+	.string "  Using “SWITCH”$"
+
+gUnknown_81B5728:: @ 81B5728
+	.string "  Using “ITEM”$"
+
+gUnknown_81B5737:: @ 81B5737
+	.string " Using “BAG”$"
+
+gUnknown_81B5744:: @ 81B5744
+	.string "  Using an item$"
+
+gUnknown_81B5754:: @ 81B5754
+	.string "  Using a key item$"
+
+gUnknown_81B5767:: @ 81B5767
+	.string "  Using a POKé BALL$"
+
+gUnknown_81B577B:: @ 81B577B
+	.string " Using “{PLAYER}”$"
+
+gUnknown_81B5787:: @ 81B5787
+	.string " Using “SAVE”$"
+
+gUnknown_81B5795:: @ 81B5795
+	.string " Using “OPTION”$"
+
+gUnknown_81B57A5:: @ 81B57A5
+	.string "    Using a POTION$"
+
+gUnknown_81B57B8:: @ 81B57B8
+	.string "    Using the TOWN MAP$"
+
+gUnknown_81B57CF:: @ 81B57CF
+	.string "    Using a TM$"
+
+gUnknown_81B57DE:: @ 81B57DE
+	.string "    Using an HM$"
+
+gUnknown_81B57EE:: @ 81B57EE
+	.string "Using a move outside of battle$"
+
+gUnknown_81B580D:: @ 81B580D
+	.string "    Riding the BICYCLE$"
+
+gUnknown_81B5824:: @ 81B5824
+	.string "Entering a name$"
+
+gUnknown_81B5834:: @ 81B5834
+	.string "Using a PC$"
+
+gUnknown_81B583F:: @ 81B583F
+	.string " Using “{STR_VAR_1}'S PC”$"
+
+gUnknown_81B5850:: @ 81B5850
+	.string "  Using “WITHDRAW”$"
+
+gUnknown_81B5863:: @ 81B5863
+	.string "  Using “DEPOSIT”$"
+
+gUnknown_81B5875:: @ 81B5875
+	.string "  Using “MOVE”$"
+
+gUnknown_81B5884:: @ 81B5884
+	.string "  Moving items$"
+
+gUnknown_81B5893:: @ 81B5893
+	.string " Using “{PLAYER}'s PC”$"
+
+gUnknown_81B58A4:: @ 81B58A4
+	.string "  Using “WITHDRAW ITEM”$"
+
+gUnknown_81B58BC:: @ 81B58BC
+	.string "  Using “DEPOSIT ITEM”$"
+
+gUnknown_81B58D3:: @ 81B58D3
+	.string "  Using “MAILBOX”$"
+
+gUnknown_81B58E5:: @ 81B58E5
+	.string " Using “PROF. OAK'S PC”$"
+
+gUnknown_81B58FD:: @ 81B58FD
+	.string "Opening the MENU$"
+
+gUnknown_81B590E:: @ 81B590E
+	.string " Using “FIGHT”$"
+
+gUnknown_81B591D:: @ 81B591D
+	.string " Using “POKéMON”$"
+
+gUnknown_81B592E:: @ 81B592E
+	.string "  Using “SHIFT”$"
+
+gUnknown_81B593E:: @ 81B593E
+	.string "  Using “SUMMARY”$"
+
+gUnknown_81B5950:: @ 81B5950
+	.string " Using “BAG”$"
+
+gUnknown_81B595D:: @ 81B595D
+	.string " Reading the “POKéDEX”$"
+
+gUnknown_81B5974:: @ 81B5974
+	.string "Using the PC at home$"
+
+gUnknown_81B5989:: @ 81B5989
+	.string "Using the Item Storage System$"
+
+gUnknown_81B59A7:: @ 81B59A7
+	.string "  Using “WITHDRAW ITEM”$"
+
+gUnknown_81B59BF:: @ 81B59BF
+	.string "  Using “DEPOSIT ITEM”$"
+
+gUnknown_81B59D6:: @ 81B59D6
+	.string "Using the MAILBOX$"
+
+gUnknown_81B59E8:: @ 81B59E8
+	.string " Using “RUN”$"
+
+gUnknown_81B59F5:: @ 81B59F5
+	.string "  “REGISTER” a key item$"
+
+gUnknown_81B5A0D:: @ 81B5A0D
+	.string " Using “BALL”$"
+
+gUnknown_81B5A1B:: @ 81B5A1B
+	.string " Using “BAIT”$"
+
+gUnknown_81B5A29:: @ 81B5A29
+	.string " Using “ROCK”$"
+
+gUnknown_81B5A37:: @ 81B5A37
+	.string " Using “HALL OF FAME”$"
+
+gUnknown_81B5A4D:: @ 81B5A4D
+	.string "{EXTRA_CIRCLE_1} Select “POKéDEX” on the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Choose POKéMON using commands such\n"
+	.string "   as “POKéMON LIST,”\n"
+	.string "   “HABITATS OF POKéMON,” and\n"
+	.string "   “SEARCH.”\n"
+	.string "{EXTRA_CIRCLE_3} Select a POKéMON to obtain detailed\n"
+	.string "   information.$"
+
+gUnknown_81B5B0C:: @ 81B5B0C
+	.string "{EXTRA_CIRCLE_1} Select “POKéMON” on the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Choose a POKéMON in your party.\n"
+	.string "{EXTRA_CIRCLE_3} Select “SUMMARY,” “SWITCH,”\n"
+	.string "   or “ITEM.”$"
+
+gUnknown_81B5B7D:: @ 81B5B7D
+	.string "{EXTRA_CIRCLE_1} Select “SUMMARY.”\n"
+	.string "{EXTRA_CIRCLE_2} Press left or right on the {EXTRA_PLUS} Control\n"
+	.string "   Pad to check the information:\n"
+	.string "   “POKéMON INFO”\n"
+	.string "   “POKéMON SKILLS”\n"
+	.string "   “KNOWN MOVES”$"
+
+gUnknown_81B5C13:: @ 81B5C13
+	.string "{EXTRA_CIRCLE_1} Choose the POKéMON you want to\n"
+	.string "   switch around.\n"
+	.string "{EXTRA_CIRCLE_2} Select “SWITCH.”\n"
+	.string "{EXTRA_CIRCLE_3} Select the POKéMON to switch with\n"
+	.string "   the first one.\n"
+	.string "The POKéMON at the left of the screen\n"
+	.string "will be the first one out in a battle.$"
+
+gUnknown_81B5CDF:: @ 81B5CDF
+	.string "{EXTRA_CIRCLE_1} Select “ITEM.”\n"
+	.string "{EXTRA_CIRCLE_2} Select whether you want to “GIVE”\n"
+	.string "   an item to the POKéMON to hold,\n"
+	.string "   or “TAKE” an item it is holding.\n"
+	.string "A POKéMON can hold no more than one\n"
+	.string "item!$"
+
+gUnknown_81B5D87:: @ 81B5D87
+	.string "{EXTRA_CIRCLE_1} Select “BAG” on the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Press left or right on the {EXTRA_PLUS} Control\n"
+	.string "   Pad to check the data headings:\n"
+	.string "   “ITEMS”\n"
+	.string "   “KEY ITEMS”\n"
+	.string "   “POKé BALLS”\n"
+	.string "   Press up or down to select an item.$"
+
+gUnknown_81B5E41:: @ 81B5E41
+	.string "{EXTRA_CIRCLE_1} Select the “ITEMS” POCKET.\n"
+	.string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n"
+	.string "   Pad to select an item.\n"
+	.string "{EXTRA_CIRCLE_3} Select “USE” to use the selected\n"
+	.string "   item.\n"
+	.string "Some items may not be used depending\n"
+	.string "on the place and/or situation.$"
+
+gUnknown_81B5F10:: @ 81B5F10
+	.string "{EXTRA_CIRCLE_1} Select the “KEY ITEMS” POCKET.\n"
+	.string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n"
+	.string "   Pad to select a key item.\n"
+	.string "{EXTRA_CIRCLE_3} Select “USE” to use the selected\n"
+	.string "   key item.$"
+
+gUnknown_81B5FA6:: @ 81B5FA6
+	.string "{EXTRA_CIRCLE_1} While battling a wild POKéMON,\n"
+	.string "   select the BAG's “POKé BALLS”\n"
+	.string "   POCKET.\n"
+	.string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n"
+	.string "   Pad to select a POKé BALL.\n"
+	.string "{EXTRA_CIRCLE_3} Select “USE” to throw the selected\n"
+	.string "   POKé BALL.$"
+
+gUnknown_81B606C:: @ 81B606C
+	.string "{EXTRA_CIRCLE_1} Select “{PLAYER}” on the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Your TRAINER CARD is displayed face\n"
+	.string "   up with basic information. Press the\n"
+	.string "   A Button to turn the CARD over.\n"
+	.string "{EXTRA_CIRCLE_3} A variety of data can be found on\n"
+	.string "   the reverse side of the CARD.$"
+
+gUnknown_81B6140:: @ 81B6140
+	.string "{EXTRA_CIRCLE_1} Select “SAVE” on the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Select “YES” and your progress is\n"
+	.string "   recorded in the save file.\n"
+	.string "Once the game is saved, you may turn\n"
+	.string "off the game. Your game can be resumed\n"
+	.string "from where you saved.$"
+
+gUnknown_81B6203:: @ 81B6203
+	.string "{EXTRA_CIRCLE_1} Select “OPTION” on the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n"
+	.string "   Pad to select an optional item, then\n"
+	.string "   press left or right to alter the\n"
+	.string "   settings.\n"
+	.string "{EXTRA_CIRCLE_3} Select “CANCEL” or press the\n"
+	.string "   B Button after making changes.$"
+
+gUnknown_81B62E4:: @ 81B62E4
+	.string "{EXTRA_CIRCLE_1} Open the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n"
+	.string "   Pad and select “BAG.”\n"
+	.string "{EXTRA_CIRCLE_3} Select “POTION” in the “ITEMS”\n"
+	.string "   POCKET.\n"
+	.string "{EXTRA_CIRCLE_4} Select “USE.”\n"
+	.string "{EXTRA_CIRCLE_5} Select the POKéMON to be healed.$"
+
+gUnknown_81B6397:: @ 81B6397
+	.string "{EXTRA_CIRCLE_1} Open the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n"
+	.string "   Pad and select “BAG.”\n"
+	.string "{EXTRA_CIRCLE_3} Press left or right to open the\n"
+	.string "   “KEY ITEMS” POCKET, then press\n"
+	.string "   up or down to select “TOWN MAP.” \n"
+	.string "{EXTRA_CIRCLE_4} Select “USE” to open the TOWN MAP.$"
+
+gUnknown_81B6478:: @ 81B6478
+	.string "{EXTRA_CIRCLE_1} Open the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n"
+	.string "   “BAG.”\n"
+	.string "{EXTRA_CIRCLE_3} “OPEN” the TM CASE.\n"
+	.string "{EXTRA_CIRCLE_4} Select and “USE” a TM.\n"
+	.string "{EXTRA_CIRCLE_5} Select a POKéMON that can learn the\n"
+	.string "   move in the TM.$"
+
+gUnknown_81B6525:: @ 81B6525
+	.string "{EXTRA_CIRCLE_1} Open the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n"
+	.string "   “BAG.”\n"
+	.string "{EXTRA_CIRCLE_3} “OPEN” the TM CASE.\n"
+	.string "{EXTRA_CIRCLE_4} Select and “USE” an HM.\n"
+	.string "{EXTRA_CIRCLE_5} Select a POKéMON that can learn it.\n"
+	.string "HMs are hard to remove, so be careful!$"
+
+gUnknown_81B65E7:: @ 81B65E7
+	.string "{EXTRA_CIRCLE_1} Open the MENU.\n"
+	.string "{EXTRA_CIRCLE_2} Select “POKéMON.”\n"
+	.string "{EXTRA_CIRCLE_3} Select a POKéMON that knows an\n"
+	.string "   HM move. The usable HM move(s)\n"
+	.string "   will be shown in blue. Select and\n"
+	.string "   use the desired move to destroy an\n"
+	.string "   obstacle, fly, surf, etc.$"
+
+gUnknown_81B66BA:: @ 81B66BA
+	.string "{EXTRA_CIRCLE_1} Open the MENU. Open the\n"
+	.string "   “KEY ITEMS” POCKET in the “BAG”\n"
+	.string "   and select the “BICYCLE.”\n"
+	.string "{EXTRA_CIRCLE_2} The BICYCLE can be ridden by\n"
+	.string "   selecting “USE.” You may also\n"
+	.string "   “REGISTER” it for instant use by\n"
+	.string "   pressing SELECT.$"
+
+gUnknown_81B678E:: @ 81B678E
+	.string "{EXTRA_CIRCLE_1} Move the cursor to the letter you\n"
+	.string "   want with the {EXTRA_PLUS} Control Pad, then\n"
+	.string "   press the A Button to enter it.\n"
+	.string "{EXTRA_CIRCLE_2} Press the B Button to back up.\n"
+	.string "{EXTRA_CIRCLE_3} Press SELECT to switch between\n"
+	.string "   uppercase and lowercase letters.\n"
+	.string "{EXTRA_CIRCLE_4} Press the A Button on “OK.”$"
+
+gUnknown_81B6883:: @ 81B6883
+	.string "{EXTRA_CIRCLE_1} Go to any POKéMON CENTER, go up\n"
+	.string "   to the PC, then press the A Button.$"
+
+gUnknown_81B68CD:: @ 81B68CD
+	.string "{EXTRA_CIRCLE_1} Select “{STR_VAR_1}'S PC” on the PC.\n"
+	.string "{EXTRA_CIRCLE_2} Select from one of the top three\n"
+	.string "   MENU items to access the POKéMON\n"
+	.string "   Storage System.\n"
+	.string "If you catch a POKéMON when you have\n"
+	.string "six in your party, the POKéMON is sent\n"
+	.string "automatically to a BOX in the System!$"
+
+gUnknown_81B69B9:: @ 81B69B9
+	.string "{EXTRA_CIRCLE_1} Select a POKéMON in the open BOX\n"
+	.string "   with the {EXTRA_PLUS} Control Pad.\n"
+	.string "{EXTRA_CIRCLE_2} Select “WITHDRAW” to remove the\n"
+	.string "   POKéMON from the BOX and add it to\n"
+	.string "   your party.\n"
+	.string "You may not withdraw a POKéMON if you\n"
+	.string "already have six POKéMON with you!$"
+
+gUnknown_81B6A9A:: @ 81B6A9A
+	.string "{EXTRA_CIRCLE_1} Select a POKéMON in your party with\n"
+	.string "   the {EXTRA_PLUS} Control Pad.\n"
+	.string "{EXTRA_CIRCLE_2} Select “DEPOSIT.”\n"
+	.string "{EXTRA_CIRCLE_3} Select the BOX, then press the\n"
+	.string "   A Button to store the POKéMON.\n"
+	.string "If you have only one POKéMON with you,\n"
+	.string "it may not be stored!$"
+
+gUnknown_81B6B6E:: @ 81B6B6E
+	.string "{EXTRA_CIRCLE_1} Select a POKéMON in the open BOX.\n"
+	.string "{EXTRA_CIRCLE_2} Pick up the POKéMON by selecting\n"
+	.string "   “MOVE” and move it anywhere with\n"
+	.string "   the {EXTRA_PLUS} Control Pad.\n"
+	.string "{EXTRA_CIRCLE_3} Move the POKéMON to the BOX name\n"
+	.string "   and press left or right to move it\n"
+	.string "   to another BOX.$"
+
+gUnknown_81B6C4F:: @ 81B6C4F
+	.string "{EXTRA_CIRCLE_1} Faintly shown POKéMON can be made\n"
+	.string "   to hold an item by selecting it and\n"
+	.string "   pressing the A Button.\n"
+	.string "{EXTRA_CIRCLE_2} Clearly shown POKéMON can be made\n"
+	.string "   to give the item they are holding to\n"
+	.string "   another POKéMON, or return the item\n"
+	.string "   to the BAG with the A Button.$"
+
+gUnknown_81B6D4A:: @ 81B6D4A
+	.string "{EXTRA_CIRCLE_1} Select “{PLAYER}'s PC” on the PC.\n"
+	.string "{EXTRA_CIRCLE_2} Select either “ITEM STORAGE” or\n"
+	.string "   “MAILBOX.”\n"
+	.string "You may store things in your own PC\n"
+	.string "if your BAG is full. You may also\n"
+	.string "withdraw items stored in your PC.$"
+
+gUnknown_81B6E02:: @ 81B6E02
+	.string "{EXTRA_CIRCLE_1} Select “WITHDRAW ITEM.”\n"
+	.string "{EXTRA_CIRCLE_2} Select the item to be withdrawn.\n"
+	.string "{EXTRA_CIRCLE_3} The item can be withdrawn and\n"
+	.string "   placed in the BAG's ITEMS POCKET.\n"
+	.string "   It may also be directly given to a\n"
+	.string "   POKéMON to hold.$"
+
+gUnknown_81B6EC1:: @ 81B6EC1
+	.string "{EXTRA_CIRCLE_1} Select “DEPOSIT ITEM.”\n"
+	.string "{EXTRA_CIRCLE_2} Select the item in the BAG to be\n"
+	.string "   deposited using the {EXTRA_PLUS} Control Pad.\n"
+	.string "{EXTRA_CIRCLE_3} If there is more than one \n"
+	.string "   item to be deposited, enter the\n"
+	.string "   quantity with the {EXTRA_PLUS} Control Pad,\n"
+	.string "   then press the A Button.$"
+
+gUnknown_81B6FA8:: @ 81B6FA8
+	.string "When MAIL is taken from a POKéMON,\n"
+	.string "it is moved to the MAILBOX. If it has\n"
+	.string "no MAIL, the MAILBOX can't be used.\n"
+	.string "{EXTRA_CIRCLE_1} Select “{PLAYER}'S PC” on the PC.\n"
+	.string "{EXTRA_CIRCLE_2} Select “MAILBOX” to read MAIL or\n"
+	.string "   make a POKéMON hold MAIL.$"
+
+gUnknown_81B7075:: @ 81B7075
+	.string "{EXTRA_CIRCLE_1} Select “PROF. OAK'S PC” on the PC.\n"
+	.string "{EXTRA_CIRCLE_2} PROF. OAK will evaluate your\n"
+	.string "   POKéDEX.\n"
+	.string "His evaluations should give you hints\n"
+	.string "for catching more POKéMON!$"
+
+gUnknown_81B7108:: @ 81B7108
+	.string "{EXTRA_CIRCLE_1} Press START.\n"
+	.string "{EXTRA_CIRCLE_2} The MENU will open on the right.\n"
+	.string "{EXTRA_CIRCLE_3} Depending on the situation, the MENU\n"
+	.string "   may feature different headings.\n"
+	.string "The MENU will not open in certain\n"
+	.string "situations such as when talking, doing\n"
+	.string "something, battling, etc.$"
+
+gUnknown_81B71EA:: @ 81B71EA
+	.string "{EXTRA_CIRCLE_1} Select “FIGHT.”\n"
+	.string "{EXTRA_CIRCLE_2} Select one of the moves shown,\n"
+	.string "and that move will be used!$"
+
+gUnknown_81B723B:: @ 81B723B
+	.string "{EXTRA_CIRCLE_1} Select “POKéMON.”\n"
+	.string "{EXTRA_CIRCLE_2} Select the POKéMON in your party\n"
+	.string "   that you want to use.\n"
+	.string "{EXTRA_CIRCLE_3} If you have two or more POKéMON\n"
+	.string "   with you, they may be switched by\n"
+	.string "   selecting “SHIFT.” Check POKéMON\n"
+	.string "   data by selecting “SUMMARY.”$"
+
+gUnknown_81B7319:: @ 81B7319
+	.string "This command switches the POKéMON in\n"
+	.string "battle with another one in your party.\n"
+	.string "{EXTRA_CIRCLE_1} Select the POKéMON to be sent out.\n"
+	.string "{EXTRA_CIRCLE_2} Select “SHIFT.”\n"
+	.string "{EXTRA_CIRCLE_3} The selected POKéMON will switch\n"
+	.string "   places with the POKéMON in battle!$"
+
+gUnknown_81B73E8:: @ 81B73E8
+	.string "{EXTRA_CIRCLE_1} Select “SUMMARY.”\n"
+	.string "{EXTRA_CIRCLE_2} Press left or right on the {EXTRA_PLUS} Control\n"
+	.string "   Pad to check the information:\n"
+	.string "   “POKéMON INFO”\n"
+	.string "   “POKéMON SKILLS”\n"
+	.string "   “KNOWN MOVES”$"
+
+gUnknown_81B747E:: @ 81B747E
+	.string "{EXTRA_CIRCLE_1} Select “BAG.”\n"
+	.string "{EXTRA_CIRCLE_2} Press left or right on the {EXTRA_PLUS} Control\n"
+	.string "   Pad to check the data headings:\n"
+	.string "   “ITEMS”\n"
+	.string "   “KEY ITEMS”\n"
+	.string "   “POKé BALLS”\n"
+	.string "   Press up or down to select an item.$"
+
+gUnknown_81B752C:: @ 81B752C
+	.string "{EXTRA_CIRCLE_1} POKéMON that you have caught are\n"
+	.string "   identified by a POKé BALL mark on\n"
+	.string "   the POKéDEX list.\n"
+	.string "{EXTRA_CIRCLE_2} A caught POKéMON will provide a\n"
+	.string "   large amount of data.\n"
+	.string "{EXTRA_CIRCLE_3} Select “AREA” to display the TOWN\n"
+	.string "   MAP with the POKéMON's habitat(s).$"
+
+gUnknown_81B7611:: @ 81B7611
+	.string "{EXTRA_CIRCLE_1} Go up to the PC at home, then press\n"
+	.string "   the A Button.\n"
+	.string "{EXTRA_CIRCLE_2} The PC will turn on.\n"
+	.string "{EXTRA_CIRCLE_3} Select either “ITEM STORAGE” or\n"
+	.string "   “MAILBOX.”$"
+
+gUnknown_81B7692:: @ 81B7692
+	.string "{EXTRA_CIRCLE_1} Select “WITHDRAW ITEM” to withdraw\n"
+	.string "   an item stored on your PC.\n"
+	.string "{EXTRA_CIRCLE_2} Select “DEPOSIT ITEM” to put \n"
+	.string "   an item from your BAG into your PC.$"
+
+gUnknown_81B771E:: @ 81B771E
+	.string "{EXTRA_CIRCLE_1} Select “WITHDRAW ITEM.”\n"
+	.string "{EXTRA_CIRCLE_2} Select the item to be withdrawn.\n"
+	.string "{EXTRA_CIRCLE_3} The item can be withdrawn and\n"
+	.string "   placed in the BAG's ITEMS POCKET.\n"
+	.string "   It may also be directly given to a\n"
+	.string "   POKéMON to hold.$"
+
+gUnknown_81B77DD:: @ 81B77DD
+	.string "{EXTRA_CIRCLE_1} Select “DEPOSIT ITEM.”\n"
+	.string "{EXTRA_CIRCLE_2} Select the item in the BAG to be\n"
+	.string "   deposited using the {EXTRA_PLUS} Control Pad.\n"
+	.string "{EXTRA_CIRCLE_3} If there is nothing in the BAG, this\n"
+	.string "   command can't be used!$"
+
+gUnknown_81B7884:: @ 81B7884
+	.string "When MAIL is taken from a POKéMON,\n"
+	.string "it is moved to the MAILBOX. If it has\n"
+	.string "no MAIL, the MAILBOX can't be used.\n"
+	.string "{EXTRA_CIRCLE_1} Select MAIL by name to read it or\n"
+	.string "   make a POKéMON hold it.$"
+
+gUnknown_81B7931:: @ 81B7931
+	.string "You may not “RUN” from a TRAINER\n"
+	.string "battle!\n"
+	.string "{EXTRA_CIRCLE_1} You may “RUN” from a wild POKéMON.\n"
+	.string "{EXTRA_CIRCLE_2} Your chance of escape is improved\n"
+	.string "   if your POKéMON in battle is fast.$"
+
+gUnknown_81B79CB:: @ 81B79CB
+	.string "You may “REGISTER” a key item for\n"
+	.string "instant use by pressing SELECT!\n"
+	.string "{EXTRA_CIRCLE_1} Open the “KEY ITEMS” POCKET.\n"
+	.string "{EXTRA_CIRCLE_2} Select the key item, then select\n"
+	.string "   “REGISTER.”$"
+
+gUnknown_81B7A60:: @ 81B7A60
+	.string "{EXTRA_CIRCLE_1} Select to throw the special POKé\n"
+	.string "   BALL used only in the SAFARI ZONE.\n"
+	.string "When wild POKéMON appear, throw lots\n"
+	.string "of SAFARI BALLS to catch them!$"
+
+gUnknown_81B7AEE:: @ 81B7AEE
+	.string "{EXTRA_CIRCLE_1} Select to throw the special food\n"
+	.string "   used only in the SAFARI ZONE.\n"
+	.string "It is POKéMON food rolled up into\n"
+	.string "a ball for easy eating. When BAIT is\n"
+	.string "thrown, the wild POKéMON may get\n"
+	.string "attracted by it, and may not flee!$"
+
+gUnknown_81B7BBE:: @ 81B7BBE
+	.string "{EXTRA_CIRCLE_1} Select to throw a rock lying on\n"
+	.string "   the ground in the SAFARI ZONE.\n"
+	.string "Throwing a rock at a POKéMON may \n"
+	.string "make it run away, but it becomes easier\n"
+	.string "to catch!$"
+
+gUnknown_81B7C57:: @ 81B7C57
+	.string "{EXTRA_CIRCLE_1} Select “HALL OF FAME” on the PC.\n"
+	.string "{EXTRA_CIRCLE_2} The POKéMON that have entered the\n"
+	.string "   HALL OF FAME can be examined.$"
+
+gUnknown_81B7CC1:: @ 81B7CC1
+	.string "HP$"
+
+gUnknown_81B7CC4:: @ 81B7CC4
+	.string "EXP. {EXTRA_LEFT_PAREN}EXP. Points{EXTRA_RIGHT_PAREN}$"
+
+gUnknown_81B7CD9:: @ 81B7CD9
+	.string "MOVES$"
+
+gUnknown_81B7CDF:: @ 81B7CDF
+	.string "ATTACK$"
+
+gUnknown_81B7CE6:: @ 81B7CE6
+	.string "DEFENSE$"
+
+gUnknown_81B7CEE:: @ 81B7CEE
+	.string "SP. ATK$"
+
+gUnknown_81B7CF6:: @ 81B7CF6
+	.string "SP. DEF$"
+
+gUnknown_81B7CFE:: @ 81B7CFE
+	.string "SPEED$"
+
+gUnknown_81B7D04:: @ 81B7D04
+	.string "Lv. {EXTRA_LEFT_PAREN}Level{EXTRA_RIGHT_PAREN}$"
+
+gUnknown_81B7D12:: @ 81B7D12
+	.string "TYPE$"
+
+gUnknown_81B7D17:: @ 81B7D17
+	.string "OT$"
+
+gUnknown_81B7D1A:: @ 81B7D1A
+	.string "ITEM$"
+
+gUnknown_81B7D1F:: @ 81B7D1F
+	.string "ABILITY$"
+
+gUnknown_81B7D27:: @ 81B7D27
+	.string "MONEY$"
+
+gUnknown_81B7D2D:: @ 81B7D2D
+	.string "MOVE TYPE$"
+
+gUnknown_81B7D37:: @ 81B7D37
+	.string "NATURE$"
+
+gUnknown_81B7D3E:: @ 81B7D3E
+	.string "ID No.$"
+
+gUnknown_81B7D45:: @ 81B7D45
+	.string "PP$"
+
+gUnknown_81B7D48:: @ 81B7D48
+	.string "POWER$"
+
+gUnknown_81B7D4E:: @ 81B7D4E
+	.string "ACCURACY$"
+
+gUnknown_81B7D57:: @ 81B7D57
+	.string "FNT$"
+
+gUnknown_81B7D5B:: @ 81B7D5B
+	.string "ITEMS$"
+
+gUnknown_81B7D61:: @ 81B7D61
+	.string "KEY ITEMS$"
+
+gUnknown_81B7D6B:: @ 81B7D6B
+	.string "POKé BALLS$"
+
+gUnknown_81B7D76:: @ 81B7D76
+	.string "POKéDEX$"
+
+gUnknown_81B7D7E:: @ 81B7D7E
+	.string "PLAY TIME$"
+
+gUnknown_81B7D88:: @ 81B7D88
+	.string "BADGES$"
+
+gUnknown_81B7D8F:: @ 81B7D8F
+	.string "TEXT SPEED$"
+
+gUnknown_81B7D9A:: @ 81B7D9A
+	.string "BATTLE SCENE$"
+
+gUnknown_81B7DA7:: @ 81B7DA7
+	.string "BATTLE STYLE$"
+
+gUnknown_81B7DB4:: @ 81B7DB4
+	.string "SOUND$"
+
+gUnknown_81B7DBA:: @ 81B7DBA
+	.string "BUTTON MODE$"
+
+gUnknown_81B7DC6:: @ 81B7DC6
+	.string "FRAME$"
+
+gUnknown_81B7DCC:: @ 81B7DCC
+	.string "CANCEL$"
+
+gUnknown_81B7DD3:: @ 81B7DD3
+	.string "TM$"
+
+gUnknown_81B7DD6:: @ 81B7DD6
+	.string "HM$"
+
+gUnknown_81B7DD9:: @ 81B7DD9
+	.string "HM MOVE$"
+
+gUnknown_81B7DE1:: @ 81B7DE1
+	.string "EVOLUTION$"
+
+gUnknown_81B7DEB:: @ 81B7DEB
+	.string "STATUS PROBLEM$"
+
+gUnknown_81B7DFA:: @ 81B7DFA
+	.string "POKéMON$"
+
+gUnknown_81B7E02:: @ 81B7E02
+	.string "ID No.$"
+
+gUnknown_81B7E09:: @ 81B7E09
+	.string "MONEY$"
+
+gUnknown_81B7E0F:: @ 81B7E0F
+	.string "BADGES$"
+
+gUnknown_81B7E16:: @ 81B7E16
+	.string "HP indicates a POKéMON's vitality.\n"
+	.string "If a POKéMON's HP drops to zero, it\l"
+	.string "faints and is unable to battle.\l"
+	.string "So, the key in battle is to try to\l"
+	.string "reduce the foe's HP to zero.\l"
+	.string "If your POKéMON are hurt, restore their\l"
+	.string "HP at a POKéMON CENTER or use items.$"
+
+gUnknown_81B7F0A:: @ 81B7F0A
+	.string "EXP. Points stands for “Experience\n"
+	.string "Points.” POKéMON gain EXP. Points by\l"
+	.string "participating in winning battles.\l"
+	.string "When a POKéMON accumulates sufficient\l"
+	.string "EXP. Points, it levels up. The EXP. Bar\l"
+	.string "indicates accumulated EXP. Points.\l"
+	.string "It returns to zero upon leveling up.$"
+
+gUnknown_81B800A:: @ 81B800A
+	.string "POKéMON may learn up to four different\n"
+	.string "moves. There are many kinds of moves\l"
+	.string "including attacks and those with\l"
+	.string "special effects. The kinds of moves\l"
+	.string "that can be learned vary for each\l"
+	.string "POKéMON. Some moves can be learned\l"
+	.string "from items.$"
+
+gUnknown_81B80EC:: @ 81B80EC
+	.string "ATTACK indicates the power of an\n"
+	.string "offensive move. The higher this stat,\l"
+	.string "the more powerful the move.\l"
+	.string "It is applied for the following move\l"
+	.string "types: NORMAL, POISON, GROUND,\l"
+	.string "FLYING, BUG, FIGHTING, ROCK, GHOST,\l"
+	.string "and STEEL.$"
+
+gUnknown_81B81C2:: @ 81B81C2
+	.string "DEFENSE indicates the resistance a\n"
+	.string "POKéMON has against physical attacks.\l"
+	.string "The higher this stat, the less damage\l"
+	.string "sustained from a foe's physical hit.$"
+
+gUnknown_81B8256:: @ 81B8256
+	.string "SP. ATK (Special Attack) indicates the\n"
+	.string "power of a special attack move.\l"
+	.string "The higher this stat, the more powerful\l"
+	.string "the special attack move.\l"
+	.string "It is applied for the following move\l"
+	.string "types: FIRE, WATER, ELECTRIC, GRASS,\l"
+	.string "ICE, PSYCHIC, DRAGON, and DARK.$"
+
+gUnknown_81B8348:: @ 81B8348
+	.string "SP. DEF (Special Defense) indicates\n"
+	.string "the resistance a POKéMON has against\l"
+	.string "special attacks.\l"
+	.string "The higher this stat, the less damage\l"
+	.string "sustained from a foe's special attack.$"
+
+gUnknown_81B83EF:: @ 81B83EF
+	.string "SPEED indicates the agility of a\n"
+	.string "POKéMON. If this stat exceeds the foe's\l"
+	.string "in battle, the POKéMON can make a move\l"
+	.string "before its slower opponent.$"
+
+gUnknown_81B847B:: @ 81B847B
+	.string "Lv. (Level) indicates the growth and\n"
+	.string "strength of a POKéMON.\l"
+	.string "In general, when a POKéMON levels up,\l"
+	.string "its stats such as HP, ATTACK, and\l"
+	.string "DEFENSE rise, making it stronger.\l"
+	.string "POKéMON may learn a new move upon\l"
+	.string "leveling up.$"
+
+gUnknown_81B8550:: @ 81B8550
+	.string "POKéMON and moves are classified by\n"
+	.string "type. Every type has advantageous and\l"
+	.string "disadvantageous matchups against\l"
+	.string "other types. For example, like a rock-\l"
+	.string "paper-scissors game, the WATER type is\l"
+	.string "strong against the FIRE type and weak\l"
+	.string "against the GRASS type.$"
+
+gUnknown_81B8647:: @ 81B8647
+	.string "OT stands for “Original TRAINER,”\n"
+	.string "the first TRAINER to have caught the\l"
+	.string "selected POKéMON.\l"
+	.string "Even if the POKéMON is traded, the OT\l"
+	.string "name will remain unchanged.$"
+
+gUnknown_81B86E2:: @ 81B86E2
+	.string "All POKéMON can be made to hold one\n"
+	.string "item each. Some items will be used by\l"
+	.string "the POKéMON automatically in certain\l"
+	.string "situations. To make a POKéMON hold an\l"
+	.string "item, select the item from the BAG and\l"
+	.string "“GIVE” it to the POKéMON.$"
+
+gUnknown_81B87B8:: @ 81B87B8
+	.string "All POKéMON have a special ABILITY.\n"
+	.string "There are many different kinds of these\l"
+	.string "abilities, some used in battle, some\l"
+	.string "elsewhere. The abilities differ from\l"
+	.string "species to species. Some species may\l"
+	.string "have more than one kind of ability.$"
+
+gUnknown_81B8897:: @ 81B8897
+	.string "Whenever you win a battle against a\n"
+	.string "TRAINER, you are given prize money.\l"
+	.string "Save up your prize money so you can\l"
+	.string "enjoy shopping at POKéMON MARTS!$"
+
+gUnknown_81B8924:: @ 81B8924
+	.string "Moves are also classified by types.\n"
+	.string "If a POKéMON of a certain type uses\l"
+	.string "a move of the same type, the move's\l"
+	.string "power is boosted. If the move's type\l"
+	.string "has a matchup advantage against the\l"
+	.string "target, its effectiveness is also\l"
+	.string "boosted.$"
+
+gUnknown_81B8A04:: @ 81B8A04
+	.string "All POKéMON have a personality,\n"
+	.string "or “NATURE.” The POKéMON's\l"
+	.string "nature appears to affect how the\l"
+	.string "POKéMON will grow upon leveling up.$"
+
+gUnknown_81B8A84:: @ 81B8A84
+	.string "The ID No. is a special number assigned\n"
+	.string "specifically to you as a TRAINER.\l"
+	.string "Together with the OT name, the ID No.\l"
+	.string "is used to precisely identify the\l"
+	.string "Original TRAINER.\l"
+	.string "The ID No. does not change even if the\l"
+	.string "POKéMON is traded.$"
+
+gUnknown_81B8B62:: @ 81B8B62
+	.string "PP stands for “Power Points.”\n"
+	.string "It indicates the number of times a\l"
+	.string "certain move can be used in battle.\l"
+	.string "Like HP, PP can be restored by visiting\l"
+	.string "a POKéMON CENTER or using certain\l"
+	.string "items.$"
+
+gUnknown_81B8C18:: @ 81B8C18
+	.string "POWER indicates the strength of an\n"
+	.string "attack. The higher this number, the\l"
+	.string "greater the damage that can be\l"
+	.string "inflicted on the foe!$"
+
+gUnknown_81B8C94:: @ 81B8C94
+	.string "ACCURACY indicates the probability of\n"
+	.string "the move hitting the foe.\l"
+	.string "The higher this number, the more likely\l"
+	.string "the move will strike the target.$"
+
+gUnknown_81B8D1D:: @ 81B8D1D
+	.string "FNT stands for “fainted.”\n"
+	.string "A POKéMON faints if its HP is reduced\l"
+	.string "to zero. It becomes incapable of taking\l"
+	.string "part in battle.\l"
+	.string "Restore a fainted POKéMON at a POKéMON\l"
+	.string "CENTER, or use an item.$"
+
+gUnknown_81B8DD4:: @ 81B8DD4
+	.string "Ordinary items bought at any POKéMON\n"
+	.string "MART are placed in the ITEMS POCKET.\l"
+	.string "Items may be used, given to a POKéMON\l"
+	.string "to hold, or tossed out as garbage.$"
+
+gUnknown_81B8E67:: @ 81B8E67
+	.string "Important items that you find or \n"
+	.string "receive from people are placed in the\l"
+	.string "KEY ITEMS POCKET.\l"
+	.string "Key items may be used, or registered\l"
+	.string "for use instantly with SELECT. Once\l"
+	.string "registered, the item can be used\l"
+	.string "without opening the MENU and BAG.$"
+
+gUnknown_81B8F4D:: @ 81B8F4D
+	.string "POKé BALLS, which are used for\n"
+	.string "catching wild POKéMON, are placed in\l"
+	.string "the POKé BALLS POCKET.\l"
+	.string "POKé BALLS may be bought at POKéMON\l"
+	.string "MARTS. They may be used, given to a\l"
+	.string "POKéMON to hold, or tossed out as\l"
+	.string "garbage.$"
+
+gUnknown_81B901B:: @ 81B901B
+	.string "This indicates the number of species of\n"
+	.string "POKéMON you have caught and/or\l"
+	.string "evolved to fill the POKéDEX.\l"
+	.string "Try hard to catch all sorts of\l"
+	.string "POKéMON!$"
+
+gUnknown_81B90A7:: @ 81B90A7
+	.string "This is the total amount of time that\n"
+	.string "you have played this game.$"
+
+gUnknown_81B90E8:: @ 81B90E8
+	.string "The POKéMON LEAGUE BADGES that you\n"
+	.string "have won are registered and shown.\l"
+	.string "Earn BADGES by defeating GYM LEADERS\l"
+	.string "in various cities and towns.$"
+
+gUnknown_81B9170:: @ 81B9170
+	.string "You can adjust how quickly the text is\n"
+	.string "displayed. Choose one: SLOW, MID,\l"
+	.string "or FAST.$"
+
+gUnknown_81B91C2:: @ 81B91C2
+	.string "You can choose to turn the battle\n"
+	.string "animation ON or OFF.$"
+
+gUnknown_81B91F9:: @ 81B91F9
+	.string "You can choose whether or not a\n"
+	.string "TRAINER can switch a POKéMON after\l"
+	.string "it has made its foe faint.\l"
+	.string "Set to “SHIFT” if you would like the\l"
+	.string "chance to switch a POKéMON after it\l"
+	.string "has made its foe faint.$"
+
+gUnknown_81B92B8:: @ 81B92B8
+	.string "You can choose between MONO and\n"
+	.string "STEREO sound output.$"
+
+gUnknown_81B92ED:: @ 81B92ED
+	.string "Set to “HELP” to display help messages\n"
+	.string "by pressing the L or R Button.\l"
+	.string "Set to “LR” to enable the switching\l"
+	.string "of the POKéDEX pages and BAG POCKETS\l"
+	.string "using the L and R Buttons.\l"
+	.string "Set to “L=A” to make the L Button\l"
+	.string "work the same as the A Button.$"
+
+gUnknown_81B93D8:: @ 81B93D8
+	.string "You may choose the design of the frame\n"
+	.string "around certain menus. Try them out and\l"
+	.string "see what you like.$"
+
+gUnknown_81B9439:: @ 81B9439
+	.string "The settings will be changed to the\n"
+	.string "selections shown in red, and you will\l"
+	.string "return to the MENU.$"
+
+gUnknown_81B9497:: @ 81B9497
+	.string "A TM (Technical Machine) is a device\n"
+	.string "used to teach a move to a POKéMON.\l"
+	.string "There are many different kinds.\l"
+	.string "Moves can be taught only to those\l"
+	.string "POKéMON capable of using them.\l"
+	.string "A TM breaks after a single use.$"
+
+gUnknown_81B9560:: @ 81B9560
+	.string "An HM (Hidden Machine) is a device used\n"
+	.string "to teach a HIDDEN move to a POKéMON.\l"
+	.string "A HIDDEN move can be taught only to\l"
+	.string "those POKéMON capable of using it.\l"
+	.string "Unlike a TM, an HM can be used over\l"
+	.string "and over. A HIDDEN move can be tough\l"
+	.string "for a POKéMON to forget.$"
+
+gUnknown_81B9656:: @ 81B9656
+	.string "HIDDEN moves are those that are\n"
+	.string "especially important for your\l"
+	.string "adventure. To use such a move outside\l"
+	.string "of battle, open the “POKéMON” MENU\l"
+	.string "and make the POKéMON that knows the\l"
+	.string "move use it. A fainted POKéMON may use\l"
+	.string "a HIDDEN move outside of battle.$"
+
+gUnknown_81B9749:: @ 81B9749
+	.string "Among POKéMON, there are some that\n"
+	.string "undergo major changes (evolution) upon\l"
+	.string "growing to certain levels. Evolution\l"
+	.string "causes a POKéMON to alter form, change\l"
+	.string "its name, and perhaps change the moves\l"
+	.string "it may learn. Some POKéMON evolve\l"
+	.string "due to reasons other than leveling up.$"
+
+gUnknown_81B984F:: @ 81B984F
+	.string "Status problems include:\n"
+	.string "Sleep: Can't use moves.\l"
+	.string "Poison: Causes steady HP loss.\l"
+	.string "Paralysis: May prevent moves.\l"
+	.string "Burn: HP loss and lowers ATTACK.\l"
+	.string "Freeze: Can't use moves.\l"
+	.string "These can be healed with items, etc.$"
+
+gUnknown_81B991C:: @ 81B991C
+	.string "POKéMON is a name given to describe\n"
+	.string "wondrous creatures that inhabit all\l"
+	.string "corners of this world.\l"
+	.string "People raise POKéMON to be their pets,\l"
+	.string "use them for battling, and so on.$"
+
+gUnknown_81B99C4:: @ 81B99C4
+	.string "The ID No. is a special number assigned\n"
+	.string "specifically to you as a TRAINER.\l"
+	.string "Together with the OT name, the ID No.\l"
+	.string "is used to precisely identify the\l"
+	.string "Original TRAINER.\l"
+	.string "The ID No. does not change even if the\l"
+	.string "POKéMON is traded.$"
+
+gUnknown_81B9AA2:: @ 81B9AA2
+	.string "Whenever you win a battle against a\n"
+	.string "TRAINER, you are given prize money.\l"
+	.string "Save up your prize money so you can\l"
+	.string "enjoy shopping at POKéMON MARTS!$"
+
+gUnknown_81B9B2F:: @ 81B9B2F
+	.string "This indicates the number of POKéMON\n"
+	.string "LEAGUE BADGES that you have won.\l"
+	.string "Earn BADGES by defeating GYM LEADERS\l"
+	.string "in various cities and towns.$"
+
+gUnknown_81B9BB7:: @ 81B9BB7
+	.string "The HELP System$"
+
+gUnknown_81B9BC7:: @ 81B9BC7
+	.string "The game$"
+
+gUnknown_81B9BD0:: @ 81B9BD0
+	.string "Wireless Adapter$"
+
+gUnknown_81B9BE1:: @ 81B9BE1
+	.string "Game fundamentals 1$"
+
+gUnknown_81B9BF5:: @ 81B9BF5
+	.string "Game fundamentals 2$"
+
+gUnknown_81B9C09:: @ 81B9C09
+	.string "Game fundamentals 3$"
+
+gUnknown_81B9C1D:: @ 81B9C1D
+	.string "What are POKéMON?$"
+
+gUnknown_81B9C2F:: @ 81B9C2F
+	.string "The help messages change depending on\n"
+	.string "how much you have progressed in the\l"
+	.string "game. They are designed to support you\l"
+	.string "when you need them. If there is\l"
+	.string "anything that you don't understand,\l"
+	.string "please look up the HELP System!$"
+
+gUnknown_81B9D04:: @ 81B9D04
+	.string "You become the main character to\n"
+	.string "explore the world of POKéMON!\l"
+	.string "By talking to people and solving\l"
+	.string "mysteries, new paths will open to you.\l"
+	.string "Strive for the goal together with your\l"
+	.string "wonderful POKéMON!$"
+
+gUnknown_81B9DC5:: @ 81B9DC5
+	.string "This game communicates over a wireless\n"
+	.string "link using the Wireless Adapter.\p"
+	.string "Go wireless anywhere, anytime, and\n"
+	.string "with anybody!\p"
+	.string "Try playing with the Wireless Adapter\n"
+	.string "always attached!$"
+
+gUnknown_81B9E75:: @ 81B9E75
+	.string "Visit every city and town, travel every\n"
+	.string "road, explore every cave, and face\l"
+	.string "every challenge as you strive to\l"
+	.string "become the greatest TRAINER of\l"
+	.string "POKéMON!$"
+
+gUnknown_81B9F09:: @ 81B9F09
+	.string "On your adventure, you will be faced\n"
+	.string "with many obstacles. Every obstacle\l"
+	.string "can be overcome by doing something\l"
+	.string "or by solving mysteries. Some obstacles\l"
+	.string "are affected by something that happens\l"
+	.string "far away.$"
+
+gUnknown_81B9FCE:: @ 81B9FCE
+	.string "Some of the obstacles in your way can\n"
+	.string "be removed once your POKéMON learn\l"
+	.string "specific moves.$"
+
+gUnknown_81BA027:: @ 81BA027
+	.string "POKéMON are wondrous creatures that\n"
+	.string "are shrouded in mystery. You may meet\l"
+	.string "them all over the world…in tall\l"
+	.string "grass, caves, the sea, and more.\l"
+	.string "They appear to grow obedient to the\l"
+	.string "TRAINERS that caught them.$"
+
+gUnknown_81BA0F1:: @ 81BA0F1
+	.string "Using the Type Matchup List$"
+
+gUnknown_81BA10D:: @ 81BA10D
+	.string "Own move type: DARK$"
+
+gUnknown_81BA121:: @ 81BA121
+	.string "Own POKéMON type: DARK$"
+
+gUnknown_81BA138:: @ 81BA138
+	.string "Own move type: ROCK$"
+
+gUnknown_81BA14C:: @ 81BA14C
+	.string "Own POKéMON type: ROCK$"
+
+gUnknown_81BA163:: @ 81BA163
+	.string "Own move type: PSYCHIC$"
+
+gUnknown_81BA17A:: @ 81BA17A
+	.string "Own POKéMON type: PSYCHIC$"
+
+gUnknown_81BA194:: @ 81BA194
+	.string "Own move type: FIGHTING$"
+
+gUnknown_81BA1AC:: @ 81BA1AC
+	.string "Own POKéMON type: FIGHTING$"
+
+gUnknown_81BA1C7:: @ 81BA1C7
+	.string "Own move type: GRASS$"
+
+gUnknown_81BA1DC:: @ 81BA1DC
+	.string "Own POKéMON type: GRASS$"
+
+gUnknown_81BA1F4:: @ 81BA1F4
+	.string "Own move type: GHOST$"
+
+gUnknown_81BA209:: @ 81BA209
+	.string "Own POKéMON type: GHOST$"
+
+gUnknown_81BA221:: @ 81BA221
+	.string "Own move type: ICE$"
+
+gUnknown_81BA234:: @ 81BA234
+	.string "Own POKéMON type: ICE$"
+
+gUnknown_81BA24A:: @ 81BA24A
+	.string "Own move type: GROUND$"
+
+gUnknown_81BA260:: @ 81BA260
+	.string "Own POKéMON type: GROUND$"
+
+gUnknown_81BA279:: @ 81BA279
+	.string "Own move type: ELECTRIC$"
+
+gUnknown_81BA291:: @ 81BA291
+	.string "Own POKéMON type: ELECTRIC$"
+
+gUnknown_81BA2AC:: @ 81BA2AC
+	.string "Own move type: POISON$"
+
+gUnknown_81BA2C2:: @ 81BA2C2
+	.string "Own POKéMON type: POISON$"
+
+gUnknown_81BA2DB:: @ 81BA2DB
+	.string "Own move type: DRAGON$"
+
+gUnknown_81BA2F1:: @ 81BA2F1
+	.string "Own POKéMON type: DRAGON$"
+
+gUnknown_81BA30A:: @ 81BA30A
+	.string "Own move type: NORMAL$"
+
+gUnknown_81BA320:: @ 81BA320
+	.string "Own POKéMON type: NORMAL$"
+
+gUnknown_81BA339:: @ 81BA339
+	.string "Own move type: STEEL$"
+
+gUnknown_81BA34E:: @ 81BA34E
+	.string "Own POKéMON type: STEEL$"
+
+gUnknown_81BA366:: @ 81BA366
+	.string "Own move type: FLYING$"
+
+gUnknown_81BA37C:: @ 81BA37C
+	.string "Own POKéMON type: FLYING$"
+
+gUnknown_81BA395:: @ 81BA395
+	.string "Own move type: FIRE$"
+
+gUnknown_81BA3A9:: @ 81BA3A9
+	.string "Own POKéMON type: FIRE$"
+
+gUnknown_81BA3C0:: @ 81BA3C0
+	.string "Own move type: WATER$"
+
+gUnknown_81BA3D5:: @ 81BA3D5
+	.string "Own POKéMON type: WATER$"
+
+gUnknown_81BA3ED:: @ 81BA3ED
+	.string "Own move type: BUG$"
+
+gUnknown_81BA400:: @ 81BA400
+	.string "Own POKéMON type: BUG$"
+
+gUnknown_81BA416:: @ 81BA416
+	.string "Depending on the matchup of the\n"
+	.string "move type and the target POKéMON's\l"
+	.string "type, the move's effectiveness varies:\l"
+	.string "{EXTRA_TARGET}: Super effective!\l"
+	.string "{EXTRA_TRIANGLE}: Not very effective\l"
+	.string "{EXTRA_X}: Not effective at all\l"
+	.string "(No changes for other matchups.)$"
+
+gUnknown_81BA4E6:: @ 81BA4E6
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: PSYCHIC, GHOST\p"
+	.string "   {EXTRA_TRIANGLE}: FIGHTING, DARK, STEEL$"
+
+gUnknown_81BA539:: @ 81BA539
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIGHTING, BUG\p"
+	.string "   {EXTRA_TRIANGLE}: GHOST, DARK\p"
+	.string "   {EXTRA_X}: PSYCHIC$"
+
+gUnknown_81BA595:: @ 81BA595
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIRE, ICE, FLYING, BUG\p"
+	.string "   {EXTRA_TRIANGLE}: FIGHTING, GROUND, STEEL$"
+
+gUnknown_81BA5F2:: @ 81BA5F2
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: WATER, GRASS, FIGHTING,\n"
+	.string "       GROUND, STEEL\p"
+	.string "   {EXTRA_TRIANGLE}: NORMAL, FIRE, POISON, FLYING$"
+
+gUnknown_81BA66F:: @ 81BA66F
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIGHTING, POISON\p"
+	.string "   {EXTRA_TRIANGLE}: PSYCHIC, STEEL\p"
+	.string "   {EXTRA_X}: DARK$"
+
+gUnknown_81BA6C9:: @ 81BA6C9
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: BUG, GHOST, DARK\p"
+	.string "   {EXTRA_TRIANGLE}: FIGHTING, PSYCHIC$"
+
+gUnknown_81BA71F:: @ 81BA71F
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: NORMAL, ICE, ROCK, DARK, STEEL\p"
+	.string "   {EXTRA_TRIANGLE}: POISON, FLYING, PSYCHIC, BUG\p"
+	.string "   {EXTRA_X}: GHOST$"
+
+gUnknown_81BA796:: @ 81BA796
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FLYING, PSYCHIC\p"
+	.string "   {EXTRA_TRIANGLE}: BUG, ROCK, DARK$"
+
+gUnknown_81BA7E9:: @ 81BA7E9
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: WATER, GROUND, ROCK\p"
+	.string "   {EXTRA_TRIANGLE}: FIRE, GRASS, POISON, FLYING,\n"
+	.string "       BUG, DRAGON, STEEL$"
+
+gUnknown_81BA862:: @ 81BA862
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIRE, ICE, POISON, FLYING, BUG\p"
+	.string "   {EXTRA_TRIANGLE}: WATER, ELECTRIC, GRASS, GROUND$"
+
+gUnknown_81BA8D3:: @ 81BA8D3
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: PSYCHIC, GHOST\p"
+	.string "   {EXTRA_TRIANGLE}: DARK, STEEL\p"
+	.string "   {EXTRA_X}: NORMAL$"
+
+gUnknown_81BA92A:: @ 81BA92A
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: GHOST, DARK\p"
+	.string "   {EXTRA_TRIANGLE}: POISON, BUG\p"
+	.string "   {EXTRA_X}: NORMAL, FIGHTING$"
+
+gUnknown_81BA98D:: @ 81BA98D
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: GRASS, GROUND, FLYING, DRAGON\p"
+	.string "   {EXTRA_TRIANGLE}: FIRE, WATER, ICE, STEEL$"
+
+gUnknown_81BA9F1:: @ 81BA9F1
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIRE, FIGHTING, ROCK, STEEL\p"
+	.string "   {EXTRA_TRIANGLE}: ICE$"
+
+gUnknown_81BAA44:: @ 81BAA44
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIRE, ELECTRIC, POISON, ROCK,\n"
+	.string "       STEEL\p"
+	.string "   {EXTRA_TRIANGLE}: GRASS, BUG\n"
+	.string "   {EXTRA_X}: FLYING$"
+
+gUnknown_81BAAB6:: @ 81BAAB6
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: WATER, GRASS, ICE\p"
+	.string "   {EXTRA_TRIANGLE}: POISON, ROCK\p"
+	.string "   {EXTRA_X}: ELECTRIC$"
+
+gUnknown_81BAB18:: @ 81BAB18
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: WATER, FLYING\p"
+	.string "   {EXTRA_TRIANGLE}: ELECTRIC, GRASS, DRAGON\p"
+	.string "   {EXTRA_X}: GROUND$"
+
+gUnknown_81BAB7A:: @ 81BAB7A
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: GROUND\p"
+	.string "   {EXTRA_TRIANGLE}: ELECTRIC, FLYING, STEEL$"
+
+gUnknown_81BABCC:: @ 81BABCC
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: GRASS\p"
+	.string "   {EXTRA_TRIANGLE}: POISON, GROUND, ROCK, GHOST\p"
+	.string "   {EXTRA_X}: STEEL$"
+
+gUnknown_81BAC29:: @ 81BAC29
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: GROUND, PSYCHIC\p"
+	.string "   {EXTRA_TRIANGLE}: GRASS, FIGHTING, POISON, BUG$"
+
+gUnknown_81BAC89:: @ 81BAC89
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: DRAGON\p"
+	.string "   {EXTRA_TRIANGLE}: STEEL$"
+
+gUnknown_81BACC4:: @ 81BACC4
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: ICE, DRAGON\p"
+	.string "   {EXTRA_TRIANGLE}: FIRE, WATER, ELECTRIC, GRASS$"
+
+gUnknown_81BAD20:: @ 81BAD20
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TRIANGLE}: ROCK, STEEL\p"
+	.string "   {EXTRA_X}: GHOST$"
+
+gUnknown_81BAD60:: @ 81BAD60
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIGHTING\p"
+	.string "   {EXTRA_X}: GHOST$"
+
+gUnknown_81BADA2:: @ 81BADA2
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: ICE, ROCK\p"
+	.string "   {EXTRA_TRIANGLE}: FIRE, WATER, ELECTRIC, STEEL$"
+
+gUnknown_81BADF7:: @ 81BADF7
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIRE, FIGHTING, GROUND\n"
+	.string "   {EXTRA_TRIANGLE}: NORMAL, GRASS, ICE, FLYING,\l"
+	.string "       PSYCHIC, BUG, ROCK, GHOST,\l"
+	.string "       DRAGON, DARK, STEEL\l"
+	.string "   {EXTRA_X}: POISON$"
+
+gUnknown_81BAEA8:: @ 81BAEA8
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: GRASS, FIGHTING, BUG\p"
+	.string "   {EXTRA_TRIANGLE}: ELECTRIC, ROCK, STEEL$"
+
+gUnknown_81BAF01:: @ 81BAF01
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: ELECTRIC, ICE, ROCK\p"
+	.string "   {EXTRA_TRIANGLE}: GRASS, FIGHTING, BUG\p"
+	.string "   {EXTRA_X}: GROUND$"
+
+gUnknown_81BAF6B:: @ 81BAF6B
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: GRASS, ICE, BUG, STEEL\p"
+	.string "   {EXTRA_TRIANGLE}: FIRE, WATER, ROCK, DRAGON$"
+
+gUnknown_81BAFCA:: @ 81BAFCA
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: WATER, GROUND, ROCK\p"
+	.string "   {EXTRA_TRIANGLE}: FIRE, GRASS, ICE, BUG, STEEL$"
+
+gUnknown_81BB02E:: @ 81BB02E
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIRE, GROUND, ROCK\p"
+	.string "   {EXTRA_TRIANGLE}: WATER, GRASS, DRAGON$"
+
+gUnknown_81BB084:: @ 81BB084
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: ELECTRIC, GRASS\p"
+	.string "   {EXTRA_TRIANGLE}: FIRE, WATER, ICE, STEEL$"
+
+gUnknown_81BB0DF:: @ 81BB0DF
+	.string "Effect on the opposing POKéMON:\p"
+	.string "   {EXTRA_TARGET}: GRASS, PSYCHIC, DARK\p"
+	.string "   {EXTRA_TRIANGLE}: FIRE, FIGHTING, POISON,\n"
+	.string "       FLYING, GHOST, STEEL$"
+
+gUnknown_81BB156:: @ 81BB156
+	.string "Effect of foe's move on own POKéMON:\p"
+	.string "   {EXTRA_TARGET}: FIRE, FLYING, ROCK\p"
+	.string "   {EXTRA_TRIANGLE}: GRASS, FIGHTING, GROUND$"
+
diff --git a/data/text/map_section_names.inc b/data/text/map_section_names.inc
index e91368a40..070375510 100644
--- a/data/text/map_section_names.inc
+++ b/data/text/map_section_names.inc
@@ -128,7 +128,7 @@ gMapSecName_UndergroundPath_2::
 	.string "UNDERGROUND PATH$"
 
 gMapSecName_DiglettsCave::
-	.string "DIGLETT’S CAVE$"
+	.string "DIGLETT'S CAVE$"
 
 gMapSecName_VictoryRoad::
 	.string "VICTORY ROAD$"
diff --git a/data/text/move_descriptions.inc b/data/text/move_descriptions.inc
index 78822e1d8..94a4d0ca8 100644
--- a/data/text/move_descriptions.inc
+++ b/data/text/move_descriptions.inc
@@ -1,1065 +1,1062 @@
-gUnknown_8482834::
+gMoveDescription_Pound::
 	.string "A physical attack\ndelivered with a\nlong tail or a\nforeleg, etc.$"
 
-gUnknown_8482874:: @ 8482874
+gMoveDescription_KarateChop:: @ 8482874
 	.string "The foe is attacked\nwith a sharp chop.\nIt has a high\ncritical-hit ratio.$"
 
-gUnknown_84828BD:: @ 84828BD
+gMoveDescription_DoubleSlap:: @ 84828BD
 	.string "The foe is slapped\nrepeatedly, back\nand forth, two to\nfive times.$"
 
-gUnknown_84828FF:: @ 84828FF
+gMoveDescription_CometPunch:: @ 84828FF
 	.string "The foe is hit with\na flurry of punches\nthat strike two to\nfive times.$"
 
-gUnknown_8482946:: @ 8482946
+gMoveDescription_MegaPunch:: @ 8482946
 	.string "The foe is slugged\nby a punch thrown\nwith muscle-packed\npower.$"
 
-gUnknown_8482985:: @ 8482985
+gMoveDescription_PayDay:: @ 8482985
 	.string "Numerous coins are\nhurled at the foe.\nMoney is earned\nafter battle.$"
 
-gUnknown_84829C9:: @ 84829C9
+gMoveDescription_FirePunch:: @ 84829C9
 	.string "The foe is punched\nwith a fiery fist.\nIt may leave the\nfoe with a burn.$"
 
-gUnknown_8482A11:: @ 8482A11
+gMoveDescription_IcePunch:: @ 8482A11
 	.string "The foe is punched\nwith an icy fist.\nIt may leave the\nfoe frozen.$"
 
-gUnknown_8482A53:: @ 8482A53
+gMoveDescription_ThunderPunch:: @ 8482A53
 	.string "The foe is punched\nwith an electrified\nfist. It may leave\nthe foe paralyzed.$"
 
-gUnknown_8482AA0:: @ 8482AA0
+gMoveDescription_Scratch:: @ 8482AA0
 	.string "Hard, pointed, and\nsharp claws rake\nthe foe.$"
 
-gUnknown_8482ACD:: @ 8482ACD
+gMoveDescription_ViceGrip:: @ 8482ACD
 	.string "Huge, impressive\npincers grip and\nsqueeze the foe.$"
 
-gUnknown_8482B00:: @ 8482B00
+gMoveDescription_Guillotine:: @ 8482B00
 	.string "A vicious tearing\nattack with pincers.\nThe foe will faint\nif it hits.$"
 
-gUnknown_8482B46:: @ 8482B46
+gMoveDescription_RazorWind:: @ 8482B46
 	.string "Blades of wind hit\nthe foe on the 2nd\nturn. It has a high\ncritical-hit ratio.$"
 
-gUnknown_8482B94:: @ 8482B94
+gMoveDescription_SwordsDance:: @ 8482B94
 	.string "A frenetic dance of\nfighting. It sharply\nraises the ATTACK\nstat.$"
 
-gUnknown_8482BD5:: @ 8482BD5
+gMoveDescription_Cut:: @ 8482BD5
 	.string "A basic attack.\nIt can be used to\ncut down thin trees\nand grass.$"
 
-gUnknown_8482C16:: @ 8482C16
+gMoveDescription_Gust:: @ 8482C16
 	.string "Strikes the foe\nwith a gust of wind\nwhipped up by\nwings.$"
 
-gUnknown_8482C4F:: @ 8482C4F
+gMoveDescription_WingAttack:: @ 8482C4F
 	.string "The foe is struck\nwith large, imposing\nwings spread wide.$"
 
-gUnknown_8482C89:: @ 8482C89
+gMoveDescription_Whirlwind:: @ 8482C89
 	.string "The foe is made to\nswitch out with an\nally. In the wild,\nthe battle ends.$"
 
-gUnknown_8482CD3:: @ 8482CD3
+gMoveDescription_Fly:: @ 8482CD3
 	.string "A 2-turn move that\nhits on the 2nd\nturn. Use it to fly\nto any known town.$"
 
-gUnknown_8482D1D:: @ 8482D1D
+gMoveDescription_Bind:: @ 8482D1D
 	.string "A long body or\ntentacles are used\nto bind the foe for\ntwo to five turns.$"
 
-gUnknown_8482D66:: @ 8482D66
+gMoveDescription_Slam:: @ 8482D66
 	.string "The foe is struck\nwith a long tail,\nvines, etc.$"
 
-gUnknown_8482D96:: @ 8482D96
+gMoveDescription_VineWhip:: @ 8482D96
 	.string "The foe is struck\nwith slender, whip-\nlike vines.$"
 
-gUnknown_8482DC8:: @ 8482DC8
+gMoveDescription_Stomp:: @ 8482DC8
 	.string "The foe is stomped\nwith a big foot.\nIt may make the\nfoe flinch.$"
 
-gUnknown_8482E08:: @ 8482E08
+gMoveDescription_DoubleKick:: @ 8482E08
 	.string "Two legs are used\nto quickly kick the\nfoe twice in one\nturn.$"
 
-gUnknown_8482E45:: @ 8482E45
+gMoveDescription_MegaKick:: @ 8482E45
 	.string "The foe is attacked\nby a kick fired\nwith muscle-packed\npower.$"
 
-gUnknown_8482E83:: @ 8482E83
+gMoveDescription_JumpKick:: @ 8482E83
 	.string "The user jumps up\nhigh, then kicks.\nIf it misses, the\nuser hurts itself.$"
 
-gUnknown_8482ECC:: @ 8482ECC
+gMoveDescription_RollingKick:: @ 8482ECC
 	.string "A quick kick from a\nrolling spin.\nIt may make the\nfoe flinch.$"
 
-gUnknown_8482F0A:: @ 8482F0A
-	.string "A lot of sand is\nhurled in the foe’s\nface, reducing its\naccuracy.$"
+gMoveDescription_SandAttack:: @ 8482F0A
+	.string "A lot of sand is\nhurled in the foe's\nface, reducing its\naccuracy.$"
 
-gUnknown_8482F4C:: @ 8482F4C
+gMoveDescription_Headbutt:: @ 8482F4C
 	.string "The user sticks its\nhead out and rams.\nIt may make the\nfoe flinch.$"
 
-gUnknown_8482F8F:: @ 8482F8F
+gMoveDescription_HornAttack:: @ 8482F8F
 	.string "The foe is jabbed\nwith a sharply\npointed horn to\ninflict damage.$"
 
-gUnknown_8482FD0:: @ 8482FD0
+gMoveDescription_FuryAttack:: @ 8482FD0
 	.string "The foe is jabbed\nrepeatedly with a\nhorn or beak two to\nfive times.$"
 
-gUnknown_8483014:: @ 8483014
+gMoveDescription_HornDrill:: @ 8483014
 	.string "The horn is rotated\nlike a drill to ram.\nThe foe will faint\nif it hits.$"
 
-gUnknown_848305C:: @ 848305C
+gMoveDescription_Tackle:: @ 848305C
 	.string "A physical attack\nin which the user\ncharges, full body,\ninto the foe.$"
 
-gUnknown_84830A2:: @ 84830A2
+gMoveDescription_BodySlam:: @ 84830A2
 	.string "The user drops its\nfull body on the\nfoe. It may leave\nthe foe paralyzed.$"
 
-gUnknown_84830EB:: @ 84830EB
+gMoveDescription_Wrap:: @ 84830EB
 	.string "A long body or\nvines are used to\nwrap the foe for\ntwo to five turns.$"
 
-gUnknown_8483130:: @ 8483130
+gMoveDescription_TakeDown:: @ 8483130
 	.string "A reckless, full-\nbody charge attack\nthat also hurts the\nuser a little.$"
 
-gUnknown_8483178:: @ 8483178
+gMoveDescription_Thrash:: @ 8483178
 	.string "The user rampages\nabout for two to\nthree turns, then\nbecomes confused.$"
 
-gUnknown_84831BF:: @ 84831BF
+gMoveDescription_DoubleEdge:: @ 84831BF
 	.string "A reckless, life-\nrisking tackle that\nalso hurts the user\na little.$"
 
-gUnknown_8483203:: @ 8483203
+gMoveDescription_TailWhip:: @ 8483203
 	.string "The user wags its\ntail cutely, making\nthe foe lower its\nDEFENSE stat.$"
 
-gUnknown_8483249:: @ 8483249
+gMoveDescription_PoisonSting:: @ 8483249
 	.string "The foe is stabbed\nwith a toxic barb,\netc. It may poison\nthe foe.$"
 
-gUnknown_848328B:: @ 848328B
+gMoveDescription_Twineedle:: @ 848328B
 	.string "The foe is stabbed\ntwice with foreleg\nstingers. It may\npoison the foe.$"
 
-gUnknown_84832D2:: @ 84832D2
+gMoveDescription_PinMissile:: @ 84832D2
 	.string "Sharp pins are shot\nat the foe and hit\ntwo to five times\nat once.$"
 
-gUnknown_8483314:: @ 8483314
+gMoveDescription_Leer:: @ 8483314
 	.string "The foe is given an\nintimidating look\nthat lowers its\nDEFENSE stat.$"
 
-gUnknown_8483358:: @ 8483358
+gMoveDescription_Bite:: @ 8483358
 	.string "The user bites with\nvicious fangs.\nIt may make the\nfoe flinch.$"
 
-gUnknown_8483397:: @ 8483397
+gMoveDescription_Growl:: @ 8483397
 	.string "The user growls in\na cute way, making\nthe foe lower its\nATTACK stat.$"
 
-gUnknown_84833DC:: @ 84833DC
+gMoveDescription_Roar:: @ 84833DC
 	.string "The foe is made to\nswitch out with an\nally. In the wild,\nthe battle ends.$"
 
-gUnknown_8483426:: @ 8483426
+gMoveDescription_Sing:: @ 8483426
 	.string "A soothing song\nin a calming voice\nlulls the foe into\na deep slumber.$"
 
-gUnknown_848346C:: @ 848346C
+gMoveDescription_Supersonic:: @ 848346C
 	.string "The user generates\nodd sound waves.\nIt may confuse the\nfoe.$"
 
-gUnknown_84834A8:: @ 84834A8
+gMoveDescription_SonicBoom:: @ 84834A8
 	.string "The foe is hit with\na shock wave that\nalways inflicts 20-\nHP damage.$"
 
-gUnknown_84834ED:: @ 84834ED
+gMoveDescription_Disable:: @ 84834ED
 	.string "For a few turns,\nit prevents the foe\nfrom using the move\nit last used.$"
 
-gUnknown_8483534:: @ 8483534
+gMoveDescription_Acid:: @ 8483534
 	.string "The foe is sprayed\nwith a harsh, hide-\nmelting acid that\nmay lower DEFENSE.$"
 
-gUnknown_8483580:: @ 8483580
+gMoveDescription_Ember:: @ 8483580
 	.string "The foe is attacked\nwith small flames.\nThe foe may suffer\na burn.$"
 
-gUnknown_84835C2:: @ 84835C2
+gMoveDescription_Flamethrower:: @ 84835C2
 	.string "The foe is scorched\nwith intense flames.\nThe foe may suffer\na burn.$"
 
-gUnknown_8483606:: @ 8483606
+gMoveDescription_Mist:: @ 8483606
 	.string "The ally party is\nprotected by a\nmist that prevents\nstat reductions.$"
 
-gUnknown_848364B:: @ 848364B
+gMoveDescription_WaterGun:: @ 848364B
 	.string "The foe is struck\nwith a lot of water\nexpelled forcibly\nfrom the mouth.$"
 
-gUnknown_8483693:: @ 8483693
+gMoveDescription_HydroPump:: @ 8483693
 	.string "A high volume of\nwater is blasted at\nthe foe under great\npressure.$"
 
-gUnknown_84836D6:: @ 84836D6
+gMoveDescription_Surf:: @ 84836D6
 	.string "A big wave crashes\ndown on the foe.\nCan also be used\nfor crossing water.$"
 
-gUnknown_848371F:: @ 848371F
+gMoveDescription_IceBeam:: @ 848371F
 	.string "The foe is struck\nwith an icy beam.\nIt may freeze the\nfoe solid.$"
 
-gUnknown_8483760:: @ 8483760
+gMoveDescription_Blizzard:: @ 8483760
 	.string "The foe is blasted\nwith a blizzard.\nIt may freeze the\nfoe solid.$"
 
-gUnknown_84837A1:: @ 84837A1
+gMoveDescription_Psybeam:: @ 84837A1
 	.string "A peculiar ray is\nshot at the foe.\nIt may leave the\nfoe confused.$"
 
-gUnknown_84837E3:: @ 84837E3
-	.string "A spray of bubbles\nstrikes the foe.\nIt may lower the\nfoe’s SPEED stat.$"
+gMoveDescription_BubbleBeam:: @ 84837E3
+	.string "A spray of bubbles\nstrikes the foe.\nIt may lower the\nfoe's SPEED stat.$"
 
-gUnknown_848382A:: @ 848382A
-	.string "A rainbow-colored\nattack beam.\nIt may lower the\nfoe’s ATTACK stat.$"
+gMoveDescription_AuroraBeam:: @ 848382A
+	.string "A rainbow-colored\nattack beam.\nIt may lower the\nfoe's ATTACK stat.$"
 
-gUnknown_848386D:: @ 848386D
+gMoveDescription_HyperBeam:: @ 848386D
 	.string "A severely damaging\nattack that makes\nthe user rest on\nthe next turn.$"
 
-gUnknown_84838B3:: @ 84838B3
+gMoveDescription_Peck:: @ 84838B3
 	.string "The foe is jabbed\nwith a sharply\npointed beak or\nhorn.$"
 
-gUnknown_84838EA:: @ 84838EA
+gMoveDescription_DrillPeck:: @ 84838EA
 	.string "A corkscrewing\nattack with the\nsharp beak acting\nas a drill.$"
 
-gUnknown_8483927:: @ 8483927
+gMoveDescription_Submission:: @ 8483927
 	.string "A reckless, full-\nbody throw attack\nthat also hurts the\nuser a little.$"
 
-gUnknown_848396E:: @ 848396E
+gMoveDescription_LowKick:: @ 848396E
 	.string "A low, tripping kick\nthat inflicts more\ndamage on heavier\nfoes.$"
 
-gUnknown_84839AE:: @ 84839AE
+gMoveDescription_Counter:: @ 84839AE
 	.string "A retaliation move\nthat counters any\nphysical hit with\ndouble the damage.$"
 
-gUnknown_84839F8:: @ 84839F8
-	.string "A gravity-fed throw\nthat causes damage\nmatching the user’s\nlevel.$"
+gMoveDescription_SeismicToss:: @ 84839F8
+	.string "A gravity-fed throw\nthat causes damage\nmatching the user's\nlevel.$"
 
-gUnknown_8483A3A:: @ 8483A3A
+gMoveDescription_Strength:: @ 8483A3A
 	.string "The foe is slugged\nat maximum power.\nCan also be used\nto move boulders.$"
 
-gUnknown_8483A82:: @ 8483A82
+gMoveDescription_Absorb:: @ 8483A82
 	.string "An attack that\nabsorbs half the\ndamage it inflicted\nto restore HP.$"
 
-gUnknown_8483AC5:: @ 8483AC5
+gMoveDescription_MegaDrain:: @ 8483AC5
 	.string "A tough attack that\ndrains half the\ndamage it inflicted\nto restore HP.$"
 
-gUnknown_8483B0C:: @ 8483B0C
+gMoveDescription_LeechSeed:: @ 8483B0C
 	.string "A seed is planted\non the foe to steal\nsome HP for the \nuser on every turn.$"
 
-gUnknown_8483B57:: @ 8483B57
-	.string "The user’s body is\nforced to grow,\nraising the SP.\nATK stat.$"
+gMoveDescription_Growth:: @ 8483B57
+	.string "The user's body is\nforced to grow,\nraising the SP.\nATK stat.$"
 
-gUnknown_8483B94:: @ 8483B94
+gMoveDescription_RazorLeaf:: @ 8483B94
 	.string "The foe is hit with\na cutting leaf.\nIt has a high\ncritical-hit ratio.$"
 
-gUnknown_8483BDA:: @ 8483BDA
+gMoveDescription_SolarBeam:: @ 8483BDA
 	.string "A 2-turn move that\nblasts the foe with\nabsorbed energy in\nthe 2nd turn.$"
 
-gUnknown_8483C22:: @ 8483C22
+gMoveDescription_PoisonPowder:: @ 8483C22
 	.string "A cloud of toxic\ndust is scattered.\nIt may poison the\nfoe.$"
 
-gUnknown_8483C5D:: @ 8483C5D
+gMoveDescription_StunSpore:: @ 8483C5D
 	.string "Paralyzing dust is\nscattered wildly.\nIt may paralyze\nthe foe.$"
 
-gUnknown_8483C9B:: @ 8483C9B
+gMoveDescription_SleepPowder:: @ 8483C9B
 	.string "A sleep-inducing\ndust is scattered\nin high volume\naround a foe.$"
 
-gUnknown_8483CDB:: @ 8483CDB
+gMoveDescription_PetalDance:: @ 8483CDB
 	.string "The user attacks\nwith petals for two\nto three turns,\nthen gets confused.$"
 
-gUnknown_8483D24:: @ 8483D24
+gMoveDescription_StringShot:: @ 8483D24
 	.string "The foe is bound\nwith strings shot\nfrom the mouth to\nreduce its SPEED.$"
 
-gUnknown_8483D6B:: @ 8483D6B
+gMoveDescription_DragonRage:: @ 8483D6B
 	.string "The foe is hit with\na shock wave that\nalways inflicts 40-\nHP damage.$"
 
-gUnknown_8483DB0:: @ 8483DB0
+gMoveDescription_FireSpin:: @ 8483DB0
 	.string "The foe is trapped\nin an intense spiral\nof fire that rages\ntwo to five turns.$"
 
-gUnknown_8483DFE:: @ 8483DFE
+gMoveDescription_ThunderShock:: @ 8483DFE
 	.string "An electric shock\nattack that may\nalso leave the foe\nparalyzed.$"
 
-gUnknown_8483E3E:: @ 8483E3E
+gMoveDescription_Thunderbolt:: @ 8483E3E
 	.string "A strong electrical\nattack that may\nalso leave the foe\nparalyzed.$"
 
-gUnknown_8483E80:: @ 8483E80
+gMoveDescription_ThunderWave:: @ 8483E80
 	.string "A weak electric\nshock that is sure\nto cause paralysis\nif it hits.$"
 
-gUnknown_8483EC2:: @ 8483EC2
+gMoveDescription_Thunder:: @ 8483EC2
 	.string "A brutal lightning\nattack that may\nalso leave the foe\nparalyzed.$"
 
-gUnknown_8483F03:: @ 8483F03
+gMoveDescription_RockThrow:: @ 8483F03
 	.string "The foe is attacked\nwith a shower of\nsmall, easily\nthrown rocks.$"
 
-gUnknown_8483F44:: @ 8483F44
+gMoveDescription_Earthquake:: @ 8483F44
 	.string "An earthquake that\nstrikes all POKéMON\nin battle excluding\nthe user.$"
 
-gUnknown_8483F89:: @ 8483F89
+gMoveDescription_Fissure:: @ 8483F89
 	.string "The foe is dropped\ninto a fissure.\nThe foe faints if it\nhits.$"
 
-gUnknown_8483FC7:: @ 8483FC7
+gMoveDescription_Dig:: @ 8483FC7
 	.string "An attack that hits\non the 2nd turn.\nCan also be used\nto exit dungeons.$"
 
-gUnknown_848400F:: @ 848400F
+gMoveDescription_Toxic:: @ 848400F
 	.string "A move that badly\npoisons the foe.\nIts poison damage\nworsens every turn.$"
 
-gUnknown_8484058:: @ 8484058
+gMoveDescription_Confusion:: @ 8484058
 	.string "A weak telekinetic\nattack that may\nalso leave the foe\nconfused.$"
 
-gUnknown_8484098:: @ 8484098
-	.string "A strong telekinetic\nattack. It may also\nlower the foe’s\nSP. DEF stat.$"
+gMoveDescription_Psychic:: @ 8484098
+	.string "A strong telekinetic\nattack. It may also\nlower the foe's\nSP. DEF stat.$"
 
-gUnknown_84840DF:: @ 84840DF
+gMoveDescription_Hypnosis:: @ 84840DF
 	.string "Hypnotic suggestion\nis used to make the\nfoe fall into a\ndeep sleep.$"
 
-gUnknown_8484123:: @ 8484123
+gMoveDescription_Meditate:: @ 8484123
 	.string "The user meditates\nto awaken its power\nand raise its\nATTACK stat.$"
 
-gUnknown_8484165:: @ 8484165
+gMoveDescription_Agility:: @ 8484165
 	.string "The user relaxes\nand lightens its\nbody to sharply\nboost its SPEED.$"
 
-gUnknown_84841A8:: @ 84841A8
+gMoveDescription_QuickAttack:: @ 84841A8
 	.string "An almost invisibly\nfast attack that\nis certain to strike\nfirst.$"
 
-gUnknown_84841E9:: @ 84841E9
+gMoveDescription_Rage:: @ 84841E9
 	.string "An attack that\nbecomes stronger\neach time the user\nis hit in battle.$"
 
-gUnknown_848422E:: @ 848422E
+gMoveDescription_Teleport:: @ 848422E
 	.string "Use it to flee from\nany wild POKéMON.\nAlso warps to the\nlast POKé CENTER.$"
 
-gUnknown_8484278:: @ 8484278
-	.string "An attack with a\nmirage that inflicts\ndamage matching\nthe user’s level.$"
+gMoveDescription_NightShade:: @ 8484278
+	.string "An attack with a\nmirage that inflicts\ndamage matching\nthe user's level.$"
 
-gUnknown_84842C0:: @ 84842C0
+gMoveDescription_Mimic:: @ 84842C0
 	.string "The user copies the\nmove last used by\nthe foe for the\nrest of the battle.$"
 
-gUnknown_848430A:: @ 848430A
-	.string "An ear-splitting\nscreech is emitted\nto sharply reduce\nthe foe’s DEFENSE.$"
+gMoveDescription_Screech:: @ 848430A
+	.string "An ear-splitting\nscreech is emitted\nto sharply reduce\nthe foe's DEFENSE.$"
 
-gUnknown_8484353:: @ 8484353
+gMoveDescription_DoubleTeam:: @ 8484353
 	.string "The user creates\nillusory copies of\nitself to raise its\nevasiveness.$"
 
-gUnknown_8484398:: @ 8484398
-	.string "A self-healing move\nthat restores HP by\nup to half of the\nuser’s maximum HP.$"
+gMoveDescription_Recover:: @ 8484398
+	.string "A self-healing move\nthat restores HP by\nup to half of the\nuser's maximum HP.$"
 
-gUnknown_84843E5:: @ 84843E5
+gMoveDescription_Harden:: @ 84843E5
 	.string "The user stiffens\nall the muscles in\nits body to raise\nits DEFENSE stat.$"
 
-gUnknown_848442E:: @ 848442E
+gMoveDescription_Minimize:: @ 848442E
 	.string "The user compresses\nall the cells in its\nbody to raise its\nevasiveness.$"
 
-gUnknown_8484476:: @ 8484476
-	.string "An obscuring cloud\nof smoke or ink\nreduces the foe’s\naccuracy.$"
+gMoveDescription_Smokescreen:: @ 8484476
+	.string "An obscuring cloud\nof smoke or ink\nreduces the foe's\naccuracy.$"
 
-gUnknown_84844B5:: @ 84844B5
+gMoveDescription_ConfuseRay:: @ 84844B5
 	.string "The foe is exposed\nto a sinister ray\nthat triggers\nconfusion.$"
 
-gUnknown_84844F3:: @ 84844F3
+gMoveDescription_Withdraw:: @ 84844F3
 	.string "The user withdraws\nits body in its hard\nshell, raising its\nDEFENSE stat.$"
 
-gUnknown_848453C:: @ 848453C
+gMoveDescription_DefenseCurl:: @ 848453C
 	.string "The user curls up\nto conceal weak\nspots and raise its\nDEFENSE stat.$"
 
-gUnknown_8484580:: @ 8484580
+gMoveDescription_Barrier:: @ 8484580
 	.string "The user creates a\nsturdy wall that\nsharply raises its\nDEFENSE stat.$"
 
-gUnknown_84845C5:: @ 84845C5
+gMoveDescription_LightScreen:: @ 84845C5
 	.string "A wall of light\ncuts damage from\nSP. ATK attacks\nfor five turns.$"
 
-gUnknown_8484606:: @ 8484606
+gMoveDescription_Haze:: @ 8484606
 	.string "Eliminates all stat\nchanges among all\nPOKéMON engaged in\nbattle.$"
 
-gUnknown_8484647:: @ 8484647
+gMoveDescription_Reflect:: @ 8484647
 	.string "A wall of light\ncuts damage from\nphysical attacks\nfor five turns.$"
 
-gUnknown_8484689:: @ 8484689
+gMoveDescription_FocusEnergy:: @ 8484689
 	.string "The user takes a\ndeep breath and\nfocuses to raise its\ncritical-hit ratio.$"
 
-gUnknown_84846D3:: @ 84846D3
+gMoveDescription_Bide:: @ 84846D3
 	.string "The user endures\nattacks for two\nturns, then strikes\nback double.$"
 
-gUnknown_8484715:: @ 8484715
+gMoveDescription_Metronome:: @ 8484715
 	.string "Waggles a finger\nand stimulates the\nbrain into using any\nmove at random.$"
 
-gUnknown_848475E:: @ 848475E
+gMoveDescription_MirrorMove:: @ 848475E
 	.string "The user counters\nthe move last used\nby the foe with the\nsame move.$"
 
-gUnknown_84847A2:: @ 84847A2
+gMoveDescription_SelfDestruct:: @ 84847A2
 	.string "The user blows up\nto inflict severe\ndamage, even\nmaking itself faint.$"
 
-gUnknown_84847E8:: @ 84847E8
+gMoveDescription_EggBomb:: @ 84847E8
 	.string "A large egg is\nhurled with great\nforce at the foe to\ninflict damage.$"
 
-gUnknown_848482D:: @ 848482D
+gMoveDescription_Lick:: @ 848482D
 	.string "The foe is licked\nand hit with a long\ntongue. It may\nalso paralyze.$"
 
-gUnknown_8484871:: @ 8484871
+gMoveDescription_Smog:: @ 8484871
 	.string "The foe is attacked\nwith exhaust gases.\nIt may also poison\nthe foe.$"
 
-gUnknown_84848B5:: @ 84848B5
+gMoveDescription_Sludge:: @ 84848B5
 	.string "Toxic sludge is\nhurled at the foe.\nIt may poison the\ntarget.$"
 
-gUnknown_84848F2:: @ 84848F2
+gMoveDescription_BoneClub:: @ 84848F2
 	.string "The foe is clubbed\nwith a bone held in\nhand. It may make\nthe foe flinch.$"
 
-gUnknown_848493B:: @ 848493B
+gMoveDescription_FireBlast:: @ 848493B
 	.string "The foe is hit with\nan intense flame.\nIt may leave the\ntarget with a burn.$"
 
-gUnknown_8484986:: @ 8484986
+gMoveDescription_Waterfall:: @ 8484986
 	.string "A powerful charge\nattack. It can also\nbe used to climb\na waterfall.$"
 
-gUnknown_84849CA:: @ 84849CA
-	.string "The foe is clamped\nand squeezed by\nthe user’s shell for\ntwo to five turns.$"
+gMoveDescription_Clamp:: @ 84849CA
+	.string "The foe is clamped\nand squeezed by\nthe user's shell for\ntwo to five turns.$"
 
-gUnknown_8484A15:: @ 8484A15
+gMoveDescription_Swift:: @ 8484A15
 	.string "Star-shaped rays\nthat never miss are\nfired at all foes in\nbattle.$"
 
-gUnknown_8484A57:: @ 8484A57
+gMoveDescription_SkullBash:: @ 8484A57
 	.string "The user raises its\nDEFENSE in the 1st\nturn, then attacks\nin the 2nd turn.$"
 
-gUnknown_8484AA2:: @ 8484AA2
+gMoveDescription_SpikeCannon:: @ 8484AA2
 	.string "Sharp spikes are\nfired at the foe to\nstrike two to five\ntimes.$"
 
-gUnknown_8484AE1:: @ 8484AE1
+gMoveDescription_Constrict:: @ 8484AE1
 	.string "The foe is attacked\nwith long tentacles\nor vines. It may\nlower SPEED.$"
 
-gUnknown_8484B27:: @ 8484B27
+gMoveDescription_Amnesia:: @ 8484B27
 	.string "Forgets about\nsomething and\nsharply raises\nSP. DEF.$"
 
-gUnknown_8484B5B:: @ 8484B5B
+gMoveDescription_Kinesis:: @ 8484B5B
 	.string "The user distracts\nthe foe by bending\na spoon. It may\nlower accuracy.$"
 
-gUnknown_8484BA1:: @ 8484BA1
+gMoveDescription_SoftBoiled:: @ 8484BA1
 	.string "Heals the user by\nup to half its full\nHP. It can be used\nto heal an ally.$"
 
-gUnknown_8484BEB:: @ 8484BEB
+gMoveDescription_HiJumpKick:: @ 8484BEB
 	.string "A strong jumping\nknee kick. If it\nmisses, the user is\nhurt.$"
 
-gUnknown_8484C27:: @ 8484C27
+gMoveDescription_Glare:: @ 8484C27
 	.string "The user intimidates\nthe foe with the\ndesign on its belly\nto cause paralysis.$"
 
-gUnknown_8484C75:: @ 8484C75
+gMoveDescription_DreamEater:: @ 8484C75
 	.string "Absorbs half the\ndamage it inflicted\non a sleeping foe\nto restore HP.$"
 
-gUnknown_8484CBB:: @ 8484CBB
+gMoveDescription_PoisonGas:: @ 8484CBB
 	.string "The foe is sprayed\nwith a cloud of\ntoxic gas that may\npoison the foe.$"
 
-gUnknown_8484D01:: @ 8484D01
+gMoveDescription_Barrage:: @ 8484D01
 	.string "Round objects are\nhurled at the foe\nto strike two to\nfive times.$"
 
-gUnknown_8484D42:: @ 8484D42
+gMoveDescription_LeechLife:: @ 8484D42
 	.string "An attack that\nabsorbs half the\ndamage it inflicted\nto restore HP.$"
 
-gUnknown_8484D85:: @ 8484D85
+gMoveDescription_LovelyKiss:: @ 8484D85
 	.string "The user forces a\nkiss on the foe\nwith a scary face\nthat induces sleep.$"
 
-gUnknown_8484DCD:: @ 8484DCD
+gMoveDescription_SkyAttack:: @ 8484DCD
 	.string "A 2nd-turn attack\nmove with a high\ncritical-hit ratio.\nThe foe may flinch.$"
 
-gUnknown_8484E18:: @ 8484E18
+gMoveDescription_Transform:: @ 8484E18
 	.string "The user transforms\ninto a copy of the\nfoe with even the\nsame move set.$"
 
-gUnknown_8484E60:: @ 8484E60
-	.string "A spray of bubbles\nhits the foe.\nIt may lower the\nfoe’s SPEED stat.$"
+gMoveDescription_Bubble:: @ 8484E60
+	.string "A spray of bubbles\nhits the foe.\nIt may lower the\nfoe's SPEED stat.$"
 
-gUnknown_8484EA4:: @ 8484EA4
+gMoveDescription_DizzyPunch:: @ 8484EA4
 	.string "The foe is hit with\na rhythmic punch\nthat may leave it\nconfused.$"
 
-gUnknown_8484EE5:: @ 8484EE5
+gMoveDescription_Spore:: @ 8484EE5
 	.string "The user scatters\nbursts of fine\nspores that induce\nsleep.$"
 
-gUnknown_8484F20:: @ 8484F20
-	.string "A blast of light\nthat cuts the foe’s\naccuracy. It also\nilluminates caves.$"
+gMoveDescription_Flash:: @ 8484F20
+	.string "A blast of light\nthat cuts the foe's\naccuracy. It also\nilluminates caves.$"
 
-gUnknown_8484F6A:: @ 8484F6A
+gMoveDescription_Psywave:: @ 8484F6A
 	.string "The foe is attacked\nwith an odd, hot\nenergy wave that\nvaries in intensity.$"
 
-gUnknown_8484FB5:: @ 8484FB5
+gMoveDescription_Splash:: @ 8484FB5
 	.string "The user just flops\nand splashes around\nwithout having any\neffect.$"
 
-gUnknown_8484FF8:: @ 8484FF8
+gMoveDescription_AcidArmor:: @ 8484FF8
 	.string "The user alters its\ncells to liquefy\nitself and sharply\nraise DEFENSE.$"
 
-gUnknown_848503F:: @ 848503F
+gMoveDescription_Crabhammer:: @ 848503F
 	.string "A large pincer is\nused to hammer the\nfoe. It has a high\ncritical-hit ratio.$"
 
-gUnknown_848508B:: @ 848508B
+gMoveDescription_Explosion:: @ 848508B
 	.string "The user explodes\nto inflict terrible\ndamage even while\nfainting itself.$"
 
-gUnknown_84850D4:: @ 84850D4
+gMoveDescription_FurySwipes:: @ 84850D4
 	.string "The foe is raked\nwith sharp claws or\nscythes two to five\ntimes.$"
 
-gUnknown_8485114:: @ 8485114
+gMoveDescription_Bonemerang:: @ 8485114
 	.string "The user throws a\nbone that hits the\nfoe once, then once\nagain on return.$"
 
-gUnknown_848515E:: @ 848515E
+gMoveDescription_Rest:: @ 848515E
 	.string "The user sleeps for\ntwo turns to fully\nrestore HP and heal\nany status problem.$"
 
-gUnknown_84851AD:: @ 84851AD
+gMoveDescription_RockSlide:: @ 84851AD
 	.string "Large boulders are\nhurled at the foe.\nIt may make the\nfoe flinch.$"
 
-gUnknown_84851EF:: @ 84851EF
+gMoveDescription_HyperFang:: @ 84851EF
 	.string "The foe is attacked\nwith sharp fangs.\nIt may make the\nfoe flinch.$"
 
-gUnknown_8485231:: @ 8485231
+gMoveDescription_Sharpen:: @ 8485231
 	.string "The user reduces\nits polygon count\nto sharpen edges\nand raise ATTACK.$"
 
-gUnknown_8485277:: @ 8485277
+gMoveDescription_Conversion:: @ 8485277
 	.string "The user changes\nits type to match\nthe type of one of\nits moves.$"
 
-gUnknown_84852B8:: @ 84852B8
+gMoveDescription_TriAttack:: @ 84852B8
 	.string "A simultaneous\n3-beam attack that\nmay paralyze, burn,\nor freeze the foe.$"
 
-gUnknown_8485301:: @ 8485301
-	.string "The user attacks\nwith sharp fangs\nand halves the\nfoe’s HP.$"
+gMoveDescription_SuperFang:: @ 8485301
+	.string "The user attacks\nwith sharp fangs\nand halves the\nfoe's HP.$"
 
-gUnknown_848533C:: @ 848533C
+gMoveDescription_Slash:: @ 848533C
 	.string "The foe is slashed\nwith claws, etc.\nIt has a high\ncritical-hit ratio.$"
 
-gUnknown_8485382:: @ 8485382
+gMoveDescription_Substitute:: @ 8485382
 	.string "The user creates a\ndecoy using one-\nquarter of its full\nHP.$"
 
-gUnknown_84853BE:: @ 84853BE
+gMoveDescription_Struggle:: @ 84853BE
 	.string "An attack that is\nused only if there\nis no PP. It also\nhurts the user.$"
 
-gUnknown_8485405:: @ 8485405
+gMoveDescription_Sketch:: @ 8485405
 	.string "This move copies\nthe move last used\nby the foe, then\ndisappears.$"
 
-gUnknown_8485446:: @ 8485446
+gMoveDescription_TripleKick:: @ 8485446
 	.string "A 3-kick attack\nthat becomes more\npowerful with each\nsuccessive hit.$"
 
-gUnknown_848548B:: @ 848548B
-	.string "An attack that may\ntake the foe’s held\nitem if the user\nisn’t holding one.$"
+gMoveDescription_Thief:: @ 848548B
+	.string "An attack that may\ntake the foe's held\nitem if the user\nisn't holding one.$"
 
-gUnknown_84854D6:: @ 84854D6
-	.string "Ensnares the foe \nwith sticky string\nso it doesn’t flee\nor switch out.$"
+gMoveDescription_SpiderWeb:: @ 84854D6
+	.string "Ensnares the foe \nwith sticky string\nso it doesn't flee\nor switch out.$"
 
-gUnknown_848551D:: @ 848551D
-	.string "The user predicts\nthe foe’s action to\nensure its next\nattack hits.$"
+gMoveDescription_MindReader:: @ 848551D
+	.string "The user predicts\nthe foe's action to\nensure its next\nattack hits.$"
 
-gUnknown_8485560:: @ 8485560
+gMoveDescription_Nightmare:: @ 8485560
 	.string "A sleeping foe is\nshown a nightmare\nthat inflicts some\ndamage every turn.$"
 
-gUnknown_84855AA:: @ 84855AA
+gMoveDescription_FlameWheel:: @ 84855AA
 	.string "The user makes a\nfiery charge at the\nfoe. It may cause\na burn.$"
 
-gUnknown_84855E9:: @ 84855E9
+gMoveDescription_Snore:: @ 84855E9
 	.string "An attack that can\nbe used only while\nasleep. It may\ncause flinching.$"
 
-gUnknown_848562F:: @ 848562F
+gMoveDescription_Curse:: @ 848562F
 	.string "A move that works\ndifferently for the\nGHOST-type and all\nthe other types.$"
 
-gUnknown_8485679:: @ 8485679
+gMoveDescription_Flail:: @ 8485679
 	.string "A desperate attack\nthat becomes more\npowerful the less\nHP the user has.$"
 
-gUnknown_84856C1:: @ 84856C1
+gMoveDescription_Conversion2:: @ 84856C1
 	.string "The user changes\ntype to make itself\nresistant to the\nlast attack it took.$"
 
-gUnknown_848570C:: @ 848570C
+gMoveDescription_Aeroblast:: @ 848570C
 	.string "A vortex of air is\nshot at the foe.\nIt has a high\ncritical-hit ratio.$"
 
-gUnknown_8485752:: @ 8485752
+gMoveDescription_CottonSpore:: @ 8485752
 	.string "Cotton-like spores\ncling to the foe,\nsharply reducing\nits SPEED stat.$"
 
-gUnknown_8485798:: @ 8485798
+gMoveDescription_Reversal:: @ 8485798
 	.string "An all-out attack\nthat becomes more\npowerful the less\nHP the user has.$"
 
-gUnknown_84857DF:: @ 84857DF
+gMoveDescription_Spite:: @ 84857DF
 	.string "A move that cuts\n2 to 5 PP from the\nmove last used by\nthe foe.$"
 
-gUnknown_848581E:: @ 848581E
+gMoveDescription_PowderSnow:: @ 848581E
 	.string "Blasts the foe with\na snowy gust.\nIt may cause\nfreezing.$"
 
-gUnknown_8485857:: @ 8485857
+gMoveDescription_Protect:: @ 8485857
 	.string "Enables the user to\nevade all attacks.\nIt may fail if used\nin succession.$"
 
-gUnknown_84858A1:: @ 84858A1
+gMoveDescription_MachPunch:: @ 84858A1
 	.string "A punch thrown at\nblinding speed.\nIt is certain to\nstrike first.$"
 
-gUnknown_84858E2:: @ 84858E2
+gMoveDescription_ScaryFace:: @ 84858E2
 	.string "Frightens the foe\nwith a scary face\nto sharply reduce\nits SPEED.$"
 
-gUnknown_8485923:: @ 8485923
+gMoveDescription_FaintAttack:: @ 8485923
 	.string "The user draws up\nclose to the foe\ndisarmingly, then\nhits without fail.$"
 
-gUnknown_848596B:: @ 848596B
+gMoveDescription_SweetKiss:: @ 848596B
 	.string "The user kisses\nthe foe with sweet\ncuteness that\ncauses confusion.$"
 
-gUnknown_84859AE:: @ 84859AE
+gMoveDescription_BellyDrum:: @ 84859AE
 	.string "The user maximizes\nits ATTACK stat at\nthe cost of half\nits full HP.$"
 
-gUnknown_84859F2:: @ 84859F2
+gMoveDescription_SludgeBomb:: @ 84859F2
 	.string "Filthy sludge is\nhurled at the foe.\nIt may poison the\ntarget.$"
 
-gUnknown_8485A30:: @ 8485A30
-	.string "Mud is hurled in\nthe foe’s face to\ninflict damage and\nlower its accuracy.$"
+gMoveDescription_MudSlap:: @ 8485A30
+	.string "Mud is hurled in\nthe foe's face to\ninflict damage and\nlower its accuracy.$"
 
-gUnknown_8485A7A:: @ 8485A7A
-	.string "Ink is blasted in\nthe foe’s face or\neyes to damage and\nlower accuracy.$"
+gMoveDescription_Octazooka:: @ 8485A7A
+	.string "Ink is blasted in\nthe foe's face or\neyes to damage and\nlower accuracy.$"
 
-gUnknown_8485AC1:: @ 8485AC1
-	.string "A trap of spikes is\nlaid around the\nfoe’s party to hurt\nfoes switching in.$"
+gMoveDescription_Spikes:: @ 8485AC1
+	.string "A trap of spikes is\nlaid around the\nfoe's party to hurt\nfoes switching in.$"
 
-gUnknown_8485B0C:: @ 8485B0C
+gMoveDescription_ZapCannon:: @ 8485B0C
 	.string "An electric blast is\nfired like a cannon\nto inflict damage\nand paralyze.$"
 
-gUnknown_8485B55:: @ 8485B55
-	.string "Completely negates\nthe foe’s efforts to\nheighten its ability\nto evade.$"
+gMoveDescription_Foresight:: @ 8485B55
+	.string "Completely negates\nthe foe's efforts to\nheighten its ability\nto evade.$"
 
-gUnknown_8485B9C:: @ 8485B9C
+gMoveDescription_DestinyBond:: @ 8485B9C
 	.string "If the user faints,\nthe foe delivering\nthe final hit also\nfaints.$"
 
-gUnknown_8485BDE:: @ 8485BDE
+gMoveDescription_PerishSong:: @ 8485BDE
 	.string "Any battler that\nhears this faints\nin three turns\nunless it switches.$"
 
-gUnknown_8485C24:: @ 8485C24
+gMoveDescription_IcyWind:: @ 8485C24
 	.string "A chilling wind is\nused to attack.\nIt also lowers the\nSPEED stat.$"
 
-gUnknown_8485C66:: @ 8485C66
+gMoveDescription_Detect:: @ 8485C66
 	.string "Enables the user to\nevade all attacks.\nIt may fail if used\nin succession.$"
 
-gUnknown_8485CB0:: @ 8485CB0
+gMoveDescription_BoneRush:: @ 8485CB0
 	.string "The user strikes\nthe foe with a bone\nin hand two to five\ntimes.$"
 
-gUnknown_8485CF0:: @ 8485CF0
+gMoveDescription_LockOn:: @ 8485CF0
 	.string "The user locks on\nto the foe, making\nthe next move sure\nto hit.$"
 
-gUnknown_8485D30:: @ 8485D30
+gMoveDescription_Outrage:: @ 8485D30
 	.string "The user thrashes\nabout for two to\nthree turns, then\nbecomes confused.$"
 
-gUnknown_8485D77:: @ 8485D77
+gMoveDescription_Sandstorm:: @ 8485D77
 	.string "A 5-turn sandstorm\nthat damages all\ntypes except ROCK,\nGROUND, and STEEL.$"
 
-gUnknown_8485DC1:: @ 8485DC1
+gMoveDescription_GigaDrain:: @ 8485DC1
 	.string "A harsh attack that\nabsorbs half the\ndamage it inflicted\nto restore HP.$"
 
-gUnknown_8485E09:: @ 8485E09
+gMoveDescription_Endure:: @ 8485E09
 	.string "The user endures\nany hit with 1 HP\nleft. It may fail if\nused in succession.$"
 
-gUnknown_8485E55:: @ 8485E55
-	.string "The foe is charmed\nby the user’s cute\nappeals, sharply\ncutting its ATTACK.$"
+gMoveDescription_Charm:: @ 8485E55
+	.string "The foe is charmed\nby the user's cute\nappeals, sharply\ncutting its ATTACK.$"
 
-gUnknown_8485EA0:: @ 8485EA0
+gMoveDescription_Rollout:: @ 8485EA0
 	.string "A 5-turn rolling\nattack that becomes\nstronger each time\nit hits.$"
 
-gUnknown_8485EE1:: @ 8485EE1
+gMoveDescription_FalseSwipe:: @ 8485EE1
 	.string "A restrained attack\nthat always leaves\nthe foe with at\nleast 1 HP.$"
 
-gUnknown_8485F24:: @ 8485F24
+gMoveDescription_Swagger:: @ 8485F24
 	.string "A move that makes\nthe foe confused,\nbut also sharply\nraises its ATTACK.$"
 
-gUnknown_8485F6C:: @ 8485F6C
+gMoveDescription_MilkDrink:: @ 8485F6C
 	.string "Heals the user by\nup to half its full\nHP. It can be used\nto heal an ally.$"
 
-gUnknown_8485FB6:: @ 8485FB6
+gMoveDescription_Spark:: @ 8485FB6
 	.string "An electrically\ncharged tackle that\nmay also paralyze\nthe foe.$"
 
-gUnknown_8485FF5:: @ 8485FF5
+gMoveDescription_FuryCutter:: @ 8485FF5
 	.string "An attack that\ngrows stronger on\neach successive\nhit.$"
 
-gUnknown_848602B:: @ 848602B
-	.string "The foe is hit with\nwings of steel.\nIt may also raise\nthe user’s DEFENSE.$"
+gMoveDescription_SteelWing:: @ 848602B
+	.string "The foe is hit with\nwings of steel.\nIt may also raise\nthe user's DEFENSE.$"
 
-gUnknown_8486075:: @ 8486075
+gMoveDescription_MeanLook:: @ 8486075
 	.string "The foe is fixed\nwith a mean look\nthat prevents it\nfrom escaping.$"
 
-gUnknown_84860B7:: @ 84860B7
+gMoveDescription_Attract:: @ 84860B7
 	.string "If it is the other\ngender, the foe is\nmade infatuated and\nunlikely to attack.$"
 
-gUnknown_8486105:: @ 8486105
+gMoveDescription_SleepTalk:: @ 8486105
 	.string "While asleep, the\nuser randomly uses\none of the moves it\nknows.$"
 
-gUnknown_8486145:: @ 8486145
+gMoveDescription_HealBell:: @ 8486145
 	.string "A soothing bell\nchimes to heal the\nstatus problems of\nall allies.$"
 
-gUnknown_8486187:: @ 8486187
+gMoveDescription_Return:: @ 8486187
 	.string "This attack move\ngrows more powerful\nthe more the user\nlikes its TRAINER.$"
 
-gUnknown_84861D1:: @ 84861D1
+gMoveDescription_Present:: @ 84861D1
 	.string "The foe is given a\nbooby-trapped gift.\nIt restores HP\nsometimes, however.$"
 
-gUnknown_848621B:: @ 848621B
+gMoveDescription_Frustration:: @ 848621B
 	.string "This attack move\ngrows more powerful\nthe less the user\nlikes its TRAINER.$"
 
-gUnknown_8486265:: @ 8486265
-	.string "It protects the\nuser’s party from\nall status problems\nfor five turns.$"
+gMoveDescription_Safeguard:: @ 8486265
+	.string "It protects the\nuser's party from\nall status problems\nfor five turns.$"
 
-gUnknown_84862AB:: @ 84862AB
-	.string "The user adds its\nHP to the foe’s HP,\nthen equally shares\nthe total HP.$"
+gMoveDescription_PainSplit:: @ 84862AB
+	.string "The user adds its\nHP to the foe's HP,\nthen equally shares\nthe total HP.$"
 
-gUnknown_84862F3:: @ 84862F3
+gMoveDescription_SacredFire:: @ 84862F3
 	.string "A mystical and\npowerful fire\nattack that may\ninflict a burn.$"
 
-gUnknown_8486330:: @ 8486330
+gMoveDescription_Magnitude:: @ 8486330
 	.string "A ground-shaking\nattack against all\nstanding POKéMON.\nIts power varies.$"
 
-gUnknown_8486378:: @ 8486378
-	.string "The foe is punched\nwith the user’s full\npower. It confuses\nthe foe if it hits.$"
+gMoveDescription_DynamicPunch:: @ 8486378
+	.string "The foe is punched\nwith the user's full\npower. It confuses\nthe foe if it hits.$"
 
-gUnknown_84863C7:: @ 84863C7
+gMoveDescription_Megahorn:: @ 84863C7
 	.string "A brutal ramming\nattack delivered\nwith a tough and\nimpressive horn.$"
 
-gUnknown_848640B:: @ 848640B
+gMoveDescription_DragonBreath:: @ 848640B
 	.string "The foe is hit with\nan incredible blast\nof breath that may\nalso paralyze.$"
 
-gUnknown_8486455:: @ 8486455
+gMoveDescription_BatonPass:: @ 8486455
 	.string "The user switches\nout, passing along\nany stat changes\nto the new battler.$"
 
-gUnknown_848649F:: @ 848649F
+gMoveDescription_Encore:: @ 848649F
 	.string "Makes the foe use\nthe move it last\nused repeatedly for\ntwo to six turns.$"
 
-gUnknown_84864E8:: @ 84864E8
+gMoveDescription_Pursuit:: @ 84864E8
 	.string "An attack move that\nworks especially\nwell on a foe that\nis switching out.$"
 
-gUnknown_8486532:: @ 8486532
+gMoveDescription_RapidSpin:: @ 8486532
 	.string "An attack that\nfrees the user from\nBIND, WRAP, LEECH\nSEED, and SPIKES.$"
 
-gUnknown_8486579:: @ 8486579
+gMoveDescription_SweetScent:: @ 8486579
 	.string "Allures the foe to\nreduce evasiveness.\nIt also attracts\nwild POKéMON.$"
 
-gUnknown_84865BF:: @ 84865BF
-	.string "An attack with a\nsteel-hard tail.\nIt may lower the\nfoe’s DEFENSE stat.$"
+gMoveDescription_IronTail:: @ 84865BF
+	.string "An attack with a\nsteel-hard tail.\nIt may lower the\nfoe's DEFENSE stat.$"
 
-gUnknown_8486606:: @ 8486606
-	.string "The foe is attacked\nwith steel claws.\nIt may also raise\nthe user’s ATTACK.$"
+gMoveDescription_MetalClaw:: @ 8486606
+	.string "The foe is attacked\nwith steel claws.\nIt may also raise\nthe user's ATTACK.$"
 
-gUnknown_8486651:: @ 8486651
+gMoveDescription_VitalThrow:: @ 8486651
 	.string "Makes the user\nattack after the\nfoe. In return,\nit will not miss.$"
 
-gUnknown_8486693:: @ 8486693
-	.string "Restores the user’s\nHP. The amount of\nHP regained varies\nwith the weather.$"
+gMoveDescription_MorningSun:: @ 8486693
+	.string "Restores the user's\nHP. The amount of\nHP regained varies\nwith the weather.$"
 
-gUnknown_84866DE:: @ 84866DE
-	.string "Restores the user’s\nHP. The amount of\nHP regained varies\nwith the weather.$"
+gMoveDescription_Synthesis:: @ 84866DE
+	.string "Restores the user's\nHP. The amount of\nHP regained varies\nwith the weather.$"
 
-gUnknown_8486729:: @ 8486729
-	.string "Restores the user’s\nHP. The amount of\nHP regained varies\nwith the weather.$"
+gMoveDescription_Moonlight:: @ 8486729
+	.string "Restores the user's\nHP. The amount of\nHP regained varies\nwith the weather.$"
 
-gUnknown_8486774:: @ 8486774
+gMoveDescription_HiddenPower:: @ 8486774
 	.string "An attack that\nvaries in type and\nintensity depending\non the user.$"
 
-gUnknown_84867B7:: @ 84867B7
+gMoveDescription_CrossChop:: @ 84867B7
 	.string "The foe is hit with\ndouble chops.\nIt has a high\ncritical-hit ratio.$"
 
-gUnknown_84867FB:: @ 84867FB
+gMoveDescription_Twister:: @ 84867FB
 	.string "A vicious twister\nattacks the foe.\nIt may make the\nfoe flinch.$"
 
-gUnknown_848683A:: @ 848683A
+gMoveDescription_RainDance:: @ 848683A
 	.string "A heavy rain falls\nfor five turns,\npowering up WATER-\ntype moves.$"
 
-gUnknown_848687C:: @ 848687C
+gMoveDescription_SunnyDay:: @ 848687C
 	.string "The sun blazes for\nfive turns, powering\nup FIRE-type\nmoves.$"
 
-gUnknown_84868B8:: @ 84868B8
-	.string "The foe is crunched\nwith sharp fangs.\nIt may lower the\nfoe’s SP. DEF.$"
+gMoveDescription_Crunch:: @ 84868B8
+	.string "The foe is crunched\nwith sharp fangs.\nIt may lower the\nfoe's SP. DEF.$"
 
-gUnknown_84868FE:: @ 84868FE
-	.string "A retaliation move\nthat pays back the\nfoe’s special attack\ndouble.$"
+gMoveDescription_MirrorCoat:: @ 84868FE
+	.string "A retaliation move\nthat pays back the\nfoe's special attack\ndouble.$"
 
-gUnknown_8486941:: @ 8486941
+gMoveDescription_PsychUp:: @ 8486941
 	.string "The user hypnotizes\nitself into copying\nany stat change\nmade by the foe.$"
 
-gUnknown_848698A:: @ 848698A
+gMoveDescription_ExtremeSpeed:: @ 848698A
 	.string "A blindingly speedy\ncharge attack that\nalways goes before\nany other.$"
 
-gUnknown_84869CF:: @ 84869CF
-	.string "An ancient power is\nused to attack. It\nmay also raise all\nthe user’s stats.$"
+gMoveDescription_AncientPower:: @ 84869CF
+	.string "An ancient power is\nused to attack. It\nmay also raise all\nthe user's stats.$"
 
-gUnknown_8486A1B:: @ 8486A1B
-	.string "A shadowy blob is\nhurled at the foe.\nMay also lower the\nfoe’s SP. DEF.$"
+gMoveDescription_ShadowBall:: @ 8486A1B
+	.string "A shadowy blob is\nhurled at the foe.\nMay also lower the\nfoe's SP. DEF.$"
 
-gUnknown_8486A62:: @ 8486A62
+gMoveDescription_FutureSight:: @ 8486A62
 	.string "Two turns after\nthis move is used,\nthe foe is attacked\npsychically.$"
 
-gUnknown_8486AA6:: @ 8486AA6
+gMoveDescription_RockSmash:: @ 8486AA6
 	.string "An attack that may\nalso cut DEFENSE.\nIt can also smash\ncracked boulders.$"
 
-gUnknown_8486AEF:: @ 8486AEF
+gMoveDescription_Whirlpool:: @ 8486AEF
 	.string "The foe is trapped\nin a fast, vicious\nwhirlpool for two\nto five turns.$"
 
-gUnknown_8486B36:: @ 8486B36
+gMoveDescription_BeatUp:: @ 8486B36
 	.string "All party POKéMON\njoin in the attack.\nThe more allies,\nthe more damage.$"
 
-gUnknown_8486B7E:: @ 8486B7E
+gMoveDescription_FakeOut:: @ 8486B7E
 	.string "An attack that hits\nfirst and causes\nflinching. Usable\nonly on 1st turn.$"
 
-gUnknown_8486BC7:: @ 8486BC7
+gMoveDescription_Uproar:: @ 8486BC7
 	.string "The user attacks in\nan uproar that\nprevents sleep for\ntwo to five turns.$"
 
-gUnknown_8486C10:: @ 8486C10
+gMoveDescription_Stockpile:: @ 8486C10
 	.string "The user charges\nup power for use\nlater. It can be\nused three times.$"
 
-gUnknown_8486C55:: @ 8486C55
+gMoveDescription_SpitUp:: @ 8486C55
 	.string "The power built\nusing STOCKPILE is\nreleased at once\nfor attack.$"
 
-gUnknown_8486C95:: @ 8486C95
+gMoveDescription_Swallow:: @ 8486C95
 	.string "The energy it built\nusing STOCKPILE is\nabsorbed to restore\nHP.$"
 
-gUnknown_8486CD4:: @ 8486CD4
+gMoveDescription_HeatWave:: @ 8486CD4
 	.string "The user exhales a\nheated breath to\nattack. It may also\ninflict a burn.$"
 
-gUnknown_8486D1C:: @ 8486D1C
+gMoveDescription_Hail:: @ 8486D1C
 	.string "A hailstorm lasting\nfive turns damages\nall POKéMON except\nthe ICE-type.$"
 
-gUnknown_8486D64:: @ 8486D64
+gMoveDescription_Torment:: @ 8486D64
 	.string "It enrages the foe,\nmaking it incapable\nof using the same\nmove successively.$"
 
-gUnknown_8486DB1:: @ 8486DB1
+gMoveDescription_Flatter:: @ 8486DB1
 	.string "Flattery is used to\nconfuse the foe,\nbut its SP. ATK\nalso rises.$"
 
-gUnknown_8486DF2:: @ 8486DF2
+gMoveDescription_WillOWisp:: @ 8486DF2
 	.string "A sinister, bluish\nwhite flame is shot\nat the foe to\ninflict a burn.$"
 
-gUnknown_8486E37:: @ 8486E37
-	.string "The user faints,\nbut sharply lowers\nthe foe’s ATTACK\nand SP. ATK.$"
+gMoveDescription_Memento:: @ 8486E37
+	.string "The user faints,\nbut sharply lowers\nthe foe's ATTACK\nand SP. ATK.$"
 
-gUnknown_8486E79:: @ 8486E79
+gMoveDescription_Facade:: @ 8486E79
 	.string "An attack that is\nboosted if user is\nburned, poisoned,\nor paralyzed.$"
 
-gUnknown_8486EBE:: @ 8486EBE
+gMoveDescription_FocusPunch:: @ 8486EBE
 	.string "An attack that is\nexecuted last.\nThe user flinches\nif hit beforehand.$"
 
-gUnknown_8486F04:: @ 8486F04
-	.string "Doubly effective on\na paralyzed foe,\nbut it also cures\nthe foe’s paralysis.$"
+gMoveDescription_SmellingSalt:: @ 8486F04
+	.string "Doubly effective on\na paralyzed foe,\nbut it also cures\nthe foe's paralysis.$"
 
-gUnknown_8486F50:: @ 8486F50
+gMoveDescription_FollowMe:: @ 8486F50
 	.string "The user draws\nattention to itself,\nmaking foes attack\nonly the user.$"
 
-gUnknown_8486F96:: @ 8486F96
-	.string "An attack that\nchanges type\ndepending on the\nuser’s location.$"
+gMoveDescription_NaturePower:: @ 8486F96
+	.string "An attack that\nchanges type\ndepending on the\nuser's location.$"
 
-gUnknown_8486FD4:: @ 8486FD4
+gMoveDescription_Charge:: @ 8486FD4
 	.string "The user charges\npower to boost the\nELECTRIC move it\nuses next.$"
 
-gUnknown_8487014:: @ 8487014
+gMoveDescription_Taunt:: @ 8487014
 	.string "The foe is taunted\ninto a rage that\nallows it to use\nonly attack moves.$"
 
-gUnknown_848705C:: @ 848705C
-	.string "A move that boosts\nthe power of the\nally’s attack in a\nbattle.$"
+gMoveDescription_HelpingHand:: @ 848705C
+	.string "A move that boosts\nthe power of the\nally's attack in a\nbattle.$"
 
-gUnknown_848709B:: @ 848709B
+gMoveDescription_Trick:: @ 848709B
 	.string "A move that tricks\nthe foe into\ntrading held items\nwith the user.$"
 
-gUnknown_84870DD:: @ 84870DD
-	.string "The user mimics the\nfoe completely and\ncopies the foe’s\nability.$"
+gMoveDescription_RolePlay:: @ 84870DD
+	.string "The user mimics the\nfoe completely and\ncopies the foe's\nability.$"
 
-gUnknown_848711E:: @ 848711E
+gMoveDescription_Wish:: @ 848711E
 	.string "A self-healing move\nthat restores half\nthe full HP on the\nnext turn.$"
 
-gUnknown_8487163:: @ 8487163
+gMoveDescription_Assist:: @ 8487163
 	.string "The user randomly\npicks and uses a\nmove of an allied\nPOKéMON.$"
 
-gUnknown_84871A1:: @ 84871A1
-	.string "The user lays roots\nthat restore HP on\nevery turn.\nIt can’t switch out.$"
+gMoveDescription_Ingrain:: @ 84871A1
+	.string "The user lays roots\nthat restore HP on\nevery turn.\nIt can't switch out.$"
 
-gUnknown_84871E9:: @ 84871E9
-	.string "A powerful attack,\nbut it also lowers\nthe user’s ATTACK\nand DEFENSE stats.$"
+gMoveDescription_Superpower:: @ 84871E9
+	.string "A powerful attack,\nbut it also lowers\nthe user's ATTACK\nand DEFENSE stats.$"
 
-gUnknown_8487234:: @ 8487234
-	.string "Reflects back the\nfoe’s LEECH SEED\nand any status-\ndamaging move.$"
+gMoveDescription_MagicCoat:: @ 8487234
+	.string "Reflects back the\nfoe's LEECH SEED\nand any status-\ndamaging move.$"
 
-gUnknown_8487276:: @ 8487276
+gMoveDescription_Recycle:: @ 8487276
 	.string "A move that\nrecycles a used\nitem for use once\nmore.$"
 
-gUnknown_84872AA:: @ 84872AA
+gMoveDescription_Revenge:: @ 84872AA
 	.string "An attack move that\ngains in intensity if\nthe target has hurt\nthe user.$"
 
-gUnknown_84872F2:: @ 84872F2
+gMoveDescription_BrickBreak:: @ 84872F2
 	.string "An attack that also\nbreaks any barrier\nlike LIGHT SCREEN\nand REFLECT.$"
 
-gUnknown_8487338:: @ 8487338
+gMoveDescription_Yawn:: @ 8487338
 	.string "A huge yawn lulls\nthe foe into falling\nasleep on the next\nturn.$"
 
-gUnknown_8487378:: @ 8487378
-	.string "Knocks down the\nfoe’s held item to\nprevent its use\nduring the battle.$"
+gMoveDescription_KnockOff:: @ 8487378
+	.string "Knocks down the\nfoe's held item to\nprevent its use\nduring the battle.$"
 
-gUnknown_84873BE:: @ 84873BE
+gMoveDescription_Endeavor:: @ 84873BE
 	.string "Gains power the\nfewer HP the user\nhas compared with\nthe foe.$"
 
-gUnknown_84873FB:: @ 84873FB
-	.string "The higher the\nuser’s HP, the more\npowerful this\nattack becomes.$"
+gMoveDescription_Eruption:: @ 84873FB
+	.string "The higher the\nuser's HP, the more\npowerful this\nattack becomes.$"
 
-gUnknown_848743C:: @ 848743C
+gMoveDescription_SkillSwap:: @ 848743C
 	.string "The user employs\nits psychic power\nto swap abilities\nwith the foe.$"
 
-gUnknown_848747F:: @ 848747F
+gMoveDescription_Imprison:: @ 848747F
 	.string "Prevents foes from\nusing any move\nthat is also known\nby the user.$"
 
-gUnknown_84874C1:: @ 84874C1
+gMoveDescription_Refresh:: @ 84874C1
 	.string "A self-healing move\nthat cures the user\nof a poisoning,\nburn, or paralysis.$"
 
-gUnknown_848750D:: @ 848750D
+gMoveDescription_Grudge:: @ 848750D
 	.string "If the user faints,\nthis move deletes\nthe PP of the move\nthat finished it.$"
 
-gUnknown_8487558:: @ 8487558
-	.string "Steals the effects\nof the foe’s\nhealing or status-\nchanging move.$"
+gMoveDescription_Snatch:: @ 8487558
+	.string "Steals the effects\nof the foe's\nhealing or status-\nchanging move.$"
 
-gUnknown_848759A:: @ 848759A
+gMoveDescription_SecretPower:: @ 848759A
 	.string "An attack that may\nhave an additional\neffect that varies\nwith the terrain.$"
 
-gUnknown_84875E5:: @ 84875E5
+gMoveDescription_Dive:: @ 84875E5
 	.string "The user dives\nunderwater on the\nfirst turn and\nstrikes next turn.$"
 
-gUnknown_8487628:: @ 8487628
+gMoveDescription_ArmThrust:: @ 8487628
 	.string "A quick flurry of\nstraight-arm\npunches that hit\ntwo to five times.$"
 
-gUnknown_848766B:: @ 848766B
-	.string "Alters the user’s\ntype depending on\nthe location’s\nterrain.$"
+gMoveDescription_Camouflage:: @ 848766B
+	.string "Alters the user's\ntype depending on\nthe location's\nterrain.$"
 
-gUnknown_84876A7:: @ 84876A7
+gMoveDescription_TailGlow:: @ 84876A7
 	.string "The user flashes a\nlight that sharply\nraises its SP. ATK\nstat.$"
 
-gUnknown_84876E6:: @ 84876E6
-	.string "A burst of light\ninjures the foe. It\nmay also lower the\nfoe’s SP. DEF.$"
+gMoveDescription_LusterPurge:: @ 84876E6
+	.string "A burst of light\ninjures the foe. It\nmay also lower the\nfoe's SP. DEF.$"
 
-gUnknown_848772D:: @ 848772D
-	.string "A flurry of down\nhits the foe. It\nmay also lower the\nfoe’s SP. ATK.$"
+gMoveDescription_MistBall:: @ 848772D
+	.string "A flurry of down\nhits the foe. It\nmay also lower the\nfoe's SP. ATK.$"
 
-gUnknown_8487771:: @ 8487771
+gMoveDescription_FeatherDance:: @ 8487771
 	.string "The foe is covered\nwith a mass of down\nthat sharply cuts\nthe ATTACK stat.$"
 
-gUnknown_84877BB:: @ 84877BB
+gMoveDescription_TeeterDance:: @ 84877BB
 	.string "A wobbly dance\nthat confuses all\nthe POKéMON in\nbattle.$"
 
-gUnknown_84877F3:: @ 84877F3
+gMoveDescription_BlazeKick:: @ 84877F3
 	.string "A fiery kick with a\nhigh critical-hit\nratio. It may also\nburn the foe.$"
 
-gUnknown_848783A:: @ 848783A
+gMoveDescription_MudSport:: @ 848783A
 	.string "Weakens ELECTRIC-\ntype attacks while\nthe user is in the\nbattle.$"
 
-gUnknown_848787A:: @ 848787A
+gMoveDescription_IceBall:: @ 848787A
 	.string "A 5-turn rolling\nattack that becomes\nstronger each time\nit rolls.$"
 
-gUnknown_84878BC:: @ 84878BC
+gMoveDescription_NeedleArm:: @ 84878BC
 	.string "An attack using\nthorny arms.\nIt may make the\nfoe flinch.$"
 
-gUnknown_84878F5:: @ 84878F5
+gMoveDescription_SlackOff:: @ 84878F5
 	.string "The user slacks off\nand restores its HP\nby half its full\nHP.$"
 
-gUnknown_8487932:: @ 8487932
+gMoveDescription_HyperVoice:: @ 8487932
 	.string "The user lets loose\na horribly loud\nshout with the\npower to damage.$"
 
-gUnknown_8487976:: @ 8487976
+gMoveDescription_PoisonFang:: @ 8487976
 	.string "The foe is bitten\nwith toxic fangs.\nIt may also badly\npoison the foe.$"
 
-gUnknown_84879BC:: @ 84879BC
-	.string "The foe is attacked\nwith sharp claws.\nIt may also lower\nthe foe’s DEFENSE.$"
+gMoveDescription_CrushClaw:: @ 84879BC
+	.string "The foe is attacked\nwith sharp claws.\nIt may also lower\nthe foe's DEFENSE.$"
 
-gUnknown_8487A07:: @ 8487A07
-	.string "The foe is hit with\na huge explosion.\nThe user can’t move\non the next turn.$"
+gMoveDescription_BlastBurn:: @ 8487A07
+	.string "The foe is hit with\na huge explosion.\nThe user can't move\non the next turn.$"
 
-gUnknown_8487A53:: @ 8487A53
-	.string "The foe is hit with\na watery cannon.\nThe user can’t move\non the next turn.$"
+gMoveDescription_HydroCannon:: @ 8487A53
+	.string "The foe is hit with\na watery cannon.\nThe user can't move\non the next turn.$"
 
-gUnknown_8487A9E:: @ 8487A9E
-	.string "The foe is hit with\na hard, fast punch.\nIt may also raise\nthe user’s ATTACK.$"
+gMoveDescription_MeteorMash:: @ 8487A9E
+	.string "The foe is hit with\na hard, fast punch.\nIt may also raise\nthe user's ATTACK.$"
 
-gUnknown_8487AEB:: @ 8487AEB
+gMoveDescription_Astonish:: @ 8487AEB
 	.string "An attack using a\nstartling shout.\nIt also may make\nthe foe flinch.$"
 
-gUnknown_8487B2F:: @ 8487B2F
+gMoveDescription_WeatherBall:: @ 8487B2F
 	.string "An attack that\nvaries in power and\ntype depending on\nthe weather.$"
 
-gUnknown_8487B71:: @ 8487B71
-	.string "A soothing scent is\nreleased to heal\nall status problems\nin the user’s party.$"
+gMoveDescription_Aromatherapy:: @ 8487B71
+	.string "A soothing scent is\nreleased to heal\nall status problems\nin the user's party.$"
 
-gUnknown_8487BBF:: @ 8487BBF
-	.string "The user feigns\ncrying to sharply\nlower the foe’s\nSP. DEF stat.$"
+gMoveDescription_FakeTears:: @ 8487BBF
+	.string "The user feigns\ncrying to sharply\nlower the foe's\nSP. DEF stat.$"
 
-gUnknown_8487BFF:: @ 8487BFF
+gMoveDescription_AirCutter:: @ 8487BFF
 	.string "The foe is hit with\nrazor-like wind.\nIt has a high\ncritical-hit ratio.$"
 
-gUnknown_8487C46:: @ 8487C46
-	.string "An intense attack\nthat also sharply\nreduces the user’s\nSP. ATK stat.$"
+gMoveDescription_Overheat:: @ 8487C46
+	.string "An intense attack\nthat also sharply\nreduces the user's\nSP. ATK stat.$"
 
-gUnknown_8487C8B:: @ 8487C8B
-	.string "Completely negates\nthe foe’s efforts to\nheighten its ability\nto evade.$"
+gMoveDescription_OdorSleuth:: @ 8487C8B
+	.string "Completely negates\nthe foe's efforts to\nheighten its ability\nto evade.$"
 
-gUnknown_8487CD2:: @ 8487CD2
-	.string "Boulders are hurled\nat the foe. It also\nlowers the foe’s\nSPEED if it hits.$"
+gMoveDescription_RockTomb:: @ 8487CD2
+	.string "Boulders are hurled\nat the foe. It also\nlowers the foe's\nSPEED if it hits.$"
 
-gUnknown_8487D1D:: @ 8487D1D
-	.string "The foe is attacked\nwith a silver dust.\nIt may raise all\nthe user’s stats.$"
+gMoveDescription_SilverWind:: @ 8487D1D
+	.string "The foe is attacked\nwith a silver dust.\nIt may raise all\nthe user's stats.$"
 
-gUnknown_8487D68:: @ 8487D68
-	.string "A horrible metallic\nscreech is used to\nsharply lower the\nfoe’s SP. DEF.$"
+gMoveDescription_MetalSound:: @ 8487D68
+	.string "A horrible metallic\nscreech is used to\nsharply lower the\nfoe's SP. DEF.$"
 
-gUnknown_8487DB0:: @ 8487DB0
+gMoveDescription_GrassWhistle:: @ 8487DB0
 	.string "A pleasant melody\nis played to lull\nthe foe into a deep\nsleep.$"
 
-gUnknown_8487DEF:: @ 8487DEF
+gMoveDescription_Tickle:: @ 8487DEF
 	.string "The foe is made to\nlaugh, reducing its\nATTACK and DEFENSE\nstats.$"
 
-gUnknown_8487E30:: @ 8487E30
+gMoveDescription_CosmicPower:: @ 8487E30
 	.string "The user absorbs a\nmystic power to\nraise its DEFENSE\nand SP. DEF.$"
 
-gUnknown_8487E72:: @ 8487E72
-	.string "The higher the\nuser’s HP, the more\npowerful this\nattack becomes.$"
+gMoveDescription_WaterSpout:: @ 8487E72
+	.string "The higher the\nuser's HP, the more\npowerful this\nattack becomes.$"
 
-gUnknown_8487EB3:: @ 8487EB3
+gMoveDescription_SignalBeam:: @ 8487EB3
 	.string "The foe is hit with\na flashing beam\nthat may also\ncause confusion.$"
 
-gUnknown_8487EF6:: @ 8487EF6
+gMoveDescription_ShadowPunch:: @ 8487EF6
 	.string "The user throws a\npunch from the\nshadows. It cannot\nbe evaded.$"
 
-gUnknown_8487F35:: @ 8487F35
+gMoveDescription_Extrasensory:: @ 8487F35
 	.string "The user attacks\nwith an odd power\nthat may make the\nfoe flinch.$"
 
-gUnknown_8487F76:: @ 8487F76
+gMoveDescription_SkyUppercut:: @ 8487F76
 	.string "The user attacks\nwith an uppercut\nthrown skywards\nwith force.$"
 
-gUnknown_8487FB4:: @ 8487FB4
+gMoveDescription_SandTomb:: @ 8487FB4
 	.string "The foe is trapped\ninside a painful\nsandstorm for two\nto five turns.$"
 
-gUnknown_8487FF9:: @ 8487FF9
+gMoveDescription_SheerCold:: @ 8487FF9
 	.string "The foe is attacked\nwith ultimate cold\nthat causes fainting\nif it hits.$"
 
-gUnknown_8488041:: @ 8488041
-	.string "The user attacks\nwith muddy water.\nIt may also lower\nthe foe’s accuracy.$"
+gMoveDescription_MuddyWater:: @ 8488041
+	.string "The user attacks\nwith muddy water.\nIt may also lower\nthe foe's accuracy.$"
 
-gUnknown_848808A:: @ 848808A
+gMoveDescription_BulletSeed:: @ 848808A
 	.string "The user shoots\nseeds at the foe.\nTwo to five seeds\nare shot at once.$"
 
-gUnknown_84880D0:: @ 84880D0
-	.string "An extremely fast\nattack against one\ntarget. It can’t be\nevaded.$"
+gMoveDescription_AerialAce:: @ 84880D0
+	.string "An extremely fast\nattack against one\ntarget. It can't be\nevaded.$"
 
-gUnknown_8488111:: @ 8488111
+gMoveDescription_IcicleSpear:: @ 8488111
 	.string "Sharp icicles are\nfired at the foe.\nIt strikes two to\nfive times.$"
 
-gUnknown_8488153:: @ 8488153
-	.string "The user hardens\nits body’s surface\nto sharply raise its\nDEFENSE stat.$"
+gMoveDescription_IronDefense:: @ 8488153
+	.string "The user hardens\nits body's surface\nto sharply raise its\nDEFENSE stat.$"
 
-gUnknown_848819A:: @ 848819A
-	.string "The user blocks the\nfoe’s way with arms\nspread wide to\nprevent escape.$"
+gMoveDescription_Block:: @ 848819A
+	.string "The user blocks the\nfoe's way with arms\nspread wide to\nprevent escape.$"
 
-gUnknown_84881E1:: @ 84881E1
+gMoveDescription_Howl:: @ 84881E1
 	.string "The user howls to\nraise its spirit and\nboost its ATTACK\nstat.$"
 
-gUnknown_848821F:: @ 848821F
+gMoveDescription_DragonClaw:: @ 848821F
 	.string "Sharp, huge claws\nhook and slash the\nfoe quickly and\nwith great power.$"
 
-gUnknown_8488266:: @ 8488266
-	.string "The foe is hit with\nan enormous branch.\nThe user can’t move\non the next turn.$"
+gMoveDescription_FrenzyPlant:: @ 8488266
+	.string "The foe is hit with\nan enormous branch.\nThe user can't move\non the next turn.$"
 
-gUnknown_84882B4:: @ 84882B4
+gMoveDescription_BulkUp:: @ 84882B4
 	.string "The user bulks up\nits body to boost\nboth its ATTACK and\nDEFENSE stats.$"
 
-gUnknown_84882FB:: @ 84882FB
+gMoveDescription_Bounce:: @ 84882FB
 	.string "The user bounces\non the foe on the\n2nd turn. It may\nparalyze the foe.$"
 
-gUnknown_8488341:: @ 8488341
-	.string "The user attacks by\nhurling mud.\nIt also reduces the\nfoe’s SPEED.$"
+gMoveDescription_MudShot:: @ 8488341
+	.string "The user attacks by\nhurling mud.\nIt also reduces the\nfoe's SPEED.$"
 
-gUnknown_8488383:: @ 8488383
+gMoveDescription_PoisonTail:: @ 8488383
 	.string "An attack with a\nhigh critical-hit\nratio. It may also\npoison the foe.$"
 
-gUnknown_84883C9:: @ 84883C9
-	.string "A cutely executed\nattack that also\nsteals the foe’s\nhold item.$"
+gMoveDescription_Covet:: @ 84883C9
+	.string "A cutely executed\nattack that also\nsteals the foe's\nhold item.$"
 
-gUnknown_8488408:: @ 8488408
+gMoveDescription_VoltTackle:: @ 8488408
 	.string "The user throws an\nelectrified tackle.\nIt hurts the user\na little.$"
 
-gUnknown_848844B:: @ 848844B
+gMoveDescription_MagicalLeaf:: @ 848844B
 	.string "The foe is attacked\nwith a strange leaf\nthat cannot be\nevaded.$"
 
-gUnknown_848848A:: @ 848848A
+gMoveDescription_WaterSport:: @ 848848A
 	.string "Weakens FIRE-type\nattacks while the\nuser is in the\nbattle.$"
 
-gUnknown_84884C5:: @ 84884C5
+gMoveDescription_CalmMind:: @ 84884C5
 	.string "The user focuses\nits mind to raise\nthe SP. ATK and\nSP. DEF stats.$"
 
-gUnknown_8488507:: @ 8488507
+gMoveDescription_LeafBlade:: @ 8488507
 	.string "The foe is slashed\nwith a sharp leaf.\nIt has a high\ncritical-hit ratio.$"
 
-gUnknown_848854F:: @ 848854F
-	.string "A mystic, powerful\ndance that boosts\nthe user’s ATTACK\nand SPEED stats.$"
+gMoveDescription_DragonDance:: @ 848854F
+	.string "A mystic, powerful\ndance that boosts\nthe user's ATTACK\nand SPEED stats.$"
 
-gUnknown_8488597:: @ 8488597
+gMoveDescription_RockBlast:: @ 8488597
 	.string "The user hurls two\nto five hard rocks\nat the foe to\nattack.$"
 
-gUnknown_84885D3:: @ 84885D3
-	.string "A rapid jolt of\nelectricity strikes\nthe foe. It can’t\nbe evaded.$"
+gMoveDescription_ShockWave:: @ 84885D3
+	.string "A rapid jolt of\nelectricity strikes\nthe foe. It can't\nbe evaded.$"
 
-gUnknown_8488614:: @ 8488614
+gMoveDescription_WaterPulse:: @ 8488614
 	.string "An attack with a\npulsing blast of\nwater. It may also\nconfuse the foe.$"
 
-gUnknown_848865A:: @ 848865A
+gMoveDescription_DoomDesire:: @ 848865A
 	.string "A move that attacks\nthe foe with a\nblast of light two\nturns after use.$"
 
-gUnknown_84886A1:: @ 84886A1
-	.string "An intense attack\nthat also sharply\nreduces the user’s\nSP. ATK stat.$"
-
-gUnknown_84886E6:: @ 84886E6
-	.string "  "
+gMoveDescription_PsychoBoost:: @ 84886A1
+	.string "An intense attack\nthat also sharply\nreduces the user's\nSP. ATK stat.$"
 
diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc
index 58c9cf66e..62315aed3 100644
--- a/data/text/quest_log.inc
+++ b/data/text/quest_log.inc
@@ -55,7 +55,7 @@ gUnknown_841A349:: @ 841A349
 
 gUnknown_841A391:: @ 841A391
 	.string "Removed the item {STR_VAR_1} from\n"
-	.string "the BAG’s ITEMS POCKET and stored it\n"
+	.string "the BAG's ITEMS POCKET and stored it\n"
 	.string "on the PC.$"
 
 gUnknown_841A3DA:: @ 841A3DA
@@ -64,7 +64,7 @@ gUnknown_841A3DA:: @ 841A3DA
 
 gUnknown_841A3FF:: @ 841A3FF
 	.string "Traded {STR_VAR_3} in exchange for\n"
-	.string "{STR_VAR_1}’s {STR_VAR_2}.$"
+	.string "{STR_VAR_1}'s {STR_VAR_2}.$"
 
 gUnknown_841A422:: @ 841A422
 	.string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\n"
@@ -134,7 +134,7 @@ gUnknown_841A694:: @ 841A694
 
 gUnknown_841A6A5:: @ 841A6A5
 	.string "Removed the item {STR_VAR_1} from\n"
-	.string "{PLAYER}’s PC and gave it to {STR_VAR_2}\n"
+	.string "{PLAYER}'s PC and gave it to {STR_VAR_2}\n"
 	.string "to hold.$"
 
 gUnknown_841A6E1:: @ 841A6E1
@@ -156,7 +156,7 @@ gUnknown_841A762::
 
 gUnknown_841A76A:: @ 841A76A
 	.string "Met and traded with {STR_VAR_1}.\n"
-	.string "Obtained the TRAINER’s {STR_VAR_2} in\n"
+	.string "Obtained the TRAINER's {STR_VAR_2} in\n"
 	.string "exchange for {STR_VAR_3}.$"
 
 gUnknown_841A7B0:: @ 841A7B0
@@ -295,11 +295,11 @@ gUnknown_841AD3C:: @ 841AD3C
 
 gUnknown_841AD69:: @ 841AD69
 	.string "{STR_VAR_1} used TELEPORT, transporting\n"
-	.string "the party to {STR_VAR_2}’s\n"
+	.string "the party to {STR_VAR_2}'s\n"
 	.string "{STR_VAR_3}.$"
 
 gUnknown_841AD9E:: @ 841AD9E
-	.string "{PLAYER} left {STR_VAR_1}’s\n"
+	.string "{PLAYER} left {STR_VAR_1}'s\n"
 	.string "{STR_VAR_2} for the next\n"
 	.string "destination.$"
 
@@ -311,7 +311,7 @@ gUnknown_841ADFF:: @ 841ADFF
 	.string "{PLAYER} rested comfortably at home.$"
 
 gUnknown_841AE1E:: @ 841AE1E
-	.string "{PLAYER} left PROF. OAK’s POKéMON\n"
+	.string "{PLAYER} left PROF. OAK's POKéMON\n"
 	.string "RESEARCH LAB.$"
 
 gUnknown_841AE48:: @ 841AE48
@@ -332,17 +332,17 @@ gUnknown_841AEDC:: @ 841AEDC
 
 gUnknown_841AF0C:: @ 841AF0C
 	.string "Took on {UNKNOWN_F7 0x00} GYM LEADER\n"
-	.string "{UNKNOWN_F7 0x01}’s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n"
+	.string "{UNKNOWN_F7 0x01}'s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n"
 	.string "and won {UNKNOWN_F7 0x04}!$"
 
 gUnknown_841AF3E:: @ 841AF3E
-	.string "Took on ELITE FOUR {UNKNOWN_F7 0x00}’s\n"
+	.string "Took on ELITE FOUR {UNKNOWN_F7 0x00}'s\n"
 	.string "{UNKNOWN_F7 0x01} with {UNKNOWN_F7 0x02} and\n"
 	.string "won {UNKNOWN_F7 0x03}!$"
 
 gUnknown_841AF6D:: @ 841AF6D
 	.string "In {UNKNOWN_F7 0x00}, took on\n"
-	.string "{UNKNOWN_F7 0x01}’s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n"
+	.string "{UNKNOWN_F7 0x01}'s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n"
 	.string "and won {UNKNOWN_F7 0x04}!$"
 
 gUnknown_841AF98:: @ 841AF98
@@ -403,7 +403,7 @@ gUnknown_841B0FF:: @ 841B0FF
 	.string "BIKE SHOP$"
 
 gUnknown_841B109:: @ 841B109
-	.string "BILL’S HOUSE$"
+	.string "BILL'S HOUSE$"
 
 gUnknown_841B116:: @ 841B116
 	.string "DAY CARE$"
@@ -418,7 +418,7 @@ gUnknown_841B141:: @ 841B141
 	.string "S.S. ANNE$"
 
 gUnknown_841B14B:: @ 841B14B
-	.string "DIGLETT’S CAVE$"
+	.string "DIGLETT'S CAVE$"
 
 gUnknown_841B15A:: @ 841B15A
 	.string "ROCK TUNNEL$"
@@ -433,7 +433,7 @@ gUnknown_841B180:: @ 841B180
 	.string "VOLUNTEER HOUSE$"
 
 gUnknown_841B190:: @ 841B190
-	.string "NAME RATER’S HOUSE$"
+	.string "NAME RATER'S HOUSE$"
 
 gUnknown_841B1A3:: @ 841B1A3
 	.string "CELADON DEPT. STORE$"
@@ -454,7 +454,7 @@ gUnknown_841B1F4:: @ 841B1F4
 	.string "SAFARI ZONE$"
 
 gUnknown_841B200:: @ 841B200
-	.string "WARDEN’S HOME$"
+	.string "WARDEN'S HOME$"
 
 gUnknown_841B20E:: @ 841B20E
 	.string "FIGHTING DOJO$"
diff --git a/data/text/species_names.inc b/data/text/species_names.inc
new file mode 100644
index 000000000..04907c86e
--- /dev/null
+++ b/data/text/species_names.inc
@@ -0,0 +1,412 @@
+	.string "??????????$", 11
+	.string "BULBASAUR$", 11
+	.string "IVYSAUR$", 11
+	.string "VENUSAUR$", 11
+	.string "CHARMANDER$", 11
+	.string "CHARMELEON$", 11
+	.string "CHARIZARD$", 11
+	.string "SQUIRTLE$", 11
+	.string "WARTORTLE$", 11
+	.string "BLASTOISE$", 11
+	.string "CATERPIE$", 11
+	.string "METAPOD$", 11
+	.string "BUTTERFREE$", 11
+	.string "WEEDLE$", 11
+	.string "KAKUNA$", 11
+	.string "BEEDRILL$", 11
+	.string "PIDGEY$", 11
+	.string "PIDGEOTTO$", 11
+	.string "PIDGEOT$", 11
+	.string "RATTATA$", 11
+	.string "RATICATE$", 11
+	.string "SPEAROW$", 11
+	.string "FEAROW$", 11
+	.string "EKANS$", 11
+	.string "ARBOK$", 11
+	.string "PIKACHU$", 11
+	.string "RAICHU$", 11
+	.string "SANDSHREW$", 11
+	.string "SANDSLASH$", 11
+	.string "NIDORAN♀$", 11
+	.string "NIDORINA$", 11
+	.string "NIDOQUEEN$", 11
+	.string "NIDORAN♂$", 11
+	.string "NIDORINO$", 11
+	.string "NIDOKING$", 11
+	.string "CLEFAIRY$", 11
+	.string "CLEFABLE$", 11
+	.string "VULPIX$", 11
+	.string "NINETALES$", 11
+	.string "JIGGLYPUFF$", 11
+	.string "WIGGLYTUFF$", 11
+	.string "ZUBAT$", 11
+	.string "GOLBAT$", 11
+	.string "ODDISH$", 11
+	.string "GLOOM$", 11
+	.string "VILEPLUME$", 11
+	.string "PARAS$", 11
+	.string "PARASECT$", 11
+	.string "VENONAT$", 11
+	.string "VENOMOTH$", 11
+	.string "DIGLETT$", 11
+	.string "DUGTRIO$", 11
+	.string "MEOWTH$", 11
+	.string "PERSIAN$", 11
+	.string "PSYDUCK$", 11
+	.string "GOLDUCK$", 11
+	.string "MANKEY$", 11
+	.string "PRIMEAPE$", 11
+	.string "GROWLITHE$", 11
+	.string "ARCANINE$", 11
+	.string "POLIWAG$", 11
+	.string "POLIWHIRL$", 11
+	.string "POLIWRATH$", 11
+	.string "ABRA$", 11
+	.string "KADABRA$", 11
+	.string "ALAKAZAM$", 11
+	.string "MACHOP$", 11
+	.string "MACHOKE$", 11
+	.string "MACHAMP$", 11
+	.string "BELLSPROUT$", 11
+	.string "WEEPINBELL$", 11
+	.string "VICTREEBEL$", 11
+	.string "TENTACOOL$", 11
+	.string "TENTACRUEL$", 11
+	.string "GEODUDE$", 11
+	.string "GRAVELER$", 11
+	.string "GOLEM$", 11
+	.string "PONYTA$", 11
+	.string "RAPIDASH$", 11
+	.string "SLOWPOKE$", 11
+	.string "SLOWBRO$", 11
+	.string "MAGNEMITE$", 11
+	.string "MAGNETON$", 11
+	.string "FARFETCH'D$", 11
+	.string "DODUO$", 11
+	.string "DODRIO$", 11
+	.string "SEEL$", 11
+	.string "DEWGONG$", 11
+	.string "GRIMER$", 11
+	.string "MUK$", 11
+	.string "SHELLDER$", 11
+	.string "CLOYSTER$", 11
+	.string "GASTLY$", 11
+	.string "HAUNTER$", 11
+	.string "GENGAR$", 11
+	.string "ONIX$", 11
+	.string "DROWZEE$", 11
+	.string "HYPNO$", 11
+	.string "KRABBY$", 11
+	.string "KINGLER$", 11
+	.string "VOLTORB$", 11
+	.string "ELECTRODE$", 11
+	.string "EXEGGCUTE$", 11
+	.string "EXEGGUTOR$", 11
+	.string "CUBONE$", 11
+	.string "MAROWAK$", 11
+	.string "HITMONLEE$", 11
+	.string "HITMONCHAN$", 11
+	.string "LICKITUNG$", 11
+	.string "KOFFING$", 11
+	.string "WEEZING$", 11
+	.string "RHYHORN$", 11
+	.string "RHYDON$", 11
+	.string "CHANSEY$", 11
+	.string "TANGELA$", 11
+	.string "KANGASKHAN$", 11
+	.string "HORSEA$", 11
+	.string "SEADRA$", 11
+	.string "GOLDEEN$", 11
+	.string "SEAKING$", 11
+	.string "STARYU$", 11
+	.string "STARMIE$", 11
+	.string "MR. MIME$", 11
+	.string "SCYTHER$", 11
+	.string "JYNX$", 11
+	.string "ELECTABUZZ$", 11
+	.string "MAGMAR$", 11
+	.string "PINSIR$", 11
+	.string "TAUROS$", 11
+	.string "MAGIKARP$", 11
+	.string "GYARADOS$", 11
+	.string "LAPRAS$", 11
+	.string "DITTO$", 11
+	.string "EEVEE$", 11
+	.string "VAPOREON$", 11
+	.string "JOLTEON$", 11
+	.string "FLAREON$", 11
+	.string "PORYGON$", 11
+	.string "OMANYTE$", 11
+	.string "OMASTAR$", 11
+	.string "KABUTO$", 11
+	.string "KABUTOPS$", 11
+	.string "AERODACTYL$", 11
+	.string "SNORLAX$", 11
+	.string "ARTICUNO$", 11
+	.string "ZAPDOS$", 11
+	.string "MOLTRES$", 11
+	.string "DRATINI$", 11
+	.string "DRAGONAIR$", 11
+	.string "DRAGONITE$", 11
+	.string "MEWTWO$", 11
+	.string "MEW$", 11
+	.string "CHIKORITA$", 11
+	.string "BAYLEEF$", 11
+	.string "MEGANIUM$", 11
+	.string "CYNDAQUIL$", 11
+	.string "QUILAVA$", 11
+	.string "TYPHLOSION$", 11
+	.string "TOTODILE$", 11
+	.string "CROCONAW$", 11
+	.string "FERALIGATR$", 11
+	.string "SENTRET$", 11
+	.string "FURRET$", 11
+	.string "HOOTHOOT$", 11
+	.string "NOCTOWL$", 11
+	.string "LEDYBA$", 11
+	.string "LEDIAN$", 11
+	.string "SPINARAK$", 11
+	.string "ARIADOS$", 11
+	.string "CROBAT$", 11
+	.string "CHINCHOU$", 11
+	.string "LANTURN$", 11
+	.string "PICHU$", 11
+	.string "CLEFFA$", 11
+	.string "IGGLYBUFF$", 11
+	.string "TOGEPI$", 11
+	.string "TOGETIC$", 11
+	.string "NATU$", 11
+	.string "XATU$", 11
+	.string "MAREEP$", 11
+	.string "FLAAFFY$", 11
+	.string "AMPHAROS$", 11
+	.string "BELLOSSOM$", 11
+	.string "MARILL$", 11
+	.string "AZUMARILL$", 11
+	.string "SUDOWOODO$", 11
+	.string "POLITOED$", 11
+	.string "HOPPIP$", 11
+	.string "SKIPLOOM$", 11
+	.string "JUMPLUFF$", 11
+	.string "AIPOM$", 11
+	.string "SUNKERN$", 11
+	.string "SUNFLORA$", 11
+	.string "YANMA$", 11
+	.string "WOOPER$", 11
+	.string "QUAGSIRE$", 11
+	.string "ESPEON$", 11
+	.string "UMBREON$", 11
+	.string "MURKROW$", 11
+	.string "SLOWKING$", 11
+	.string "MISDREAVUS$", 11
+	.string "UNOWN$", 11
+	.string "WOBBUFFET$", 11
+	.string "GIRAFARIG$", 11
+	.string "PINECO$", 11
+	.string "FORRETRESS$", 11
+	.string "DUNSPARCE$", 11
+	.string "GLIGAR$", 11
+	.string "STEELIX$", 11
+	.string "SNUBBULL$", 11
+	.string "GRANBULL$", 11
+	.string "QWILFISH$", 11
+	.string "SCIZOR$", 11
+	.string "SHUCKLE$", 11
+	.string "HERACROSS$", 11
+	.string "SNEASEL$", 11
+	.string "TEDDIURSA$", 11
+	.string "URSARING$", 11
+	.string "SLUGMA$", 11
+	.string "MAGCARGO$", 11
+	.string "SWINUB$", 11
+	.string "PILOSWINE$", 11
+	.string "CORSOLA$", 11
+	.string "REMORAID$", 11
+	.string "OCTILLERY$", 11
+	.string "DELIBIRD$", 11
+	.string "MANTINE$", 11
+	.string "SKARMORY$", 11
+	.string "HOUNDOUR$", 11
+	.string "HOUNDOOM$", 11
+	.string "KINGDRA$", 11
+	.string "PHANPY$", 11
+	.string "DONPHAN$", 11
+	.string "PORYGON2$", 11
+	.string "STANTLER$", 11
+	.string "SMEARGLE$", 11
+	.string "TYROGUE$", 11
+	.string "HITMONTOP$", 11
+	.string "SMOOCHUM$", 11
+	.string "ELEKID$", 11
+	.string "MAGBY$", 11
+	.string "MILTANK$", 11
+	.string "BLISSEY$", 11
+	.string "RAIKOU$", 11
+	.string "ENTEI$", 11
+	.string "SUICUNE$", 11
+	.string "LARVITAR$", 11
+	.string "PUPITAR$", 11
+	.string "TYRANITAR$", 11
+	.string "LUGIA$", 11
+	.string "HO-OH$", 11
+	.string "CELEBI$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "?$", 11
+	.string "TREECKO$", 11
+	.string "GROVYLE$", 11
+	.string "SCEPTILE$", 11
+	.string "TORCHIC$", 11
+	.string "COMBUSKEN$", 11
+	.string "BLAZIKEN$", 11
+	.string "MUDKIP$", 11
+	.string "MARSHTOMP$", 11
+	.string "SWAMPERT$", 11
+	.string "POOCHYENA$", 11
+	.string "MIGHTYENA$", 11
+	.string "ZIGZAGOON$", 11
+	.string "LINOONE$", 11
+	.string "WURMPLE$", 11
+	.string "SILCOON$", 11
+	.string "BEAUTIFLY$", 11
+	.string "CASCOON$", 11
+	.string "DUSTOX$", 11
+	.string "LOTAD$", 11
+	.string "LOMBRE$", 11
+	.string "LUDICOLO$", 11
+	.string "SEEDOT$", 11
+	.string "NUZLEAF$", 11
+	.string "SHIFTRY$", 11
+	.string "NINCADA$", 11
+	.string "NINJASK$", 11
+	.string "SHEDINJA$", 11
+	.string "TAILLOW$", 11
+	.string "SWELLOW$", 11
+	.string "SHROOMISH$", 11
+	.string "BRELOOM$", 11
+	.string "SPINDA$", 11
+	.string "WINGULL$", 11
+	.string "PELIPPER$", 11
+	.string "SURSKIT$", 11
+	.string "MASQUERAIN$", 11
+	.string "WAILMER$", 11
+	.string "WAILORD$", 11
+	.string "SKITTY$", 11
+	.string "DELCATTY$", 11
+	.string "KECLEON$", 11
+	.string "BALTOY$", 11
+	.string "CLAYDOL$", 11
+	.string "NOSEPASS$", 11
+	.string "TORKOAL$", 11
+	.string "SABLEYE$", 11
+	.string "BARBOACH$", 11
+	.string "WHISCASH$", 11
+	.string "LUVDISC$", 11
+	.string "CORPHISH$", 11
+	.string "CRAWDAUNT$", 11
+	.string "FEEBAS$", 11
+	.string "MILOTIC$", 11
+	.string "CARVANHA$", 11
+	.string "SHARPEDO$", 11
+	.string "TRAPINCH$", 11
+	.string "VIBRAVA$", 11
+	.string "FLYGON$", 11
+	.string "MAKUHITA$", 11
+	.string "HARIYAMA$", 11
+	.string "ELECTRIKE$", 11
+	.string "MANECTRIC$", 11
+	.string "NUMEL$", 11
+	.string "CAMERUPT$", 11
+	.string "SPHEAL$", 11
+	.string "SEALEO$", 11
+	.string "WALREIN$", 11
+	.string "CACNEA$", 11
+	.string "CACTURNE$", 11
+	.string "SNORUNT$", 11
+	.string "GLALIE$", 11
+	.string "LUNATONE$", 11
+	.string "SOLROCK$", 11
+	.string "AZURILL$", 11
+	.string "SPOINK$", 11
+	.string "GRUMPIG$", 11
+	.string "PLUSLE$", 11
+	.string "MINUN$", 11
+	.string "MAWILE$", 11
+	.string "MEDITITE$", 11
+	.string "MEDICHAM$", 11
+	.string "SWABLU$", 11
+	.string "ALTARIA$", 11
+	.string "WYNAUT$", 11
+	.string "DUSKULL$", 11
+	.string "DUSCLOPS$", 11
+	.string "ROSELIA$", 11
+	.string "SLAKOTH$", 11
+	.string "VIGOROTH$", 11
+	.string "SLAKING$", 11
+	.string "GULPIN$", 11
+	.string "SWALOT$", 11
+	.string "TROPIUS$", 11
+	.string "WHISMUR$", 11
+	.string "LOUDRED$", 11
+	.string "EXPLOUD$", 11
+	.string "CLAMPERL$", 11
+	.string "HUNTAIL$", 11
+	.string "GOREBYSS$", 11
+	.string "ABSOL$", 11
+	.string "SHUPPET$", 11
+	.string "BANETTE$", 11
+	.string "SEVIPER$", 11
+	.string "ZANGOOSE$", 11
+	.string "RELICANTH$", 11
+	.string "ARON$", 11
+	.string "LAIRON$", 11
+	.string "AGGRON$", 11
+	.string "CASTFORM$", 11
+	.string "VOLBEAT$", 11
+	.string "ILLUMISE$", 11
+	.string "LILEEP$", 11
+	.string "CRADILY$", 11
+	.string "ANORITH$", 11
+	.string "ARMALDO$", 11
+	.string "RALTS$", 11
+	.string "KIRLIA$", 11
+	.string "GARDEVOIR$", 11
+	.string "BAGON$", 11
+	.string "SHELGON$", 11
+	.string "SALAMENCE$", 11
+	.string "BELDUM$", 11
+	.string "METANG$", 11
+	.string "METAGROSS$", 11
+	.string "REGIROCK$", 11
+	.string "REGICE$", 11
+	.string "REGISTEEL$", 11
+	.string "KYOGRE$", 11
+	.string "GROUDON$", 11
+	.string "RAYQUAZA$", 11
+	.string "LATIAS$", 11
+	.string "LATIOS$", 11
+	.string "JIRACHI$", 11
+	.string "DEOXYS$", 11
+	.string "CHIMECHO$", 11
diff --git a/data/text/teachy_tv.inc b/data/text/teachy_tv.inc
new file mode 100644
index 000000000..3989aa5d1
--- /dev/null
+++ b/data/text/teachy_tv.inc
@@ -0,0 +1,227 @@
+gTeachyTvString_TeachBattle:: @ 841B7A4
+	.string "Teach me how to battle.$"
+
+gTeachyTvString_StatusProblems:: @ 841B7BC
+	.string "What are status problems?$"
+
+gTeachyTvString_TypeMatchups:: @ 841B7D6
+	.string "What are type matchups?$"
+
+gTeachyTvString_CatchPkmn:: @ 841B7EE
+	.string "I want to catch POKéMON.$"
+
+gTeachyTvString_AboutTMs:: @ 841B807
+	.string "Teach me about TMs.$"
+
+gTeachyTvString_RegisterItem:: @ 841B81B
+	.string "How do I register an item?$"
+
+gTeachyTvString_Cancel:: @ 841B836
+	.string "CANCEL$"
+
+gTeachyTvText_PokeDudeSaysHello:: @ 841B83D
+	.string "Hey, all you TRAINERS out there!\n"
+	.string "HELLO, TRAINERS!\p"
+	.string "……… ……… ………\p"
+	.string "Come on, let me hear you!\n"
+	.string "HELLO, TRAINERS!\l"
+	.string "It's me, the POKé DUDE!\p"
+	.string "$"
+
+gTeachyTvText_BattleScript1:: @ 841B8BF
+	.string "Today, the POKé DUDE's here to\n"
+	.string "tell you about how you can battle\l"
+	.string "POKéMON!\p"
+	.string "Say you're out for a stroll when,\n"
+	.string "suddenly, a wild POKéMON appears!\p"
+	.string "It's up to you to smartly use your\n"
+	.string "POKéMON and their moves to reduce\l"
+	.string "the opponent's HP to nothing, and\l"
+	.string "claim victory!\p"
+	.string "I'll show you how to do that in\n"
+	.string "person and for sure!\p"
+	.string "All righty, here goes!\p"
+	.string "Keep your eyes glued to the super\n"
+	.string "POKé DUDE SHOW!$"
+
+gTeachyTvText_BattleScript2:: @ 841BA41
+	.string "Well, did you get that?\p"
+	.string "Even if your own POKéMON's HP\n"
+	.string "falls to zero, and it becomes\l"
+	.string "unable to battle, not to worry!\p"
+	.string "Just take it to any POKéMON\n"
+	.string "CENTER and heal it!\p"
+	.string "All righty, be seeing you!\p"
+	.string "Remember, TRAINERS, a good deed\n"
+	.string "a day brings happiness to stay!$"
+
+gTeachyTvText_StatusScript1:: @ 841BB40
+	.string "Today, the POKé DUDE's here to\n"
+	.string "tell you about status problems!\p"
+	.string "Status problems include poisoning,\n"
+	.string "paralysis, sleep, burn…\p"
+	.string "There are a couple others, but\n"
+	.string "they really are trouble.\p"
+	.string "Get any one, and your POKéMON\n"
+	.string "may become useless in battle.\p"
+	.string "You know, it hurts the POKé DUDE\n"
+	.string "to see a POKéMON suffer…\p"
+	.string "So, what should you do if your\n"
+	.string "POKéMON gets a status problem?\p"
+	.string "Well, you've got me to show you!\p"
+	.string "All righty, here goes!\p"
+	.string "Keep your eyes glued to the super\n"
+	.string "POKé DUDE SHOW!$"
+
+gTeachyTvText_StatusScript2:: @ 841BD10
+	.string "Poisoning or paralysis don't go\n"
+	.string "away after a battle.\p"
+	.string "If a POKéMON is poisoned, it loses\n"
+	.string "HP even while you're walking.\p"
+	.string "You should heal POKéMON of these\n"
+	.string "kinds of problems right away.\p"
+	.string "Use an item, or try to get to a\n"
+	.string "POKéMON CENTER for healing.\p"
+	.string "That wasn't hard, was it?\n"
+	.string "All righty, be seeing you!\p"
+	.string "Remember, TRAINERS, a good deed\n"
+	.string "a day brings happiness to stay!$"
+
+gTeachyTvText_MatchupsScript1:: @ 841BE76
+	.string "Does everyone know about type\n"
+	.string "matchups?\p"
+	.string "POKéMON and their moves all\n"
+	.string "belong to certain types.\p"
+	.string "For example, there are such types\n"
+	.string "as GRASS and WATER.\p"
+	.string "You need to consider the type of\n"
+	.string "the move used to attack…\p"
+	.string "And, the type of the POKéMON that\n"
+	.string "is hit by that attack.\p"
+	.string "Depending on how those two types\n"
+	.string "match up, the damage can change.\p"
+	.string "You see, it depends on whether\n"
+	.string "the type matchup is good or bad.\p"
+	.string "If you don't know how matchups\n"
+	.string "work, battles will be tough.\p"
+	.string "So, let me demonstrate exactly\n"
+	.string "what I mean.\p"
+	.string "All righty, here goes!\p"
+	.string "Keep your eyes glued to the super\n"
+	.string "POKé DUDE SHOW!$"
+
+gTeachyTvText_MatchupsScript2:: @ 841C0AF
+	.string "Is it possible to launch an attack\n"
+	.string "that will inflict heavy damage?\p"
+	.string "Does the opposing POKéMON pose\n"
+	.string "a threat to your POKéMON?\p"
+	.string "Is there any chance that it may\n"
+	.string "have disastrously tough moves?\p"
+	.string "Watch the type matchups to gain\n"
+	.string "the upper hand!\p"
+	.string "All righty, be seeing you!\p"
+	.string "Oh, for the COOL-type POKé DUDE,\n"
+	.string "AWESOME-type kids like you match\l"
+	.string "up perfectly!\p"
+	.string "Remember, a good deed a day\n"
+	.string "brings happiness to stay!$"
+
+gTeachyTvText_CatchingScript1:: @ 841C23B
+	.string "Today, the POKé DUDE's going to\n"
+	.string "show you how to catch POKéMON!\p"
+	.string "Just imagine… A groovy POKéMON\n"
+	.string "suddenly appearing in the wild!\p"
+	.string "Oh, you want it!\n"
+	.string "You just can't help it!\p"
+	.string "Oh, you have to catch it!\n"
+	.string "You gotta have it!\p"
+	.string "Let me show you how you can make\n"
+	.string "it happen!\p"
+	.string "All righty, here goes!\p"
+	.string "Keep your eyes glued to the super\n"
+	.string "POKé DUDE SHOW!$"
+
+gTeachyTvText_CatchingScript2:: @ 841C384
+	.string "If your first POKé BALL fails to\n"
+	.string "catch the POKéMON, don't give up!\p"
+	.string "Keep throwing POKé BALLS…\n"
+	.string "It's bound to work sometime!\p"
+	.string "All righty, be seeing you!\p"
+	.string "Remember, TRAINERS, a good deed\n"
+	.string "a day brings happiness to stay!$"
+
+gTeachyTvText_TMsScript1:: @ 841C459
+	.string "Hey, everyone!\n"
+	.string "Do you all have TMs?\p"
+	.string "A TM, Technical Machine, is an\n"
+	.string "amazingly great item!\p"
+	.string "It teaches POKéMON a move that\n"
+	.string "it may not learn when leveling up!\p"
+	.string "Isn't that just great? What a\n"
+	.string "convenient world we live in!\p"
+	.string "Open the TM CASE and check out\n"
+	.string "the TMs you have.\p"
+	.string "You can check them out in detail,\n"
+	.string "too.$"
+
+gPokeDudeText_TMTypes:: @ 841C587
+	.string "POKé DUDE: NORMAL, WATER, GRASS…\n"
+	.string "TMs also come in types.\p"
+	.string "Check the type and teach it to\n"
+	.string "a POKéMON that matches up well.\p"
+	.string "For example, WATER PULSE is\n"
+	.string "suitable for WATER-type POKéMON.\p"
+	.string "BULLET SEED is a move that most\n"
+	.string "GRASS-type POKéMON can learn.\p"
+	.string "There's one other thing!$"
+
+gPokeDudeText_ReadTMDescription:: @ 841C693
+	.string "Don't just look at the type, read\n"
+	.string "the description, too.\p"
+	.string "It will contain hints about what\n"
+	.string "POKéMON might learn the move.\p"
+	.string "For example, take a move like\n"
+	.string "FOCUS PUNCH.\p"
+	.string "It doesn't sound like anything a\n"
+	.string "bird or fish POKéMON can learn.\p"
+	.string "So, try using it on POKéMON with\n"
+	.string "arms that can throw punches!$"
+
+gTeachyTvText_TMsScript2:: @ 841C7B4
+	.string "Wow, I talked a lot today!\n"
+	.string "All righty, be seeing you!\p"
+	.string "Remember, TRAINERS, a good deed\n"
+	.string "a day brings happiness to stay!$"
+
+gTeachyTvText_RegisterScript1:: @ 841C82A
+	.string "A TRAINER's BAG has a bunch of\n"
+	.string "nifty, convenient features!\p"
+	.string "Take stuff in the KEY ITEMS\n"
+	.string "POCKET, for instance.\p"
+	.string "You can use a key item without\n"
+	.string "opening the BAG every time.\p"
+	.string "For example, let's pretend I have\n"
+	.string "a TEACHY TV in my BAG.\p"
+	.string "I can register it for instant use,\n"
+	.string "and I'll show you how!\p"
+	.string "All righty, here goes!\p"
+	.string "Keep your eyes glued to the sorta\n"
+	.string "super POKé DUDE SHOW!$"
+
+gTeachyTvText_RegisterScript2:: @ 841C994
+	.string "And now, your TEACHY TV is\n"
+	.string "registered.\p"
+	.string "How do you use it?\n"
+	.string "Well, here's how it works.\p"
+	.string "Once an item in the KEY ITEMS\n"
+	.string "POKCET is registered, you can use\l"
+	.string "it by pressing SELECT.\p"
+	.string "So, you've given yourself\n"
+	.string "one-touch access to TEACHY TV.\p"
+	.string "All it takes for you to see me is\n"
+	.string "pressing one button!\p"
+	.string "That kind of attention is a little\n"
+	.string "embarrassing!\p"
+	.string "All righty, be seeing you!\p"
+	.string "Remember, TRAINERS, a good deed\n"
+	.string "a day brings happiness to stay!$"
diff --git a/data/tileset_anims.s b/data/tileset_anims.s
new file mode 100644
index 000000000..9881cdd3f
--- /dev/null
+++ b/data/tileset_anims.s
@@ -0,0 +1,25 @@
+	.section .rodata
+	.align 2
+gUnknown_83A7660:: @ 83A7660
+	.incbin "baserom.gba", 0x3A7660, 0x2FF4
+
+gUnknown_83AA654:: @ 83AA654
+	.incbin "baserom.gba", 0x3AA654, 0x1220
+
+gUnknown_83AB874:: @ 83AB874
+	.incbin "baserom.gba", 0x3AB874, 0x540
+
+gUnknown_83ABDB4:: @ 83ABDB4
+	.incbin "baserom.gba", 0x3ABDB4, 0x434
+
+gUnknown_83AC1E8:: @ 83AC1E8
+	.incbin "baserom.gba", 0x3AC1E8, 0x410
+
+gUnknown_83AC5F8:: @ 83AC5F8
+	.incbin "baserom.gba", 0x3AC5F8, 0x1D0
+
+gUnknown_83AC7C8:: @ 83AC7C8
+	.incbin "baserom.gba", 0x3AC7C8, 0x188
+
+gUnknown_83AC950:: @ 83AC950
+	.incbin "baserom.gba", 0x3AC950, 0x10
diff --git a/data/tilesets.s b/data/tilesets.s
new file mode 100644
index 000000000..b8b50e652
--- /dev/null
+++ b/data/tilesets.s
@@ -0,0 +1,8 @@
+    .include "asm/macros.inc"
+    .include "constants/constants.inc"
+
+    .section .rodata
+
+    .include "data/tilesets/graphics.inc"
+    .include "data/tilesets/metatiles.inc"
+    .include "data/tilesets/headers.inc"
diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
new file mode 100644
index 000000000..a23f73322
--- /dev/null
+++ b/data/tilesets/graphics.inc
@@ -0,0 +1,1471 @@
+	.align 2
+gTilesetTiles_826D37C:: @ 826D37C
+	.incbin "data/tilesets/secondary/82D4AAC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_826D7C0:: @ 826D7C0
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4AAC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_826D9C0:: @ 826D9C0
+	.incbin "data/tilesets/secondary/82D4AC4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_826DFC0:: @ 826DFC0
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4AC4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_826E1C0:: @ 826E1C0
+	.incbin "data/tilesets/secondary/82D4ADC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_826EAB8:: @ 826EAB8
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4ADC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_826ECB8:: @ 826ECB8
+	.incbin "data/tilesets/secondary/82D4AF4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_826F4B8:: @ 826F4B8
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4AF4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_826F6B8:: @ 826F6B8
+	.incbin "data/tilesets/secondary/82D4B0C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8270438:: @ 8270438
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4B0C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8270638:: @ 8270638
+	.incbin "data/tilesets/secondary/82D4B24/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8270DA0:: @ 8270DA0
+	.incbin "data/tilesets/secondary/82D4B24/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4B24/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8270FA0:: @ 8270FA0
+	.incbin "data/tilesets/secondary/82D4B3C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8271C74:: @ 8271C74
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4B3C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8271E74:: @ 8271E74
+	.incbin "data/tilesets/secondary/82D4B54/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8272A5C:: @ 8272A5C
+	.incbin "data/tilesets/secondary/82D4B54/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4B54/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8272C5C:: @ 8272C5C
+	.incbin "data/tilesets/secondary/82D4B6C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8273358:: @ 8273358
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4B6C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8273558:: @ 8273558
+	.incbin "data/tilesets/secondary/82D4B84/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82742D0:: @ 82742D0
+	.incbin "data/tilesets/secondary/82D4B84/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4B84/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82744D0:: @ 82744D0
+	.incbin "data/tilesets/secondary/82D4B9C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8275094:: @ 8275094
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4B9C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8275294:: @ 8275294
+	.incbin "data/tilesets/primary/82D4BB4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8277694:: @ 8277694
+	.incbin "data/tilesets/primary/82D4BB4/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/82D4BB4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8277894:: @ 8277894
+	.incbin "data/tilesets/secondary/82D4BCC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8277A5C:: @ 8277A5C
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4BCC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8277C5C:: @ 8277C5C
+	.incbin "data/tilesets/secondary/82D4BE4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8278CC4:: @ 8278CC4
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4BE4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8278EC4:: @ 8278EC4
+	.incbin "data/tilesets/secondary/82D4BFC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_827A1A8:: @ 827A1A8
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4BFC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_827A3A8:: @ 827A3A8
+	.incbin "data/tilesets/secondary/82D4C14/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_827A3B8:: @ 827A3B8
+	.incbin "data/tilesets/secondary/82D4C14/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4C14/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_827A5B8:: @ 827A5B8
+	.incbin "data/tilesets/secondary/82D4C2C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_827AE14:: @ 827AE14
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4C2C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_827B014:: @ 827B014
+	.incbin "data/tilesets/secondary/82D4C44/tiles.4bpp"
+
+	.align 2
+gTilesetPalettes_827FF14:: @ 827FF14
+	.incbin "data/tilesets/secondary/82D4C44/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4C44/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8280114:: @ 8280114
+	.incbin "data/tilesets/secondary/82D4C5C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82804EC:: @ 82804EC
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4C5C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82806EC:: @ 82806EC
+	.incbin "data/tilesets/secondary/82D4C8C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8280D00:: @ 8280D00
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4C8C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8280F00:: @ 8280F00
+	.incbin "data/tilesets/secondary/82D4CD4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82823A4:: @ 82823A4
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4CD4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82825A4:: @ 82825A4
+	.incbin "data/tilesets/secondary/82D4CEC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8282FBC:: @ 8282FBC
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4CEC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82831BC:: @ 82831BC
+	.incbin "data/tilesets/secondary/82D4D04/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82839B0:: @ 82839B0
+	.incbin "data/tilesets/secondary/82D4D04/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4D04/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8283BB0:: @ 8283BB0
+	.incbin "data/tilesets/secondary/82D4D1C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8283FF8:: @ 8283FF8
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4D1C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82841F8:: @ 82841F8
+	.incbin "data/tilesets/secondary/82D4D34/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82849B8:: @ 82849B8
+	.incbin "data/tilesets/secondary/82D4D34/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4D34/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8284BB8:: @ 8284BB8
+	.incbin "data/tilesets/secondary/82D4D4C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8285150:: @ 8285150
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4D4C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8285350:: @ 8285350
+	.incbin "data/tilesets/secondary/82D4CA4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82857A4:: @ 82857A4
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4CA4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82859A4:: @ 82859A4
+	.incbin "data/tilesets/secondary/82D4D64/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8285D90:: @ 8285D90
+	.incbin "data/tilesets/secondary/82D4D64/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4D64/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8285F90:: @ 8285F90
+	.incbin "data/tilesets/secondary/82D4D7C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82865D4:: @ 82865D4
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4D7C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82867D4:: @ 82867D4
+	.incbin "data/tilesets/secondary/82D4CBC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8286BC8:: @ 8286BC8
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4CBC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8286DC8:: @ 8286DC8
+	.incbin "data/tilesets/secondary/82D4D94/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8287B80:: @ 8287B80
+	.incbin "data/tilesets/secondary/82D4D94/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4D94/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8287D80:: @ 8287D80
+	.incbin "data/tilesets/secondary/82D4DAC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8287D94:: @ 8287D94
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4DAC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8287F94:: @ 8287F94
+	.incbin "data/tilesets/secondary/82D4DC4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8288444:: @ 8288444
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4DC4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8288644:: @ 8288644
+	.incbin "data/tilesets/secondary/82D4DDC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8288C60:: @ 8288C60
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4DDC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8288E60:: @ 8288E60
+	.incbin "data/tilesets/secondary/82D4DF4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8289FC8:: @ 8289FC8
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4DF4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_828A1C8:: @ 828A1C8
+	.incbin "data/tilesets/secondary/82D4E0C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_828B250:: @ 828B250
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4E0C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_828B450:: @ 828B450
+	.incbin "data/tilesets/secondary/82D4E24/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_828CAA0:: @ 828CAA0
+	.incbin "data/tilesets/secondary/82D4E24/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4E24/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_828CCA0:: @ 828CCA0
+	.incbin "data/tilesets/secondary/82D4E3C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_828D2BC:: @ 828D2BC
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4E3C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_828D4BC:: @ 828D4BC
+	.incbin "data/tilesets/secondary/82D4E54/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_828E3A4:: @ 828E3A4
+	.incbin "data/tilesets/secondary/82D4E54/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4E54/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_828E5A4:: @ 828E5A4
+	.incbin "data/tilesets/secondary/82D4E84/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_828EC70:: @ 828EC70
+	.incbin "data/tilesets/secondary/82D4E84/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4E84/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_828EE70:: @ 828EE70
+	.incbin "data/tilesets/secondary/82D4E9C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_828F378:: @ 828F378
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4E9C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_828F578:: @ 828F578
+	.incbin "data/tilesets/secondary/82D4EB4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_828F9D8:: @ 828F9D8
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4EB4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_828FBD8:: @ 828FBD8
+	.incbin "data/tilesets/secondary/82D4F8C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8290DD0:: @ 8290DD0
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4F8C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8290FD0:: @ 8290FD0
+	.incbin "data/tilesets/secondary/82D4EE4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8291274:: @ 8291274
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4EE4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8291474:: @ 8291474
+	.incbin "data/tilesets/secondary/82D4EFC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8291AFC:: @ 8291AFC
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4EFC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8291CFC:: @ 8291CFC
+	.incbin "data/tilesets/secondary/82D4F14/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82920F0:: @ 82920F0
+	.incbin "data/tilesets/secondary/82D4F14/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4F14/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82922F0:: @ 82922F0
+	.incbin "data/tilesets/secondary/82D4F2C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8292FF0:: @ 8292FF0
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4F2C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82931F0:: @ 82931F0
+	.incbin "data/tilesets/secondary/82D4F44/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8293660:: @ 8293660
+	.incbin "data/tilesets/secondary/82D4F44/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4F44/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8293860:: @ 8293860
+	.incbin "data/tilesets/secondary/82D4F5C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8293B0C:: @ 8293B0C
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4F5C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8293D0C:: @ 8293D0C
+	.incbin "data/tilesets/secondary/82D4F74/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8294144:: @ 8294144
+	.incbin "data/tilesets/secondary/82D4F74/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4F74/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8294344:: @ 8294344
+	.incbin "data/tilesets/secondary/82D4FA4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8294D08:: @ 8294D08
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4FA4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8294F08:: @ 8294F08
+	.incbin "data/tilesets/secondary/82D4FBC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8294F18:: @ 8294F18
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4FBC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8295118:: @ 8295118
+	.incbin "data/tilesets/secondary/82D4FD4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_829512C:: @ 829512C
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4FD4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_829532C:: @ 829532C
+	.incbin "data/tilesets/secondary/82D4FEC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82967D4:: @ 82967D4
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D4FEC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82969D4:: @ 82969D4
+	.incbin "data/tilesets/secondary/82D5004/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8296E90:: @ 8296E90
+	.incbin "data/tilesets/secondary/82D5004/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D5004/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8297090:: @ 8297090
+	.incbin "data/tilesets/secondary/82D501C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_82983BC:: @ 82983BC
+	.incbin "data/tilesets/secondary/82D501C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D501C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_82985BC:: @ 82985BC
+	.incbin "data/tilesets/secondary/82D5034/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8298970:: @ 8298970
+	.incbin "data/tilesets/secondary/82D5034/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D5034/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8298B70:: @ 8298B70
+	.incbin "data/tilesets/secondary/82D504C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_8299AA4:: @ 8299AA4
+	.incbin "data/tilesets/secondary/82D504C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D504C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_8299CA4:: @ 8299CA4
+	.incbin "data/tilesets/secondary/82D5064/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_829AB04:: @ 829AB04
+	.incbin "data/tilesets/secondary/82D5064/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D5064/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_829AD04:: @ 829AD04
+	.incbin "data/tilesets/secondary/82D507C/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_829BD64:: @ 829BD64
+	.incbin "data/tilesets/secondary/82D507C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D507C/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_829BF64:: @ 829BF64
+	.incbin "data/tilesets/secondary/82D5094/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_829CEE4:: @ 829CEE4
+	.incbin "data/tilesets/secondary/82D5094/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D5094/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_829D0E4:: @ 829D0E4
+	.incbin "data/tilesets/secondary/82D50AC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_829D894:: @ 829D894
+	.incbin "data/tilesets/secondary/82D50AC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D50AC/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_829DA94:: @ 829DA94
+	.incbin "data/tilesets/secondary/82D50C4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_829EA50:: @ 829EA50
+	.incbin "data/tilesets/secondary/82D50C4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D50C4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_829EC50:: @ 829EC50
+	.incbin "data/tilesets/secondary/82D50DC/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_829F4C8:: @ 829F4C8
+	.incbin "data/tilesets/secondary/82D50DC/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/82D50DC/palettes/15.gbapal"
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
new file mode 100644
index 000000000..d40b3a5e6
--- /dev/null
+++ b/data/tilesets/headers.inc
@@ -0,0 +1,749 @@
+
+	.align 2
+gTileset_82D4A94::
+	.byte TRUE @ is compressed
+	.byte FALSE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8EA1D68
+	.4byte gTilesetPalettes_8EA1B68
+	.4byte gMetatiles_829F6C8
+	.4byte sub_8070154
+	.4byte gMetatileAttributes_82A1EC8
+
+	.align 2
+gTileset_82D4AAC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_826D37C
+	.4byte gTilesetPalettes_826D7C0
+	.4byte gMetatiles_82A28C8
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A2E58
+
+	.align 2
+gTileset_82D4AC4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_826D9C0
+	.4byte gTilesetPalettes_826DFC0
+	.4byte gMetatiles_82A2FBC
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A35AC
+
+	.align 2
+gTileset_82D4ADC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_826E1C0
+	.4byte gTilesetPalettes_826EAB8
+	.4byte gMetatiles_82A3728
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A3C18
+
+	.align 2
+gTileset_82D4AF4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_826ECB8
+	.4byte gTilesetPalettes_826F4B8
+	.4byte gMetatiles_82A3D54
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A45B4
+
+	.align 2
+gTileset_82D4B0C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_826F6B8
+	.4byte gTilesetPalettes_8270438
+	.4byte gMetatiles_82A47CC
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A556C
+
+	.align 2
+gTileset_82D4B24::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8270638
+	.4byte gTilesetPalettes_8270DA0
+	.4byte gMetatiles_82A58D4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A6354
+
+	.align 2
+gTileset_82D4B3C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8270FA0
+	.4byte gTilesetPalettes_8271C74
+	.4byte gMetatiles_82A65F4
+	.4byte sub_80701D8
+	.4byte gMetatileAttributes_82A74F4
+
+	.align 2
+gTileset_82D4B54::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8271E74
+	.4byte gTilesetPalettes_8272A5C
+	.4byte gMetatiles_82A78B4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A84B4
+
+	.align 2
+gTileset_82D4B6C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8272C5C
+	.4byte gTilesetPalettes_8273358
+	.4byte gMetatiles_82A87B4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A8BB4
+
+	.align 2
+gTileset_82D4B84::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8273558
+	.4byte gTilesetPalettes_82742D0
+	.4byte gMetatiles_82A8CB4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82A97B4
+
+	.align 2
+gTileset_82D4B9C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82744D0
+	.4byte gTilesetPalettes_8275094
+	.4byte gMetatiles_82A9A74
+	.4byte 0x0
+	.4byte gMetatileAttributes_82AA6F4
+
+	.align 2
+gTileset_82D4BB4::
+	.byte TRUE @ is compressed
+	.byte FALSE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8275294
+	.4byte gTilesetPalettes_8277694
+	.4byte gMetatiles_82AD7B4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82AFFB4
+
+	.align 2
+gTileset_82D4BCC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8277894
+	.4byte gTilesetPalettes_8277A5C
+	.4byte gMetatiles_82B3524
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B3954
+
+	.align 2
+gTileset_82D4BE4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8277C5C
+	.4byte gTilesetPalettes_8278CC4
+	.4byte gMetatiles_82B3A60
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B4A50
+
+	.align 2
+gTileset_82D4BFC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8278EC4
+	.4byte gTilesetPalettes_827A1A8
+	.4byte gMetatiles_82B502C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B5A3C
+
+	.align 2
+gTileset_82D4C14::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_827A3A8
+	.4byte gTilesetPalettes_827A3B8
+	.4byte gMetatiles_82B09B4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B09D4
+
+	.align 2
+gTileset_82D4C2C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_827A5B8
+	.4byte gTilesetPalettes_827AE14
+	.4byte gMetatiles_82C5738
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C5FA8
+
+	.align 2
+gTileset_82D4C44::
+	.byte FALSE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_827B014
+	.4byte gTilesetPalettes_827FF14
+	.4byte gMetatiles_82C61C4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C71C4
+
+	.align 2
+gTileset_82D4C5C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8280114
+	.4byte gTilesetPalettes_82804EC
+	.4byte gMetatiles_82B31DC
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B347C
+
+	.align 2
+gTileset_82D4C74::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8EA99F4
+	.4byte gTilesetPalettes_8EA97F4
+	.4byte gMetatiles_82B4E4C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B4FCC
+
+	.align 2
+gTileset_82D4C8C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82806EC
+	.4byte gTilesetPalettes_8280D00
+	.4byte gMetatiles_82B68A0
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B7390
+
+	.align 2
+gTileset_82D4CA4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8285350
+	.4byte gTilesetPalettes_82857A4
+	.4byte gMetatiles_82AC364
+	.4byte 0x0
+	.4byte gMetatileAttributes_82AC584
+
+	.align 2
+gTileset_82D4CBC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82867D4
+	.4byte gTilesetPalettes_8286BC8
+	.4byte gMetatiles_82AD124
+	.4byte 0x0
+	.4byte gMetatileAttributes_82AD664
+
+	.align 2
+gTileset_82D4CD4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8280F00
+	.4byte gTilesetPalettes_82823A4
+	.4byte gMetatiles_82B09DC
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B29DC
+
+	.align 2
+gTileset_82D4CEC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82825A4
+	.4byte gTilesetPalettes_8282FBC
+	.4byte gMetatiles_82B5CC0
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B6640
+
+	.align 2
+gTileset_82D4D04::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82831BC
+	.4byte gTilesetPalettes_82839B0
+	.4byte gMetatiles_82AAA14
+	.4byte 0x0
+	.4byte gMetatileAttributes_82AB064
+
+	.align 2
+gTileset_82D4D1C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8283BB0
+	.4byte gTilesetPalettes_8283FF8
+	.4byte gMetatiles_82AB1F8
+	.4byte 0x0
+	.4byte gMetatileAttributes_82AB738
+
+	.align 2
+gTileset_82D4D34::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82841F8
+	.4byte gTilesetPalettes_82849B8
+	.4byte gMetatiles_82AB888
+	.4byte sub_807031C
+	.4byte gMetatileAttributes_82ABD38
+
+	.align 2
+gTileset_82D4D4C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8284BB8
+	.4byte gTilesetPalettes_8285150
+	.4byte gMetatiles_82ABE64
+	.4byte sub_8070380
+	.4byte gMetatileAttributes_82AC264
+
+	.align 2
+gTileset_82D4D64::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82859A4
+	.4byte gTilesetPalettes_8285D90
+	.4byte gMetatiles_82AC60C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82AC8EC
+
+	.align 2
+gTileset_82D4D7C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8285F90
+	.4byte gTilesetPalettes_82865D4
+	.4byte gMetatiles_82AC9A4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82ACFA4
+
+	.align 2
+gTileset_82D4D94::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8286DC8
+	.4byte gTilesetPalettes_8287B80
+	.4byte gMetatiles_82B764C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B8B4C
+
+	.align 2
+gTileset_82D4DAC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8287D80
+	.4byte gTilesetPalettes_8287D94
+	.4byte gMetatiles_82B908C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B90AC
+
+	.align 2
+gTileset_82D4DC4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8287F94
+	.4byte gTilesetPalettes_8288444
+	.4byte gMetatiles_82B90B4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B9364
+
+	.align 2
+gTileset_82D4DDC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8288644
+	.4byte gTilesetPalettes_8288C60
+	.4byte gMetatiles_82B9410
+	.4byte 0x0
+	.4byte gMetatileAttributes_82B9B30
+
+	.align 2
+gTileset_82D4DF4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8288E60
+	.4byte gTilesetPalettes_8289FC8
+	.4byte gMetatiles_82B9CF8
+	.4byte 0x0
+	.4byte gMetatileAttributes_82BA678
+
+	.align 2
+gTileset_82D4E0C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828A1C8
+	.4byte gTilesetPalettes_828B250
+	.4byte gMetatiles_82BA8D8
+	.4byte 0x0
+	.4byte gMetatileAttributes_82BB2A8
+
+	.align 2
+gTileset_82D4E24::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828B450
+	.4byte gTilesetPalettes_828CAA0
+	.4byte gMetatiles_82BB51C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82BC49C
+
+	.align 2
+gTileset_82D4E3C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828CCA0
+	.4byte gTilesetPalettes_828D2BC
+	.4byte gMetatiles_82BC87C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82BCF9C
+
+	.align 2
+gTileset_82D4E54::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828D4BC
+	.4byte gTilesetPalettes_828E3A4
+	.4byte gMetatiles_82BD164
+	.4byte 0x0
+	.4byte gMetatileAttributes_82BD9C4
+
+	.align 2
+gTileset_82D4E6C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8EA9F88
+	.4byte gTilesetPalettes_8EA9D88
+	.4byte gMetatiles_82BDBDC
+	.4byte 0x0
+	.4byte gMetatileAttributes_82BEB3C
+
+	.align 2
+gTileset_82D4E84::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828E5A4
+	.4byte gTilesetPalettes_828EC70
+	.4byte gMetatiles_82BEF14
+	.4byte 0x0
+	.4byte gMetatileAttributes_82BFA94
+
+	.align 2
+gTileset_82D4E9C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828EE70
+	.4byte gTilesetPalettes_828F378
+	.4byte gMetatiles_82BFD74
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C0704
+
+	.align 2
+gTileset_82D4EB4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828F578
+	.4byte gTilesetPalettes_828F9D8
+	.4byte gMetatiles_82C0968
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C0D18
+
+	.align 2
+gTileset_82D4ECC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828FBD8
+	.4byte gTilesetPalettes_8290DD0
+	.4byte gMetatiles_82C0E04
+	.4byte sub_8070250
+	.4byte gMetatileAttributes_82C25A4
+
+	.align 2
+gTileset_82D4EE4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8290FD0
+	.4byte gTilesetPalettes_8291274
+	.4byte gMetatiles_82C2B8C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C300C
+
+	.align 2
+gTileset_82D4EFC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8291474
+	.4byte gTilesetPalettes_8291AFC
+	.4byte gMetatiles_82C312C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C377C
+
+	.align 2
+gTileset_82D4F14::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8291CFC
+	.4byte gTilesetPalettes_82920F0
+	.4byte gMetatiles_82C3910
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C4110
+
+	.align 2
+gTileset_82D4F2C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82922F0
+	.4byte gTilesetPalettes_8292FF0
+	.4byte gMetatiles_82C4310
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C5330
+
+	.align 2
+gTileset_82D4F44::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82931F0
+	.4byte gTilesetPalettes_8293660
+	.4byte gMetatiles_82C75C4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C7C44
+
+	.align 2
+gTileset_82D4F5C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8293860
+	.4byte gTilesetPalettes_8293B0C
+	.4byte gMetatiles_82C7DE4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C80C4
+
+	.align 2
+gTileset_82D4F74::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8293D0C
+	.4byte gTilesetPalettes_8294144
+	.4byte gMetatiles_82C817C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C8C1C
+
+	.align 2
+gTileset_82D4F8C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_828FBD8
+	.4byte gTilesetPalettes_8290DD0
+	.4byte gMetatiles_82C8EC4
+	.4byte 0x0
+	.4byte gMetatileAttributes_82C9C34
+
+	.align 2
+gTileset_82D4FA4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8294344
+	.4byte gTilesetPalettes_8294D08
+	.4byte gMetatiles_82C9F90
+	.4byte 0x0
+	.4byte gMetatileAttributes_82CA320
+
+	.align 2
+gTileset_82D4FBC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8294F08
+	.4byte gTilesetPalettes_8294F18
+	.4byte gMetatiles_82CA404
+	.4byte 0x0
+	.4byte gMetatileAttributes_82CA424
+
+	.align 2
+gTileset_82D4FD4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8295118
+	.4byte gTilesetPalettes_829512C
+	.4byte gMetatiles_82CA42C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82CA44C
+
+	.align 2
+gTileset_82D4FEC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_829532C
+	.4byte gTilesetPalettes_82967D4
+	.4byte gMetatiles_82CA454
+	.4byte sub_80702B4
+	.4byte gMetatileAttributes_82CB274
+
+	.align 2
+gTileset_82D5004::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82969D4
+	.4byte gTilesetPalettes_8296E90
+	.4byte gMetatiles_82CB5FC
+	.4byte 0x0
+	.4byte gMetatileAttributes_82CB89C
+
+	.align 2
+gTileset_82D501C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8297090
+	.4byte gTilesetPalettes_82983BC
+	.4byte gMetatiles_82CB944
+	.4byte 0x0
+	.4byte gMetatileAttributes_82CC704
+
+	.align 2
+gTileset_82D5034::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_82985BC
+	.4byte gTilesetPalettes_8298970
+	.4byte gMetatiles_82CCA74
+	.4byte 0x0
+	.4byte gMetatileAttributes_82CD054
+
+	.align 2
+gTileset_82D504C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8298B70
+	.4byte gTilesetPalettes_8299AA4
+	.4byte gMetatiles_82CD1CC
+	.4byte 0x0
+	.4byte gMetatileAttributes_82CE39C
+
+	.align 2
+gTileset_82D5064::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_8299CA4
+	.4byte gTilesetPalettes_829AB04
+	.4byte gMetatiles_82CE810
+	.4byte 0x0
+	.4byte gMetatileAttributes_82CF190
+
+	.align 2
+gTileset_82D507C::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_829AD04
+	.4byte gTilesetPalettes_829BD64
+	.4byte gMetatiles_82CF3F0
+	.4byte 0x0
+	.4byte gMetatileAttributes_82D02F0
+
+	.align 2
+gTileset_82D5094::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_829BF64
+	.4byte gTilesetPalettes_829CEE4
+	.4byte gMetatiles_82D06B0
+	.4byte 0x0
+	.4byte gMetatileAttributes_82D18B0
+
+	.align 2
+gTileset_82D50AC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_829D0E4
+	.4byte gTilesetPalettes_829D894
+	.4byte gMetatiles_82D1D30
+	.4byte 0x0
+	.4byte gMetatileAttributes_82D2220
+
+	.align 2
+gTileset_82D50C4::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_829DA94
+	.4byte gTilesetPalettes_829EA50
+	.4byte gMetatiles_82D235C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82D3B5C
+
+	.align 2
+gTileset_82D50DC::
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary
+	.2byte 0 @ padding
+	.4byte gTilesetTiles_829EC50
+	.4byte gTilesetPalettes_829F4C8
+	.4byte gMetatiles_82D415C
+	.4byte 0x0
+	.4byte gMetatileAttributes_82D48BC
+
diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc
new file mode 100644
index 000000000..50c849648
--- /dev/null
+++ b/data/tilesets/metatiles.inc
@@ -0,0 +1,543 @@
+	.align 1
+gMetatiles_829F6C8:: @ 829F6C8
+	.incbin "data/tilesets/primary/82D4A94/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A1EC8:: @ 82A1EC8
+	.incbin "data/tilesets/primary/82D4A94/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A28C8:: @ 82A28C8
+	.incbin "data/tilesets/secondary/82D4AAC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A2E58:: @ 82A2E58
+	.incbin "data/tilesets/secondary/82D4AAC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A2FBC:: @ 82A2FBC
+	.incbin "data/tilesets/secondary/82D4AC4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A35AC:: @ 82A35AC
+	.incbin "data/tilesets/secondary/82D4AC4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A3728:: @ 82A3728
+	.incbin "data/tilesets/secondary/82D4ADC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A3C18:: @ 82A3C18
+	.incbin "data/tilesets/secondary/82D4ADC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A3D54:: @ 82A3D54
+	.incbin "data/tilesets/secondary/82D4AF4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A45B4:: @ 82A45B4
+	.incbin "data/tilesets/secondary/82D4AF4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A47CC:: @ 82A47CC
+	.incbin "data/tilesets/secondary/82D4B0C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A556C:: @ 82A556C
+	.incbin "data/tilesets/secondary/82D4B0C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A58D4:: @ 82A58D4
+	.incbin "data/tilesets/secondary/82D4B24/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A6354:: @ 82A6354
+	.incbin "data/tilesets/secondary/82D4B24/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A65F4:: @ 82A65F4
+	.incbin "data/tilesets/secondary/82D4B3C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A74F4:: @ 82A74F4
+	.incbin "data/tilesets/secondary/82D4B3C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A78B4:: @ 82A78B4
+	.incbin "data/tilesets/secondary/82D4B54/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A84B4:: @ 82A84B4
+	.incbin "data/tilesets/secondary/82D4B54/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A87B4:: @ 82A87B4
+	.incbin "data/tilesets/secondary/82D4B6C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A8BB4:: @ 82A8BB4
+	.incbin "data/tilesets/secondary/82D4B6C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A8CB4:: @ 82A8CB4
+	.incbin "data/tilesets/secondary/82D4B84/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82A97B4:: @ 82A97B4
+	.incbin "data/tilesets/secondary/82D4B84/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82A9A74:: @ 82A9A74
+	.incbin "data/tilesets/secondary/82D4B9C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82AA6F4:: @ 82AA6F4
+	.incbin "data/tilesets/secondary/82D4B9C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82AAA14:: @ 82AAA14
+	.incbin "data/tilesets/secondary/82D4D04/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82AB064:: @ 82AB064
+	.incbin "data/tilesets/secondary/82D4D04/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82AB1F8:: @ 82AB1F8
+	.incbin "data/tilesets/secondary/82D4D1C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82AB738:: @ 82AB738
+	.incbin "data/tilesets/secondary/82D4D1C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82AB888:: @ 82AB888
+	.incbin "data/tilesets/secondary/82D4D34/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82ABD38:: @ 82ABD38
+	.incbin "data/tilesets/secondary/82D4D34/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82ABE64:: @ 82ABE64
+	.incbin "data/tilesets/secondary/82D4D4C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82AC264:: @ 82AC264
+	.incbin "data/tilesets/secondary/82D4D4C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82AC364:: @ 82AC364
+	.incbin "data/tilesets/secondary/82D4CA4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82AC584:: @ 82AC584
+	.incbin "data/tilesets/secondary/82D4CA4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82AC60C:: @ 82AC60C
+	.incbin "data/tilesets/secondary/82D4D64/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82AC8EC:: @ 82AC8EC
+	.incbin "data/tilesets/secondary/82D4D64/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82AC9A4:: @ 82AC9A4
+	.incbin "data/tilesets/secondary/82D4D7C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82ACFA4:: @ 82ACFA4
+	.incbin "data/tilesets/secondary/82D4D7C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82AD124:: @ 82AD124
+	.incbin "data/tilesets/secondary/82D4CBC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82AD664:: @ 82AD664
+	.incbin "data/tilesets/secondary/82D4CBC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82AD7B4:: @ 82AD7B4
+	.incbin "data/tilesets/primary/82D4BB4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82AFFB4:: @ 82AFFB4
+	.incbin "data/tilesets/primary/82D4BB4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B09B4:: @ 82B09B4
+	.incbin "data/tilesets/secondary/82D4C14/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B09D4:: @ 82B09D4
+	.incbin "data/tilesets/secondary/82D4C14/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B09DC:: @ 82B09DC
+	.incbin "data/tilesets/secondary/82D4CD4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B29DC:: @ 82B29DC
+	.incbin "data/tilesets/secondary/82D4CD4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B31DC:: @ 82B31DC
+	.incbin "data/tilesets/secondary/82D4C5C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B347C:: @ 82B347C
+	.incbin "data/tilesets/secondary/82D4C5C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B3524:: @ 82B3524
+	.incbin "data/tilesets/secondary/82D4BCC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B3954:: @ 82B3954
+	.incbin "data/tilesets/secondary/82D4BCC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B3A60:: @ 82B3A60
+	.incbin "data/tilesets/secondary/82D4BE4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B4A50:: @ 82B4A50
+	.incbin "data/tilesets/secondary/82D4BE4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B4E4C:: @ 82B4E4C
+	.incbin "data/tilesets/secondary/82D4C74/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B4FCC:: @ 82B4FCC
+	.incbin "data/tilesets/secondary/82D4C74/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B502C:: @ 82B502C
+	.incbin "data/tilesets/secondary/82D4BFC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B5A3C:: @ 82B5A3C
+	.incbin "data/tilesets/secondary/82D4BFC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B5CC0:: @ 82B5CC0
+	.incbin "data/tilesets/secondary/82D4CEC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B6640:: @ 82B6640
+	.incbin "data/tilesets/secondary/82D4CEC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B68A0:: @ 82B68A0
+	.incbin "data/tilesets/secondary/82D4C8C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B7390:: @ 82B7390
+	.incbin "data/tilesets/secondary/82D4C8C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B764C:: @ 82B764C
+	.incbin "data/tilesets/secondary/82D4D94/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B8B4C:: @ 82B8B4C
+	.incbin "data/tilesets/secondary/82D4D94/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B908C:: @ 82B908C
+	.incbin "data/tilesets/secondary/82D4DAC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B90AC:: @ 82B90AC
+	.incbin "data/tilesets/secondary/82D4DAC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B90B4:: @ 82B90B4
+	.incbin "data/tilesets/secondary/82D4DC4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B9364:: @ 82B9364
+	.incbin "data/tilesets/secondary/82D4DC4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B9410:: @ 82B9410
+	.incbin "data/tilesets/secondary/82D4DDC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82B9B30:: @ 82B9B30
+	.incbin "data/tilesets/secondary/82D4DDC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82B9CF8:: @ 82B9CF8
+	.incbin "data/tilesets/secondary/82D4DF4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82BA678:: @ 82BA678
+	.incbin "data/tilesets/secondary/82D4DF4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82BA8D8:: @ 82BA8D8
+	.incbin "data/tilesets/secondary/82D4E0C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82BB2A8:: @ 82BB2A8
+	.incbin "data/tilesets/secondary/82D4E0C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82BB51C:: @ 82BB51C
+	.incbin "data/tilesets/secondary/82D4E24/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82BC49C:: @ 82BC49C
+	.incbin "data/tilesets/secondary/82D4E24/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82BC87C:: @ 82BC87C
+	.incbin "data/tilesets/secondary/82D4E3C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82BCF9C:: @ 82BCF9C
+	.incbin "data/tilesets/secondary/82D4E3C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82BD164:: @ 82BD164
+	.incbin "data/tilesets/secondary/82D4E54/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82BD9C4:: @ 82BD9C4
+	.incbin "data/tilesets/secondary/82D4E54/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82BDBDC:: @ 82BDBDC
+	.incbin "data/tilesets/secondary/82D4E6C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82BEB3C:: @ 82BEB3C
+	.incbin "data/tilesets/secondary/82D4E6C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82BEF14:: @ 82BEF14
+	.incbin "data/tilesets/secondary/82D4E84/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82BFA94:: @ 82BFA94
+	.incbin "data/tilesets/secondary/82D4E84/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82BFD74:: @ 82BFD74
+	.incbin "data/tilesets/secondary/82D4E9C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C0704:: @ 82C0704
+	.incbin "data/tilesets/secondary/82D4E9C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C0968:: @ 82C0968
+	.incbin "data/tilesets/secondary/82D4EB4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C0D18:: @ 82C0D18
+	.incbin "data/tilesets/secondary/82D4EB4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C0E04:: @ 82C0E04
+	.incbin "data/tilesets/secondary/82D4ECC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C25A4:: @ 82C25A4
+	.incbin "data/tilesets/secondary/82D4ECC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C2B8C:: @ 82C2B8C
+	.incbin "data/tilesets/secondary/82D4EE4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C300C:: @ 82C300C
+	.incbin "data/tilesets/secondary/82D4EE4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C312C:: @ 82C312C
+	.incbin "data/tilesets/secondary/82D4EFC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C377C:: @ 82C377C
+	.incbin "data/tilesets/secondary/82D4EFC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C3910:: @ 82C3910
+	.incbin "data/tilesets/secondary/82D4F14/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C4110:: @ 82C4110
+	.incbin "data/tilesets/secondary/82D4F14/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C4310:: @ 82C4310
+	.incbin "data/tilesets/secondary/82D4F2C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C5330:: @ 82C5330
+	.incbin "data/tilesets/secondary/82D4F2C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C5738:: @ 82C5738
+	.incbin "data/tilesets/secondary/82D4C2C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C5FA8:: @ 82C5FA8
+	.incbin "data/tilesets/secondary/82D4C2C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C61C4:: @ 82C61C4
+	.incbin "data/tilesets/secondary/82D4C44/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C71C4:: @ 82C71C4
+	.incbin "data/tilesets/secondary/82D4C44/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C75C4:: @ 82C75C4
+	.incbin "data/tilesets/secondary/82D4F44/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C7C44:: @ 82C7C44
+	.incbin "data/tilesets/secondary/82D4F44/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C7DE4:: @ 82C7DE4
+	.incbin "data/tilesets/secondary/82D4F5C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C80C4:: @ 82C80C4
+	.incbin "data/tilesets/secondary/82D4F5C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C817C:: @ 82C817C
+	.incbin "data/tilesets/secondary/82D4F74/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C8C1C:: @ 82C8C1C
+	.incbin "data/tilesets/secondary/82D4F74/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C8EC4:: @ 82C8EC4
+	.incbin "data/tilesets/secondary/82D4F8C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82C9C34:: @ 82C9C34
+	.incbin "data/tilesets/secondary/82D4F8C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82C9F90:: @ 82C9F90
+	.incbin "data/tilesets/secondary/82D4FA4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CA320:: @ 82CA320
+	.incbin "data/tilesets/secondary/82D4FA4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CA404:: @ 82CA404
+	.incbin "data/tilesets/secondary/82D4FBC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CA424:: @ 82CA424
+	.incbin "data/tilesets/secondary/82D4FBC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CA42C:: @ 82CA42C
+	.incbin "data/tilesets/secondary/82D4FD4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CA44C:: @ 82CA44C
+	.incbin "data/tilesets/secondary/82D4FD4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CA454:: @ 82CA454
+	.incbin "data/tilesets/secondary/82D4FEC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CB274:: @ 82CB274
+	.incbin "data/tilesets/secondary/82D4FEC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CB5FC:: @ 82CB5FC
+	.incbin "data/tilesets/secondary/82D5004/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CB89C:: @ 82CB89C
+	.incbin "data/tilesets/secondary/82D5004/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CB944:: @ 82CB944
+	.incbin "data/tilesets/secondary/82D501C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CC704:: @ 82CC704
+	.incbin "data/tilesets/secondary/82D501C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CCA74:: @ 82CCA74
+	.incbin "data/tilesets/secondary/82D5034/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CD054:: @ 82CD054
+	.incbin "data/tilesets/secondary/82D5034/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CD1CC:: @ 82CD1CC
+	.incbin "data/tilesets/secondary/82D504C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CE39C:: @ 82CE39C
+	.incbin "data/tilesets/secondary/82D504C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CE810:: @ 82CE810
+	.incbin "data/tilesets/secondary/82D5064/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82CF190:: @ 82CF190
+	.incbin "data/tilesets/secondary/82D5064/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82CF3F0:: @ 82CF3F0
+	.incbin "data/tilesets/secondary/82D507C/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82D02F0:: @ 82D02F0
+	.incbin "data/tilesets/secondary/82D507C/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82D06B0:: @ 82D06B0
+	.incbin "data/tilesets/secondary/82D5094/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82D18B0:: @ 82D18B0
+	.incbin "data/tilesets/secondary/82D5094/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82D1D30:: @ 82D1D30
+	.incbin "data/tilesets/secondary/82D50AC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82D2220:: @ 82D2220
+	.incbin "data/tilesets/secondary/82D50AC/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82D235C:: @ 82D235C
+	.incbin "data/tilesets/secondary/82D50C4/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82D3B5C:: @ 82D3B5C
+	.incbin "data/tilesets/secondary/82D50C4/metatile_attributes.bin"
+
+	.align 1
+gMetatiles_82D415C:: @ 82D415C
+	.incbin "data/tilesets/secondary/82D50DC/metatiles.bin"
+
+	.align 1
+gMetatileAttributes_82D48BC:: @ 82D48BC
+	.incbin "data/tilesets/secondary/82D50DC/metatile_attributes.bin"
diff --git a/data/tilesets/primary/82D4A94/metatile_attributes.bin b/data/tilesets/primary/82D4A94/metatile_attributes.bin
new file mode 100644
index 000000000..45f6f352e
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/metatile_attributes.bin
diff --git a/data/tilesets/primary/82D4A94/metatiles.bin b/data/tilesets/primary/82D4A94/metatiles.bin
new file mode 100644
index 000000000..7a228eeae
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/metatiles.bin
diff --git a/data/tilesets/primary/82D4A94/palettes/0.pal b/data/tilesets/primary/82D4A94/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/primary/82D4A94/palettes/1.pal b/data/tilesets/primary/82D4A94/palettes/1.pal
new file mode 100644
index 000000000..09828f4f1
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+123 123 131
+32 49 57
+230 238 238
+90 189 139
+90 90 115
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+123 74 74
+90 57 65
+115 205 164
diff --git a/data/tilesets/primary/82D4A94/palettes/10.pal b/data/tilesets/primary/82D4A94/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/palettes/11.pal b/data/tilesets/primary/82D4A94/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/palettes/12.pal b/data/tilesets/primary/82D4A94/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/palettes/13.pal b/data/tilesets/primary/82D4A94/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/palettes/14.pal b/data/tilesets/primary/82D4A94/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/palettes/15.pal b/data/tilesets/primary/82D4A94/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/palettes/2.pal b/data/tilesets/primary/82D4A94/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/primary/82D4A94/palettes/3.pal b/data/tilesets/primary/82D4A94/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/primary/82D4A94/palettes/4.pal b/data/tilesets/primary/82D4A94/palettes/4.pal
new file mode 100644
index 000000000..9b094a6aa
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 0
+230 246 255
+189 222 255
+139 164 255
+106 164 230
+74 148 222
+74 123 222
+82 156 230
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 197
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/primary/82D4A94/palettes/5.pal b/data/tilesets/primary/82D4A94/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/primary/82D4A94/palettes/6.pal b/data/tilesets/primary/82D4A94/palettes/6.pal
new file mode 100644
index 000000000..cdf41b298
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 0
+205 230 246
+180 213 255
+123 156 238
+98 139 213
+65 123 189
+49 98 180
+82 123 205
+238 246 246
+205 222 238
+49 115 197
+139 189 255
+115 164 255
+65 139 222
+57 115 222
+82 148 230
diff --git a/data/tilesets/primary/82D4A94/palettes/7.pal b/data/tilesets/primary/82D4A94/palettes/7.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/palettes/8.pal b/data/tilesets/primary/82D4A94/palettes/8.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/palettes/9.pal b/data/tilesets/primary/82D4A94/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4A94/tiles.png b/data/tilesets/primary/82D4A94/tiles.png
new file mode 100644
index 000000000..84ba7b2f9
--- /dev/null
+++ b/data/tilesets/primary/82D4A94/tiles.png
diff --git a/data/tilesets/primary/82D4BB4/metatile_attributes.bin b/data/tilesets/primary/82D4BB4/metatile_attributes.bin
new file mode 100644
index 000000000..3dbc31883
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/metatile_attributes.bin
diff --git a/data/tilesets/primary/82D4BB4/metatiles.bin b/data/tilesets/primary/82D4BB4/metatiles.bin
new file mode 100644
index 000000000..024797c8e
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/metatiles.bin
diff --git a/data/tilesets/primary/82D4BB4/palettes/0.pal b/data/tilesets/primary/82D4BB4/palettes/0.pal
new file mode 100644
index 000000000..3b6416376
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+156 213 255
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/primary/82D4BB4/palettes/1.pal b/data/tilesets/primary/82D4BB4/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/primary/82D4BB4/palettes/10.pal b/data/tilesets/primary/82D4BB4/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/palettes/11.pal b/data/tilesets/primary/82D4BB4/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/palettes/12.pal b/data/tilesets/primary/82D4BB4/palettes/12.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/palettes/13.pal b/data/tilesets/primary/82D4BB4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/palettes/14.pal b/data/tilesets/primary/82D4BB4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/palettes/15.pal b/data/tilesets/primary/82D4BB4/palettes/15.pal
new file mode 100644
index 000000000..92e7ed309
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/palettes/2.pal b/data/tilesets/primary/82D4BB4/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/primary/82D4BB4/palettes/3.pal b/data/tilesets/primary/82D4BB4/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/primary/82D4BB4/palettes/4.pal b/data/tilesets/primary/82D4BB4/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/primary/82D4BB4/palettes/5.pal b/data/tilesets/primary/82D4BB4/palettes/5.pal
new file mode 100644
index 000000000..c7780e5c7
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+255 0 255
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+197 197 205
+205 82 65
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/palettes/6.pal b/data/tilesets/primary/82D4BB4/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/palettes/7.pal b/data/tilesets/primary/82D4BB4/palettes/7.pal
new file mode 100644
index 000000000..c1e7c3d5c
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
diff --git a/data/tilesets/primary/82D4BB4/palettes/8.pal b/data/tilesets/primary/82D4BB4/palettes/8.pal
new file mode 100644
index 000000000..c1e7c3d5c
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
diff --git a/data/tilesets/primary/82D4BB4/palettes/9.pal b/data/tilesets/primary/82D4BB4/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/primary/82D4BB4/tiles.png b/data/tilesets/primary/82D4BB4/tiles.png
new file mode 100644
index 000000000..8d864f27e
--- /dev/null
+++ b/data/tilesets/primary/82D4BB4/tiles.png
diff --git a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin b/data/tilesets/secondary/82D4AAC/metatile_attributes.bin
new file mode 100644
index 000000000..2ba2894bc
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AAC/metatiles.bin b/data/tilesets/secondary/82D4AAC/metatiles.bin
new file mode 100644
index 000000000..41db27015
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AAC/palettes/0.pal b/data/tilesets/secondary/82D4AAC/palettes/0.pal
new file mode 100644
index 000000000..42246e9ea
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 139 49
+57 82 0
+115 98 98
+65 57 49
+255 255 255
+139 213 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 189 139
+24 172 106
diff --git a/data/tilesets/secondary/82D4AAC/palettes/1.pal b/data/tilesets/secondary/82D4AAC/palettes/1.pal
new file mode 100644
index 000000000..28db536cb
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+238 238 238
+222 222 230
+172 189 205
+131 131 139
+65 49 65
+139 230 189
+74 205 131
+65 172 115
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D4AAC/palettes/10.pal b/data/tilesets/secondary/82D4AAC/palettes/10.pal
new file mode 100644
index 000000000..1958eff11
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 205 148
+246 246 255
+189 197 222
+156 172 189
+123 123 131
+90 90 115
+65 74 106
+156 205 246
+98 156 238
+98 156 238
+205 139 148
+189 123 131
+164 90 106
+139 65 82
+32 172 98
diff --git a/data/tilesets/secondary/82D4AAC/palettes/11.pal b/data/tilesets/secondary/82D4AAC/palettes/11.pal
new file mode 100644
index 000000000..896c79281
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+238 255 255
+156 230 197
+148 222 189
+139 213 189
+255 0 255
+255 0 255
+255 0 255
+189 238 213
+115 205 164
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4AAC/palettes/12.pal b/data/tilesets/secondary/82D4AAC/palettes/12.pal
new file mode 100644
index 000000000..2bfc45b6d
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+156 230 197
+148 222 189
+139 213 189
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+189 238 213
diff --git a/data/tilesets/secondary/82D4AAC/palettes/13.pal b/data/tilesets/secondary/82D4AAC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AAC/palettes/14.pal b/data/tilesets/secondary/82D4AAC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AAC/palettes/15.pal b/data/tilesets/secondary/82D4AAC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AAC/palettes/2.pal b/data/tilesets/secondary/82D4AAC/palettes/2.pal
new file mode 100644
index 000000000..937cec4da
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+115 82 74
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+197 172 139
diff --git a/data/tilesets/secondary/82D4AAC/palettes/3.pal b/data/tilesets/secondary/82D4AAC/palettes/3.pal
new file mode 100644
index 000000000..6d1dfb5af
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 238 246
+189 139 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+172 32 41
diff --git a/data/tilesets/secondary/82D4AAC/palettes/4.pal b/data/tilesets/secondary/82D4AAC/palettes/4.pal
new file mode 100644
index 000000000..cde020d4e
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 230 238
+230 213 164
+205 197 148
+222 180 164
+156 164 189
+82 106 213
+65 90 189
+57 82 156
+41 65 139
+172 197 230
+139 164 222
+106 131 213
+82 106 213
+189 148 139
diff --git a/data/tilesets/secondary/82D4AAC/palettes/5.pal b/data/tilesets/secondary/82D4AAC/palettes/5.pal
new file mode 100644
index 000000000..bdcc7b8ed
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+238 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 172
+246 238 205
+222 205 131
+255 0 255
+65 189 139
+115 205 164
diff --git a/data/tilesets/secondary/82D4AAC/palettes/6.pal b/data/tilesets/secondary/82D4AAC/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AAC/palettes/7.pal b/data/tilesets/secondary/82D4AAC/palettes/7.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AAC/palettes/8.pal b/data/tilesets/secondary/82D4AAC/palettes/8.pal
new file mode 100644
index 000000000..dcecb9c40
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+246 246 255
+222 230 246
+189 197 222
+156 172 189
+123 123 131
+90 90 115
+65 74 106
+156 205 246
+98 156 238
+57 123 222
+255 205 180
+246 164 131
+222 139 106
+189 98 74
+123 205 164
diff --git a/data/tilesets/secondary/82D4AAC/palettes/9.pal b/data/tilesets/secondary/82D4AAC/palettes/9.pal
new file mode 100644
index 000000000..90bb77517
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+246 246 255
+222 230 246
+189 197 222
+156 172 189
+123 123 131
+90 90 115
+65 74 106
+156 205 246
+98 156 238
+57 123 222
+246 238 197
+230 222 148
+213 189 106
+197 148 74
+222 205 123
diff --git a/data/tilesets/secondary/82D4AAC/tiles.png b/data/tilesets/secondary/82D4AAC/tiles.png
new file mode 100644
index 000000000..771eed906
--- /dev/null
+++ b/data/tilesets/secondary/82D4AAC/tiles.png
diff --git a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin b/data/tilesets/secondary/82D4AC4/metatile_attributes.bin
new file mode 100644
index 000000000..ee2d7d5b3
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AC4/metatiles.bin b/data/tilesets/secondary/82D4AC4/metatiles.bin
new file mode 100644
index 000000000..297673a4b
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AC4/palettes/0.pal b/data/tilesets/secondary/82D4AC4/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4AC4/palettes/1.pal b/data/tilesets/secondary/82D4AC4/palettes/1.pal
new file mode 100644
index 000000000..cf1123812
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4AC4/palettes/10.pal b/data/tilesets/secondary/82D4AC4/palettes/10.pal
new file mode 100644
index 000000000..4baf904ae
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+65 65 82
+74 74 90
+123 123 131
+106 139 205
+172 213 230
+115 98 65
+148 123 65
+238 172 65
+230 213 74
+65 123 123
+65 156 131
+65 205 156
+74 123 65
+90 172 74
+123 213 98
+172 238 106
diff --git a/data/tilesets/secondary/82D4AC4/palettes/11.pal b/data/tilesets/secondary/82D4AC4/palettes/11.pal
new file mode 100644
index 000000000..2e92b3cc3
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+246 246 205
+213 213 213
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+246 230 131
+222 205 65
+172 238 106
+123 213 98
+106 197 82
+90 172 74
+74 123 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4AC4/palettes/12.pal b/data/tilesets/secondary/82D4AC4/palettes/12.pal
new file mode 100644
index 000000000..70ed40322
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+213 230 197
+156 172 139
+123 123 131
+90 90 115
+65 74 106
+222 172 65
+180 98 0
+131 65 0
+205 205 123
+164 164 57
+115 189 246
+74 148 213
+49 115 180
+189 197 164
diff --git a/data/tilesets/secondary/82D4AC4/palettes/13.pal b/data/tilesets/secondary/82D4AC4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AC4/palettes/14.pal b/data/tilesets/secondary/82D4AC4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AC4/palettes/15.pal b/data/tilesets/secondary/82D4AC4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AC4/palettes/2.pal b/data/tilesets/secondary/82D4AC4/palettes/2.pal
new file mode 100644
index 000000000..372fb5d7c
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4AC4/palettes/3.pal b/data/tilesets/secondary/82D4AC4/palettes/3.pal
new file mode 100644
index 000000000..5a5e60211
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4AC4/palettes/4.pal b/data/tilesets/secondary/82D4AC4/palettes/4.pal
new file mode 100644
index 000000000..229f9132c
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 230 255
+197 213 255
+164 197 238
+123 172 230
+90 148 197
+65 123 180
+90 164 205
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+32 98 139
+238 230 139
+222 197 139
+205 180 106
diff --git a/data/tilesets/secondary/82D4AC4/palettes/5.pal b/data/tilesets/secondary/82D4AC4/palettes/5.pal
new file mode 100644
index 000000000..215dd1272
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4AC4/palettes/6.pal b/data/tilesets/secondary/82D4AC4/palettes/6.pal
new file mode 100644
index 000000000..7e7862a19
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 230 255
+197 213 255
+164 197 238
+123 172 230
+41 82 164
+41 57 131
+74 123 197
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+32 98 139
+238 230 139
+222 197 139
+205 180 106
diff --git a/data/tilesets/secondary/82D4AC4/palettes/7.pal b/data/tilesets/secondary/82D4AC4/palettes/7.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4AC4/palettes/8.pal b/data/tilesets/secondary/82D4AC4/palettes/8.pal
new file mode 100644
index 000000000..219129eba
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+65 65 82
+74 74 90
+123 123 131
+106 139 205
+115 197 238
+164 230 238
+131 115 57
+180 172 65
+222 205 65
+246 246 205
+213 205 205
+90 90 115
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4AC4/palettes/9.pal b/data/tilesets/secondary/82D4AC4/palettes/9.pal
new file mode 100644
index 000000000..0aa2b58dc
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 205 65
+222 172 65
+180 98 0
+213 213 139
+189 189 115
+148 148 82
+255 0 255
+115 205 164
diff --git a/data/tilesets/secondary/82D4AC4/tiles.png b/data/tilesets/secondary/82D4AC4/tiles.png
new file mode 100644
index 000000000..39b80d8f9
--- /dev/null
+++ b/data/tilesets/secondary/82D4AC4/tiles.png
diff --git a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin b/data/tilesets/secondary/82D4ADC/metatile_attributes.bin
new file mode 100644
index 000000000..4e19ca185
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ADC/metatiles.bin b/data/tilesets/secondary/82D4ADC/metatiles.bin
new file mode 100644
index 000000000..a23224773
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4ADC/palettes/0.pal b/data/tilesets/secondary/82D4ADC/palettes/0.pal
new file mode 100644
index 000000000..620015e77
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 139 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4ADC/palettes/1.pal b/data/tilesets/secondary/82D4ADC/palettes/1.pal
new file mode 100644
index 000000000..60de8c7ad
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+255 0 255
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D4ADC/palettes/10.pal b/data/tilesets/secondary/82D4ADC/palettes/10.pal
new file mode 100644
index 000000000..76fda8006
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+230 238 255
+180 197 213
+131 148 164
+123 123 131
+90 90 115
+57 65 98
+255 246 238
+213 197 189
+172 156 148
+131 123 115
+246 213 246
+238 189 213
+197 115 180
+172 106 131
diff --git a/data/tilesets/secondary/82D4ADC/palettes/11.pal b/data/tilesets/secondary/82D4ADC/palettes/11.pal
new file mode 100644
index 000000000..3f8fdc519
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+123 123 131
+230 238 255
+197 205 222
+164 180 197
+156 205 246
+98 156 238
+57 65 98
+255 246 238
+213 197 189
+172 156 148
+131 123 115
+57 123 222
+238 238 246
+213 222 222
+197 197 213
diff --git a/data/tilesets/secondary/82D4ADC/palettes/12.pal b/data/tilesets/secondary/82D4ADC/palettes/12.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4ADC/palettes/13.pal b/data/tilesets/secondary/82D4ADC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4ADC/palettes/14.pal b/data/tilesets/secondary/82D4ADC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4ADC/palettes/15.pal b/data/tilesets/secondary/82D4ADC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4ADC/palettes/2.pal b/data/tilesets/secondary/82D4ADC/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4ADC/palettes/3.pal b/data/tilesets/secondary/82D4ADC/palettes/3.pal
new file mode 100644
index 000000000..9581f2cd8
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 131
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4ADC/palettes/4.pal b/data/tilesets/secondary/82D4ADC/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4ADC/palettes/5.pal b/data/tilesets/secondary/82D4ADC/palettes/5.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4ADC/palettes/6.pal b/data/tilesets/secondary/82D4ADC/palettes/6.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4ADC/palettes/7.pal b/data/tilesets/secondary/82D4ADC/palettes/7.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4ADC/palettes/8.pal b/data/tilesets/secondary/82D4ADC/palettes/8.pal
new file mode 100644
index 000000000..d404706ab
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+246 246 255
+230 238 255
+197 205 222
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 205 246
+98 156 238
+57 123 222
+222 106 98
+205 82 74
+222 230 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4ADC/palettes/9.pal b/data/tilesets/secondary/82D4ADC/palettes/9.pal
new file mode 100644
index 000000000..cacf892a6
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 205 246
+98 156 238
+57 123 222
+222 197 139
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4ADC/tiles.png b/data/tilesets/secondary/82D4ADC/tiles.png
new file mode 100644
index 000000000..d3148ba5a
--- /dev/null
+++ b/data/tilesets/secondary/82D4ADC/tiles.png
diff --git a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin b/data/tilesets/secondary/82D4AF4/metatile_attributes.bin
new file mode 100644
index 000000000..7de4de077
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AF4/metatiles.bin b/data/tilesets/secondary/82D4AF4/metatiles.bin
new file mode 100644
index 000000000..b810e7996
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AF4/palettes/0.pal b/data/tilesets/secondary/82D4AF4/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4AF4/palettes/1.pal b/data/tilesets/secondary/82D4AF4/palettes/1.pal
new file mode 100644
index 000000000..31a636983
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4AF4/palettes/10.pal b/data/tilesets/secondary/82D4AF4/palettes/10.pal
new file mode 100644
index 000000000..536972f8f
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+255 238 197
+222 205 172
+180 164 123
+123 123 131
+90 90 115
+65 74 106
+123 180 222
+180 222 255
+255 213 164
+230 189 82
+213 164 57
+205 139 32
+172 90 16
+115 205 164
diff --git a/data/tilesets/secondary/82D4AF4/palettes/11.pal b/data/tilesets/secondary/82D4AF4/palettes/11.pal
new file mode 100644
index 000000000..986335b74
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+255 238 197
+222 205 172
+180 164 123
+123 123 131
+90 90 115
+65 74 106
+230 222 131
+189 180 82
+180 230 172
+139 213 131
+106 180 106
+90 164 90
+57 131 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4AF4/palettes/12.pal b/data/tilesets/secondary/82D4AF4/palettes/12.pal
new file mode 100644
index 000000000..c44bc32b5
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+238 222 180
+205 189 156
+180 164 123
+123 123 131
+90 90 115
+65 74 106
+139 197 98
+106 164 65
+172 222 238
+148 197 213
+115 164 189
+90 139 164
+74 123 148
+115 205 164
diff --git a/data/tilesets/secondary/82D4AF4/palettes/13.pal b/data/tilesets/secondary/82D4AF4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AF4/palettes/14.pal b/data/tilesets/secondary/82D4AF4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AF4/palettes/15.pal b/data/tilesets/secondary/82D4AF4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4AF4/palettes/2.pal b/data/tilesets/secondary/82D4AF4/palettes/2.pal
new file mode 100644
index 000000000..372fb5d7c
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4AF4/palettes/3.pal b/data/tilesets/secondary/82D4AF4/palettes/3.pal
new file mode 100644
index 000000000..973765509
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4AF4/palettes/4.pal b/data/tilesets/secondary/82D4AF4/palettes/4.pal
new file mode 100644
index 000000000..91fdcabdf
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+213 238 255
+172 205 255
+139 180 238
+106 156 230
+74 139 189
+65 123 189
+82 139 205
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 172
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D4AF4/palettes/5.pal b/data/tilesets/secondary/82D4AF4/palettes/5.pal
new file mode 100644
index 000000000..0edb843f5
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4AF4/palettes/6.pal b/data/tilesets/secondary/82D4AF4/palettes/6.pal
new file mode 100644
index 000000000..f8ebbc6dc
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+213 238 255
+172 205 255
+139 180 238
+106 156 230
+65 123 172
+41 98 156
+74 115 197
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 172
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D4AF4/palettes/7.pal b/data/tilesets/secondary/82D4AF4/palettes/7.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4AF4/palettes/8.pal b/data/tilesets/secondary/82D4AF4/palettes/8.pal
new file mode 100644
index 000000000..ae3dd3f0d
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+90 139 164
+115 164 189
+139 189 213
+172 222 238
+139 197 98
+156 222 106
+189 230 139
+222 205 172
+246 230 189
+255 246 213
+164 164 180
+82 82 106
+123 123 139
+205 205 222
+255 255 255
diff --git a/data/tilesets/secondary/82D4AF4/palettes/9.pal b/data/tilesets/secondary/82D4AF4/palettes/9.pal
new file mode 100644
index 000000000..3ed18e08f
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+180 106 90
+222 180 65
+238 164 156
+246 238 131
+230 205 98
+205 131 123
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+164 164 180
+82 82 106
+123 123 139
+205 205 222
+255 255 255
diff --git a/data/tilesets/secondary/82D4AF4/tiles.png b/data/tilesets/secondary/82D4AF4/tiles.png
new file mode 100644
index 000000000..737d3dd7f
--- /dev/null
+++ b/data/tilesets/secondary/82D4AF4/tiles.png
diff --git a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin b/data/tilesets/secondary/82D4B0C/metatile_attributes.bin
new file mode 100644
index 000000000..d103d7155
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B0C/metatiles.bin b/data/tilesets/secondary/82D4B0C/metatiles.bin
new file mode 100644
index 000000000..f69885645
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B0C/palettes/0.pal b/data/tilesets/secondary/82D4B0C/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4B0C/palettes/1.pal b/data/tilesets/secondary/82D4B0C/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4B0C/palettes/10.pal b/data/tilesets/secondary/82D4B0C/palettes/10.pal
new file mode 100644
index 000000000..b97e9df4b
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+213 230 222
+148 164 180
+123 123 131
+90 90 115
+82 82 106
+213 238 255
+164 189 222
+123 148 180
+255 238 139
+222 180 65
+255 255 189
+164 98 98
+213 148 148
+197 123 131
diff --git a/data/tilesets/secondary/82D4B0C/palettes/11.pal b/data/tilesets/secondary/82D4B0C/palettes/11.pal
new file mode 100644
index 000000000..f71181976
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+255 0 255
+255 0 255
+123 123 131
+255 0 255
+82 82 106
+213 238 255
+164 189 222
+123 148 180
+255 238 139
+222 180 65
+255 255 189
+156 213 255
+115 189 246
+98 164 222
diff --git a/data/tilesets/secondary/82D4B0C/palettes/12.pal b/data/tilesets/secondary/82D4B0C/palettes/12.pal
new file mode 100644
index 000000000..0cdcab8c2
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+246 246 255
+222 205 246
+205 172 255
+172 139 213
+123 123 131
+90 90 115
+65 74 106
+230 222 131
+213 189 98
+222 197 255
+172 139 213
+148 115 189
+139 106 180
+255 246 164
+172 148 82
diff --git a/data/tilesets/secondary/82D4B0C/palettes/13.pal b/data/tilesets/secondary/82D4B0C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B0C/palettes/14.pal b/data/tilesets/secondary/82D4B0C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B0C/palettes/15.pal b/data/tilesets/secondary/82D4B0C/palettes/15.pal
new file mode 100644
index 000000000..3973e491a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+246 230 172
+246 213 180
+222 189 164
+180 148 123
+139 98 90
+90 57 74
+123 123 131
+65 74 106
+205 222 238
diff --git a/data/tilesets/secondary/82D4B0C/palettes/2.pal b/data/tilesets/secondary/82D4B0C/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4B0C/palettes/3.pal b/data/tilesets/secondary/82D4B0C/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B0C/palettes/4.pal b/data/tilesets/secondary/82D4B0C/palettes/4.pal
new file mode 100644
index 000000000..07dcd957c
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 255 255
+172 222 255
+148 189 238
+106 156 230
+57 148 197
+32 131 172
+82 148 213
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+230 213 148
+238 230 139
+222 197 139
+213 189 106
diff --git a/data/tilesets/secondary/82D4B0C/palettes/5.pal b/data/tilesets/secondary/82D4B0C/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B0C/palettes/6.pal b/data/tilesets/secondary/82D4B0C/palettes/6.pal
new file mode 100644
index 000000000..0dba59a72
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 255 255
+172 222 255
+148 189 238
+106 156 230
+41 90 172
+41 57 148
+74 123 197
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+230 213 148
+238 230 139
+222 197 139
+213 189 106
diff --git a/data/tilesets/secondary/82D4B0C/palettes/7.pal b/data/tilesets/secondary/82D4B0C/palettes/7.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4B0C/palettes/8.pal b/data/tilesets/secondary/82D4B0C/palettes/8.pal
new file mode 100644
index 000000000..376749664
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+115 205 164
+148 164 180
+123 123 131
+65 74 106
+205 82 74
+172 32 41
+255 246 189
+238 230 156
+222 205 131
+189 164 90
+148 131 49
+123 90 24
+123 123 131
+65 74 106
+205 222 238
diff --git a/data/tilesets/secondary/82D4B0C/palettes/9.pal b/data/tilesets/secondary/82D4B0C/palettes/9.pal
new file mode 100644
index 000000000..82b469a66
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+230 246 238
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+172 172 106
+213 213 148
+180 205 180
+148 180 148
+131 164 131
+106 139 106
+197 222 197
+139 172 139
+90 115 90
diff --git a/data/tilesets/secondary/82D4B0C/tiles.png b/data/tilesets/secondary/82D4B0C/tiles.png
new file mode 100644
index 000000000..66bd81f8b
--- /dev/null
+++ b/data/tilesets/secondary/82D4B0C/tiles.png
diff --git a/data/tilesets/secondary/82D4B24/metatile_attributes.bin b/data/tilesets/secondary/82D4B24/metatile_attributes.bin
new file mode 100644
index 000000000..1136f644a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B24/metatiles.bin b/data/tilesets/secondary/82D4B24/metatiles.bin
new file mode 100644
index 000000000..c7978128e
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B24/palettes/0.pal b/data/tilesets/secondary/82D4B24/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4B24/palettes/1.pal b/data/tilesets/secondary/82D4B24/palettes/1.pal
new file mode 100644
index 000000000..09828f4f1
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+123 123 131
+32 49 57
+230 238 238
+90 189 139
+90 90 115
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+123 74 74
+90 57 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4B24/palettes/10.pal b/data/tilesets/secondary/82D4B24/palettes/10.pal
new file mode 100644
index 000000000..892aae6ed
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+115 82 41
+255 189 32
+222 156 0
+189 106 57
+123 123 131
+90 90 115
+65 74 106
+189 255 139
+131 213 98
+106 180 98
+255 230 131
+238 205 123
+197 164 90
+131 164 197
+255 0 255
diff --git a/data/tilesets/secondary/82D4B24/palettes/11.pal b/data/tilesets/secondary/82D4B24/palettes/11.pal
new file mode 100644
index 000000000..b2a405273
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4B24/palettes/12.pal b/data/tilesets/secondary/82D4B24/palettes/12.pal
new file mode 100644
index 000000000..f124929b4
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 238 189
+222 205 131
+205 180 106
+180 139 74
+246 246 255
+172 189 205
+222 106 98
+213 164 156
+213 148 49
+65 74 106
+123 123 131
+16 123 74
+49 148 106
+98 189 148
+164 230 197
diff --git a/data/tilesets/secondary/82D4B24/palettes/13.pal b/data/tilesets/secondary/82D4B24/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B24/palettes/14.pal b/data/tilesets/secondary/82D4B24/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B24/palettes/15.pal b/data/tilesets/secondary/82D4B24/palettes/15.pal
new file mode 100644
index 000000000..ac0d32eb0
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+246 222 90
+246 197 65
+238 164 57
+172 189 205
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B24/palettes/2.pal b/data/tilesets/secondary/82D4B24/palettes/2.pal
new file mode 100644
index 000000000..372fb5d7c
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4B24/palettes/3.pal b/data/tilesets/secondary/82D4B24/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B24/palettes/4.pal b/data/tilesets/secondary/82D4B24/palettes/4.pal
new file mode 100644
index 000000000..5871a448c
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+230 246 255
+189 222 255
+139 189 255
+115 164 255
+65 139 222
+57 115 222
+82 148 230
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 197
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D4B24/palettes/5.pal b/data/tilesets/secondary/82D4B24/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B24/palettes/6.pal b/data/tilesets/secondary/82D4B24/palettes/6.pal
new file mode 100644
index 000000000..9bad44649
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+205 230 246
+180 213 255
+123 180 246
+98 148 230
+65 123 189
+49 98 180
+82 131 222
+213 230 238
+172 189 205
+123 123 131
+90 90 115
+238 246 246
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D4B24/palettes/7.pal b/data/tilesets/secondary/82D4B24/palettes/7.pal
new file mode 100644
index 000000000..17b1a0ed2
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4B24/palettes/8.pal b/data/tilesets/secondary/82D4B24/palettes/8.pal
new file mode 100644
index 000000000..7179b91bd
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 246 172
+255 189 32
+222 156 0
+189 106 57
+123 123 131
+90 90 115
+65 74 106
+255 255 255
+205 205 222
+255 230 131
+238 205 123
+197 164 90
+131 164 197
+255 0 255
+180 156 49
diff --git a/data/tilesets/secondary/82D4B24/palettes/9.pal b/data/tilesets/secondary/82D4B24/palettes/9.pal
new file mode 100644
index 000000000..746dac7da
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+74 123 180
+90 164 213
+57 90 148
+213 148 49
+238 180 82
+205 205 222
+115 189 246
+74 131 197
diff --git a/data/tilesets/secondary/82D4B24/tiles.png b/data/tilesets/secondary/82D4B24/tiles.png
new file mode 100644
index 000000000..8cfa9b4dd
--- /dev/null
+++ b/data/tilesets/secondary/82D4B24/tiles.png
diff --git a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin b/data/tilesets/secondary/82D4B3C/metatile_attributes.bin
new file mode 100644
index 000000000..5dd139155
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B3C/metatiles.bin b/data/tilesets/secondary/82D4B3C/metatiles.bin
new file mode 100644
index 000000000..3bfb9d239
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B3C/palettes/0.pal b/data/tilesets/secondary/82D4B3C/palettes/0.pal
new file mode 100644
index 000000000..7af5bb7d2
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4B3C/palettes/1.pal b/data/tilesets/secondary/82D4B3C/palettes/1.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D4B3C/palettes/10.pal b/data/tilesets/secondary/82D4B3C/palettes/10.pal
new file mode 100644
index 000000000..361b133e6
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+222 222 230
+123 123 131
+82 82 106
+238 230 255
+222 197 255
+180 148 222
+131 106 172
+255 0 255
+115 189 246
+74 148 205
+41 115 172
+148 164 180
+246 238 148
+213 172 74
diff --git a/data/tilesets/secondary/82D4B3C/palettes/11.pal b/data/tilesets/secondary/82D4B3C/palettes/11.pal
new file mode 100644
index 000000000..00caf8dfc
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+180 205 213
+148 164 180
+123 123 131
+82 82 106
+205 222 238
+197 213 222
+164 180 197
+222 180 82
+230 238 238
+255 205 139
+222 106 98
+197 74 65
+98 189 148
+115 205 164
diff --git a/data/tilesets/secondary/82D4B3C/palettes/12.pal b/data/tilesets/secondary/82D4B3C/palettes/12.pal
new file mode 100644
index 000000000..4257575ae
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+213 222 164
+180 189 131
+139 148 90
+123 123 131
+90 90 115
+65 74 106
+180 148 222
+131 106 172
+189 230 222
+148 205 180
+115 172 148
+106 148 139
+74 115 106
+115 205 164
diff --git a/data/tilesets/secondary/82D4B3C/palettes/13.pal b/data/tilesets/secondary/82D4B3C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B3C/palettes/14.pal b/data/tilesets/secondary/82D4B3C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B3C/palettes/15.pal b/data/tilesets/secondary/82D4B3C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B3C/palettes/2.pal b/data/tilesets/secondary/82D4B3C/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4B3C/palettes/3.pal b/data/tilesets/secondary/82D4B3C/palettes/3.pal
new file mode 100644
index 000000000..973765509
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B3C/palettes/4.pal b/data/tilesets/secondary/82D4B3C/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4B3C/palettes/5.pal b/data/tilesets/secondary/82D4B3C/palettes/5.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B3C/palettes/6.pal b/data/tilesets/secondary/82D4B3C/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B3C/palettes/7.pal b/data/tilesets/secondary/82D4B3C/palettes/7.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B3C/palettes/8.pal b/data/tilesets/secondary/82D4B3C/palettes/8.pal
new file mode 100644
index 000000000..86930c1d1
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+222 222 230
+123 123 131
+82 82 106
+197 238 255
+172 213 255
+123 164 222
+98 139 189
+246 230 139
+197 180 115
+172 156 90
+123 164 189
+148 189 238
+255 205 139
+230 131 115
diff --git a/data/tilesets/secondary/82D4B3C/palettes/9.pal b/data/tilesets/secondary/82D4B3C/palettes/9.pal
new file mode 100644
index 000000000..5dc82505a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+222 222 230
+123 123 131
+82 82 106
+197 197 205
+255 213 164
+222 123 82
+189 90 57
+189 230 222
+131 189 164
+106 148 139
+246 238 189
+222 213 156
+213 189 123
+197 180 106
diff --git a/data/tilesets/secondary/82D4B3C/tiles.png b/data/tilesets/secondary/82D4B3C/tiles.png
new file mode 100644
index 000000000..db18cb938
--- /dev/null
+++ b/data/tilesets/secondary/82D4B3C/tiles.png
diff --git a/data/tilesets/secondary/82D4B54/metatile_attributes.bin b/data/tilesets/secondary/82D4B54/metatile_attributes.bin
new file mode 100644
index 000000000..3e370a747
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B54/metatiles.bin b/data/tilesets/secondary/82D4B54/metatiles.bin
new file mode 100644
index 000000000..0e0e722da
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B54/palettes/0.pal b/data/tilesets/secondary/82D4B54/palettes/0.pal
new file mode 100644
index 000000000..5fb8bdb01
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 255 139
+131 213 98
+57 139 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4B54/palettes/1.pal b/data/tilesets/secondary/82D4B54/palettes/1.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D4B54/palettes/10.pal b/data/tilesets/secondary/82D4B54/palettes/10.pal
new file mode 100644
index 000000000..d82bb0391
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+65 74 106
+123 123 131
+180 164 90
+0 0 255
+255 238 197
+238 238 205
+189 180 172
+172 172 156
+205 205 172
+139 123 49
+164 148 74
+205 197 123
+230 213 139
+106 172 123
+123 197 139
diff --git a/data/tilesets/secondary/82D4B54/palettes/11.pal b/data/tilesets/secondary/82D4B54/palettes/11.pal
new file mode 100644
index 000000000..cc0cf52cf
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 197
+180 238 82
+139 213 82
+90 164 49
+57 90 90
+74 123 74
+90 98 49
+139 131 49
+65 57 49
+57 139 98
+123 197 49
+123 197 82
+57 139 49
+115 205 164
+57 172 156
+255 0 255
diff --git a/data/tilesets/secondary/82D4B54/palettes/12.pal b/data/tilesets/secondary/82D4B54/palettes/12.pal
new file mode 100644
index 000000000..ebcfeb596
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 131
+205 180 106
+238 180 139
+222 148 131
+189 123 115
+139 90 82
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B54/palettes/13.pal b/data/tilesets/secondary/82D4B54/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B54/palettes/14.pal b/data/tilesets/secondary/82D4B54/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B54/palettes/15.pal b/data/tilesets/secondary/82D4B54/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B54/palettes/2.pal b/data/tilesets/secondary/82D4B54/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4B54/palettes/3.pal b/data/tilesets/secondary/82D4B54/palettes/3.pal
new file mode 100644
index 000000000..9581f2cd8
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 131
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B54/palettes/4.pal b/data/tilesets/secondary/82D4B54/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4B54/palettes/5.pal b/data/tilesets/secondary/82D4B54/palettes/5.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B54/palettes/6.pal b/data/tilesets/secondary/82D4B54/palettes/6.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4B54/palettes/7.pal b/data/tilesets/secondary/82D4B54/palettes/7.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4B54/palettes/8.pal b/data/tilesets/secondary/82D4B54/palettes/8.pal
new file mode 100644
index 000000000..8a0a9a1e0
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+65 74 106
+123 123 131
+98 90 82
+115 106 98
+148 131 131
+180 156 131
+189 172 98
+213 205 131
+238 222 139
+90 106 164
+98 139 230
+115 205 255
+255 0 255
+255 0 255
+98 106 115
diff --git a/data/tilesets/secondary/82D4B54/palettes/9.pal b/data/tilesets/secondary/82D4B54/palettes/9.pal
new file mode 100644
index 000000000..d39bbb454
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+65 74 106
+123 123 131
+139 90 82
+189 123 115
+222 148 131
+255 197 156
+156 156 172
+189 197 213
+230 238 238
+49 98 90
+74 148 131
+82 197 148
+106 230 172
+164 238 172
+98 106 115
diff --git a/data/tilesets/secondary/82D4B54/tiles.png b/data/tilesets/secondary/82D4B54/tiles.png
new file mode 100644
index 000000000..a9e9e13e8
--- /dev/null
+++ b/data/tilesets/secondary/82D4B54/tiles.png
diff --git a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin b/data/tilesets/secondary/82D4B6C/metatile_attributes.bin
new file mode 100644
index 000000000..d2c655c41
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B6C/metatiles.bin b/data/tilesets/secondary/82D4B6C/metatiles.bin
new file mode 100644
index 000000000..0abe4b18d
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B6C/palettes/0.pal b/data/tilesets/secondary/82D4B6C/palettes/0.pal
new file mode 100644
index 000000000..9dcb673aa
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4B6C/palettes/1.pal b/data/tilesets/secondary/82D4B6C/palettes/1.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D4B6C/palettes/10.pal b/data/tilesets/secondary/82D4B6C/palettes/10.pal
new file mode 100644
index 000000000..608bbc2cf
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B6C/palettes/11.pal b/data/tilesets/secondary/82D4B6C/palettes/11.pal
new file mode 100644
index 000000000..608bbc2cf
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B6C/palettes/12.pal b/data/tilesets/secondary/82D4B6C/palettes/12.pal
new file mode 100644
index 000000000..608bbc2cf
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B6C/palettes/13.pal b/data/tilesets/secondary/82D4B6C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B6C/palettes/14.pal b/data/tilesets/secondary/82D4B6C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B6C/palettes/15.pal b/data/tilesets/secondary/82D4B6C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B6C/palettes/2.pal b/data/tilesets/secondary/82D4B6C/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4B6C/palettes/3.pal b/data/tilesets/secondary/82D4B6C/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B6C/palettes/4.pal b/data/tilesets/secondary/82D4B6C/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4B6C/palettes/5.pal b/data/tilesets/secondary/82D4B6C/palettes/5.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B6C/palettes/6.pal b/data/tilesets/secondary/82D4B6C/palettes/6.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4B6C/palettes/7.pal b/data/tilesets/secondary/82D4B6C/palettes/7.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4B6C/palettes/8.pal b/data/tilesets/secondary/82D4B6C/palettes/8.pal
new file mode 100644
index 000000000..f734cd166
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+139 82 57
+164 106 82
+205 148 123
+222 164 139
+172 189 238
+213 222 246
+156 131 90
+189 164 115
+222 205 156
+255 238 189
+164 164 180
+82 82 106
+123 123 139
+205 205 222
+255 255 255
diff --git a/data/tilesets/secondary/82D4B6C/palettes/9.pal b/data/tilesets/secondary/82D4B6C/palettes/9.pal
new file mode 100644
index 000000000..ca26d1b08
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 246
+230 230 189
+197 197 156
+172 172 131
+123 123 82
+65 74 106
+123 123 131
+123 123 131
+98 164 222
+74 131 197
+139 222 189
+106 189 156
+106 189 156
+74 156 123
+90 90 115
diff --git a/data/tilesets/secondary/82D4B6C/tiles.png b/data/tilesets/secondary/82D4B6C/tiles.png
new file mode 100644
index 000000000..ddb9ad0cb
--- /dev/null
+++ b/data/tilesets/secondary/82D4B6C/tiles.png
diff --git a/data/tilesets/secondary/82D4B84/metatile_attributes.bin b/data/tilesets/secondary/82D4B84/metatile_attributes.bin
new file mode 100644
index 000000000..f840f6486
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B84/metatiles.bin b/data/tilesets/secondary/82D4B84/metatiles.bin
new file mode 100644
index 000000000..bbb7ffbee
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B84/palettes/0.pal b/data/tilesets/secondary/82D4B84/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4B84/palettes/1.pal b/data/tilesets/secondary/82D4B84/palettes/1.pal
new file mode 100644
index 000000000..cf1123812
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4B84/palettes/10.pal b/data/tilesets/secondary/82D4B84/palettes/10.pal
new file mode 100644
index 000000000..70ed40322
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+213 230 197
+156 172 139
+123 123 131
+90 90 115
+65 74 106
+222 172 65
+180 98 0
+131 65 0
+205 205 123
+164 164 57
+115 189 246
+74 148 213
+49 115 180
+189 197 164
diff --git a/data/tilesets/secondary/82D4B84/palettes/11.pal b/data/tilesets/secondary/82D4B84/palettes/11.pal
new file mode 100644
index 000000000..7b47acf60
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+255 255 255
+213 213 222
+180 180 164
+148 148 139
+123 123 131
+82 82 106
+197 222 205
+148 172 156
+98 131 106
+230 139 24
+197 98 0
+172 65 0
+230 213 139
+205 180 106
+172 148 82
diff --git a/data/tilesets/secondary/82D4B84/palettes/12.pal b/data/tilesets/secondary/82D4B84/palettes/12.pal
new file mode 100644
index 000000000..f5ff3dddf
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+148 148 139
+222 222 230
+205 205 213
+180 180 164
+255 0 255
+222 222 205
+205 205 189
+172 172 164
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+230 213 139
+205 180 106
+115 205 164
diff --git a/data/tilesets/secondary/82D4B84/palettes/13.pal b/data/tilesets/secondary/82D4B84/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B84/palettes/14.pal b/data/tilesets/secondary/82D4B84/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B84/palettes/15.pal b/data/tilesets/secondary/82D4B84/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B84/palettes/2.pal b/data/tilesets/secondary/82D4B84/palettes/2.pal
new file mode 100644
index 000000000..372fb5d7c
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4B84/palettes/3.pal b/data/tilesets/secondary/82D4B84/palettes/3.pal
new file mode 100644
index 000000000..5a5e60211
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B84/palettes/4.pal b/data/tilesets/secondary/82D4B84/palettes/4.pal
new file mode 100644
index 000000000..229f9132c
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 230 255
+197 213 255
+164 197 238
+123 172 230
+90 148 197
+65 123 180
+90 164 205
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+32 98 139
+238 230 139
+222 197 139
+205 180 106
diff --git a/data/tilesets/secondary/82D4B84/palettes/5.pal b/data/tilesets/secondary/82D4B84/palettes/5.pal
new file mode 100644
index 000000000..215dd1272
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B84/palettes/6.pal b/data/tilesets/secondary/82D4B84/palettes/6.pal
new file mode 100644
index 000000000..7e7862a19
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 230 255
+197 213 255
+164 197 238
+123 172 230
+41 82 164
+41 57 131
+74 123 197
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+32 98 139
+238 230 139
+222 197 139
+205 180 106
diff --git a/data/tilesets/secondary/82D4B84/palettes/7.pal b/data/tilesets/secondary/82D4B84/palettes/7.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B84/palettes/8.pal b/data/tilesets/secondary/82D4B84/palettes/8.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B84/palettes/9.pal b/data/tilesets/secondary/82D4B84/palettes/9.pal
new file mode 100644
index 000000000..3ff6139ac
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 205 65
+222 172 65
+180 98 0
+213 213 139
+189 189 115
+148 148 82
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4B84/tiles.png b/data/tilesets/secondary/82D4B84/tiles.png
new file mode 100644
index 000000000..4a938b4c5
--- /dev/null
+++ b/data/tilesets/secondary/82D4B84/tiles.png
diff --git a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin b/data/tilesets/secondary/82D4B9C/metatile_attributes.bin
new file mode 100644
index 000000000..c6f6551c0
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B9C/metatiles.bin b/data/tilesets/secondary/82D4B9C/metatiles.bin
new file mode 100644
index 000000000..dd43794df
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B9C/palettes/0.pal b/data/tilesets/secondary/82D4B9C/palettes/0.pal
new file mode 100644
index 000000000..9dcb673aa
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4B9C/palettes/1.pal b/data/tilesets/secondary/82D4B9C/palettes/1.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D4B9C/palettes/10.pal b/data/tilesets/secondary/82D4B9C/palettes/10.pal
new file mode 100644
index 000000000..ce671fee4
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 255 82
+238 238 238
+222 222 230
+123 123 131
+172 189 205
+65 74 106
+222 222 205
+205 205 189
+180 180 164
+213 213 164
+189 189 139
+148 148 98
+32 82 164
+156 205 246
+82 164 205
+115 205 164
diff --git a/data/tilesets/secondary/82D4B9C/palettes/11.pal b/data/tilesets/secondary/82D4B9C/palettes/11.pal
new file mode 100644
index 000000000..d1ae629c8
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+197 197 205
+49 98 164
+172 222 180
+139 189 148
+106 156 115
+82 131 90
+65 115 74
+255 0 255
diff --git a/data/tilesets/secondary/82D4B9C/palettes/12.pal b/data/tilesets/secondary/82D4B9C/palettes/12.pal
new file mode 100644
index 000000000..b66bd774a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+222 222 230
+139 156 172
+123 123 131
+82 82 106
+213 205 32
+246 238 74
+164 131 205
+164 156 16
+205 197 106
+255 255 148
+139 189 148
+74 131 197
+197 197 205
+115 189 246
diff --git a/data/tilesets/secondary/82D4B9C/palettes/13.pal b/data/tilesets/secondary/82D4B9C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B9C/palettes/14.pal b/data/tilesets/secondary/82D4B9C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B9C/palettes/15.pal b/data/tilesets/secondary/82D4B9C/palettes/15.pal
new file mode 100644
index 000000000..3ffc684ac
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 222 164
+222 205 131
+205 180 106
+213 213 197
+197 197 180
+164 164 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4B9C/palettes/2.pal b/data/tilesets/secondary/82D4B9C/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4B9C/palettes/3.pal b/data/tilesets/secondary/82D4B9C/palettes/3.pal
new file mode 100644
index 000000000..973765509
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B9C/palettes/4.pal b/data/tilesets/secondary/82D4B9C/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4B9C/palettes/5.pal b/data/tilesets/secondary/82D4B9C/palettes/5.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4B9C/palettes/6.pal b/data/tilesets/secondary/82D4B9C/palettes/6.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4B9C/palettes/7.pal b/data/tilesets/secondary/82D4B9C/palettes/7.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4B9C/palettes/8.pal b/data/tilesets/secondary/82D4B9C/palettes/8.pal
new file mode 100644
index 000000000..b1e168855
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+197 197 197
+222 222 230
+148 164 180
+123 123 131
+65 74 106
+246 246 255
+205 164 255
+164 131 205
+123 90 164
+255 0 255
+255 0 255
+255 0 255
+164 131 205
+205 164 255
+90 90 115
diff --git a/data/tilesets/secondary/82D4B9C/palettes/9.pal b/data/tilesets/secondary/82D4B9C/palettes/9.pal
new file mode 100644
index 000000000..7a88fdbbf
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+205 205 213
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 238 246
+255 238 139
+230 189 82
+238 148 115
+222 246 255
+172 230 255
+123 205 213
+197 106 74
diff --git a/data/tilesets/secondary/82D4B9C/tiles.png b/data/tilesets/secondary/82D4B9C/tiles.png
new file mode 100644
index 000000000..ea835f8dd
--- /dev/null
+++ b/data/tilesets/secondary/82D4B9C/tiles.png
diff --git a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin b/data/tilesets/secondary/82D4BCC/metatile_attributes.bin
new file mode 100644
index 000000000..31fdb5cc0
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BCC/metatiles.bin b/data/tilesets/secondary/82D4BCC/metatiles.bin
new file mode 100644
index 000000000..1c00836c1
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BCC/palettes/0.pal b/data/tilesets/secondary/82D4BCC/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4BCC/palettes/1.pal b/data/tilesets/secondary/82D4BCC/palettes/1.pal
new file mode 100644
index 000000000..3a16a45c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+238 246 238
diff --git a/data/tilesets/secondary/82D4BCC/palettes/10.pal b/data/tilesets/secondary/82D4BCC/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/11.pal b/data/tilesets/secondary/82D4BCC/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/12.pal b/data/tilesets/secondary/82D4BCC/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/13.pal b/data/tilesets/secondary/82D4BCC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/14.pal b/data/tilesets/secondary/82D4BCC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/15.pal b/data/tilesets/secondary/82D4BCC/palettes/15.pal
new file mode 100644
index 000000000..92e7ed309
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/2.pal b/data/tilesets/secondary/82D4BCC/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4BCC/palettes/3.pal b/data/tilesets/secondary/82D4BCC/palettes/3.pal
new file mode 100644
index 000000000..e1b56cd57
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+164 172 164
+180 189 189
+238 246 246
+238 246 238
+213 230 222
+197 205 197
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4BCC/palettes/4.pal b/data/tilesets/secondary/82D4BCC/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/5.pal b/data/tilesets/secondary/82D4BCC/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/6.pal b/data/tilesets/secondary/82D4BCC/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/7.pal b/data/tilesets/secondary/82D4BCC/palettes/7.pal
new file mode 100644
index 000000000..0a07057ec
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4BCC/palettes/8.pal b/data/tilesets/secondary/82D4BCC/palettes/8.pal
new file mode 100644
index 000000000..06fcc911b
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+115 189 139
+172 230 172
+205 246 205
+0 0 0
diff --git a/data/tilesets/secondary/82D4BCC/palettes/9.pal b/data/tilesets/secondary/82D4BCC/palettes/9.pal
new file mode 100644
index 000000000..ea018609b
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+164 172 164
+180 189 189
+238 246 246
+238 246 238
+213 230 222
+197 205 197
+255 0 255
+255 0 255
+156 205 255
+106 164 238
+74 139 230
+57 131 205
+41 98 189
+255 0 255
diff --git a/data/tilesets/secondary/82D4BCC/tiles.png b/data/tilesets/secondary/82D4BCC/tiles.png
new file mode 100644
index 000000000..2bfeb4080
--- /dev/null
+++ b/data/tilesets/secondary/82D4BCC/tiles.png
diff --git a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin b/data/tilesets/secondary/82D4BE4/metatile_attributes.bin
new file mode 100644
index 000000000..f9bd3d289
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BE4/metatiles.bin b/data/tilesets/secondary/82D4BE4/metatiles.bin
new file mode 100644
index 000000000..2ec8817bc
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BE4/palettes/0.pal b/data/tilesets/secondary/82D4BE4/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4BE4/palettes/1.pal b/data/tilesets/secondary/82D4BE4/palettes/1.pal
new file mode 100644
index 000000000..d99adafff
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4BE4/palettes/10.pal b/data/tilesets/secondary/82D4BE4/palettes/10.pal
new file mode 100644
index 000000000..62e3e6d6b
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+189 98 74
+255 131 115
+255 0 255
+255 0 255
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+189 230 255
+189 230 255
+156 189 213
+90 131 180
diff --git a/data/tilesets/secondary/82D4BE4/palettes/11.pal b/data/tilesets/secondary/82D4BE4/palettes/11.pal
new file mode 100644
index 000000000..7ba7bccca
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 222 156
+82 82 106
+123 123 123
+180 180 164
+222 230 230
+180 213 230
+131 180 205
+98 156 164
+57 115 139
+255 65 0
+205 49 0
+8 90 255
+0 57 197
+255 180 0
+0 230 115
+255 255 255
diff --git a/data/tilesets/secondary/82D4BE4/palettes/12.pal b/data/tilesets/secondary/82D4BE4/palettes/12.pal
new file mode 100644
index 000000000..0f1f36738
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+164 172 164
+180 189 189
+255 255 255
+115 115 123
+213 205 156
+238 238 172
+197 180 139
+230 222 156
+246 246 205
+0 82 123
+57 139 180
+115 197 238
+222 230 222
+131 131 139
diff --git a/data/tilesets/secondary/82D4BE4/palettes/13.pal b/data/tilesets/secondary/82D4BE4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BE4/palettes/14.pal b/data/tilesets/secondary/82D4BE4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BE4/palettes/15.pal b/data/tilesets/secondary/82D4BE4/palettes/15.pal
new file mode 100644
index 000000000..92e7ed309
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4BE4/palettes/2.pal b/data/tilesets/secondary/82D4BE4/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4BE4/palettes/3.pal b/data/tilesets/secondary/82D4BE4/palettes/3.pal
new file mode 100644
index 000000000..7ec794ae5
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4BE4/palettes/4.pal b/data/tilesets/secondary/82D4BE4/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BE4/palettes/5.pal b/data/tilesets/secondary/82D4BE4/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BE4/palettes/6.pal b/data/tilesets/secondary/82D4BE4/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BE4/palettes/7.pal b/data/tilesets/secondary/82D4BE4/palettes/7.pal
new file mode 100644
index 000000000..27ca86ca3
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 222 205
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4BE4/palettes/8.pal b/data/tilesets/secondary/82D4BE4/palettes/8.pal
new file mode 100644
index 000000000..6b6a0f25f
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+131 205 139
+230 189 115
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4BE4/palettes/9.pal b/data/tilesets/secondary/82D4BE4/palettes/9.pal
new file mode 100644
index 000000000..4b279ecf9
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 255 0
+82 82 106
+148 148 164
+205 189 197
+255 255 255
+189 148 49
+156 115 90
+197 238 148
+156 197 74
+106 164 41
+197 222 205
+139 180 172
+172 205 180
+123 123 139
+255 98 49
+238 222 164
diff --git a/data/tilesets/secondary/82D4BE4/tiles.png b/data/tilesets/secondary/82D4BE4/tiles.png
new file mode 100644
index 000000000..92d0112f3
--- /dev/null
+++ b/data/tilesets/secondary/82D4BE4/tiles.png
diff --git a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin b/data/tilesets/secondary/82D4BFC/metatile_attributes.bin
new file mode 100644
index 000000000..510f0fdf1
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BFC/metatiles.bin b/data/tilesets/secondary/82D4BFC/metatiles.bin
new file mode 100644
index 000000000..9f35adc11
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BFC/palettes/0.pal b/data/tilesets/secondary/82D4BFC/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4BFC/palettes/1.pal b/data/tilesets/secondary/82D4BFC/palettes/1.pal
new file mode 100644
index 000000000..09828f4f1
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+123 123 131
+32 49 57
+230 238 238
+90 189 139
+90 90 115
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+123 74 74
+90 57 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4BFC/palettes/10.pal b/data/tilesets/secondary/82D4BFC/palettes/10.pal
new file mode 100644
index 000000000..937405d15
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+255 238 164
+230 197 139
+205 172 123
+172 139 106
+213 197 189
+205 180 156
+189 148 139
+148 115 106
+115 65 74
+82 49 65
+90 90 98
diff --git a/data/tilesets/secondary/82D4BFC/palettes/11.pal b/data/tilesets/secondary/82D4BFC/palettes/11.pal
new file mode 100644
index 000000000..bb4f4867c
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+238 222 148
+222 205 115
+205 180 98
+189 172 98
diff --git a/data/tilesets/secondary/82D4BFC/palettes/12.pal b/data/tilesets/secondary/82D4BFC/palettes/12.pal
new file mode 100644
index 000000000..583384664
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4BFC/palettes/13.pal b/data/tilesets/secondary/82D4BFC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BFC/palettes/14.pal b/data/tilesets/secondary/82D4BFC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BFC/palettes/15.pal b/data/tilesets/secondary/82D4BFC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BFC/palettes/2.pal b/data/tilesets/secondary/82D4BFC/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4BFC/palettes/3.pal b/data/tilesets/secondary/82D4BFC/palettes/3.pal
new file mode 100644
index 000000000..ef7460f41
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+123 197 255
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4BFC/palettes/4.pal b/data/tilesets/secondary/82D4BFC/palettes/4.pal
new file mode 100644
index 000000000..e83c6b367
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+230 246 255
+189 222 255
+139 189 255
+115 164 255
+65 139 222
+57 115 205
+82 148 230
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 197
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D4BFC/palettes/5.pal b/data/tilesets/secondary/82D4BFC/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4BFC/palettes/6.pal b/data/tilesets/secondary/82D4BFC/palettes/6.pal
new file mode 100644
index 000000000..9bad44649
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+205 230 246
+180 213 255
+123 180 246
+98 148 230
+65 123 189
+49 98 180
+82 131 222
+213 230 238
+172 189 205
+123 123 131
+90 90 115
+238 246 246
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D4BFC/palettes/7.pal b/data/tilesets/secondary/82D4BFC/palettes/7.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4BFC/palettes/8.pal b/data/tilesets/secondary/82D4BFC/palettes/8.pal
new file mode 100644
index 000000000..1c8d33fac
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+32 49 57
+255 0 255
+255 0 255
+255 0 255
+222 197 189
+205 180 156
+189 148 139
+148 115 106
+115 65 74
+82 49 65
+90 90 98
diff --git a/data/tilesets/secondary/82D4BFC/palettes/9.pal b/data/tilesets/secondary/82D4BFC/palettes/9.pal
new file mode 100644
index 000000000..3795f6c6a
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 222 213
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+255 238 164
+230 197 139
+205 172 123
+164 123 90
+148 115 74
+106 65 41
+74 74 57
+0 0 0
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D4BFC/tiles.png b/data/tilesets/secondary/82D4BFC/tiles.png
new file mode 100644
index 000000000..8e0f64a78
--- /dev/null
+++ b/data/tilesets/secondary/82D4BFC/tiles.png
diff --git a/data/tilesets/secondary/82D4C14/metatile_attributes.bin b/data/tilesets/secondary/82D4C14/metatile_attributes.bin
new file mode 100644
index 000000000..1b1cb4d44
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C14/metatiles.bin b/data/tilesets/secondary/82D4C14/metatiles.bin
new file mode 100644
index 000000000..274da22a6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C14/palettes/0.pal b/data/tilesets/secondary/82D4C14/palettes/0.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/1.pal b/data/tilesets/secondary/82D4C14/palettes/1.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/10.pal b/data/tilesets/secondary/82D4C14/palettes/10.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/11.pal b/data/tilesets/secondary/82D4C14/palettes/11.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/12.pal b/data/tilesets/secondary/82D4C14/palettes/12.pal
new file mode 100644
index 000000000..97d3f20bd
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+156 156 139
+164 148 65
+213 164 106
+230 213 131
+246 238 205
+0 0 0
+197 189 123
+222 213 139
+246 238 180
+238 205 172
+205 205 213
+255 148 131
+255 255 115
+156 197 230
diff --git a/data/tilesets/secondary/82D4C14/palettes/13.pal b/data/tilesets/secondary/82D4C14/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/14.pal b/data/tilesets/secondary/82D4C14/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/15.pal b/data/tilesets/secondary/82D4C14/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/2.pal b/data/tilesets/secondary/82D4C14/palettes/2.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/3.pal b/data/tilesets/secondary/82D4C14/palettes/3.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/4.pal b/data/tilesets/secondary/82D4C14/palettes/4.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/5.pal b/data/tilesets/secondary/82D4C14/palettes/5.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/6.pal b/data/tilesets/secondary/82D4C14/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/7.pal b/data/tilesets/secondary/82D4C14/palettes/7.pal
new file mode 100644
index 000000000..4172436d0
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+246 246 255
+205 197 213
+156 156 164
+222 230 255
+172 205 213
+156 189 172
+189 230 148
+139 205 123
+106 131 98
+238 131 106
+205 106 106
+255 246 41
+255 205 148
+189 197 115
diff --git a/data/tilesets/secondary/82D4C14/palettes/8.pal b/data/tilesets/secondary/82D4C14/palettes/8.pal
new file mode 100644
index 000000000..7fd087b3b
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+172 172 189
+222 213 205
+238 238 238
+123 139 74
+148 205 98
+205 246 123
+255 238 230
+222 222 189
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/palettes/9.pal b/data/tilesets/secondary/82D4C14/palettes/9.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C14/tiles.png b/data/tilesets/secondary/82D4C14/tiles.png
new file mode 100644
index 000000000..d4b21f3e4
--- /dev/null
+++ b/data/tilesets/secondary/82D4C14/tiles.png
diff --git a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin b/data/tilesets/secondary/82D4C2C/metatile_attributes.bin
new file mode 100644
index 000000000..097e93ce1
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C2C/metatiles.bin b/data/tilesets/secondary/82D4C2C/metatiles.bin
new file mode 100644
index 000000000..993b73cbd
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C2C/palettes/0.pal b/data/tilesets/secondary/82D4C2C/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4C2C/palettes/1.pal b/data/tilesets/secondary/82D4C2C/palettes/1.pal
new file mode 100644
index 000000000..69f3f0b9e
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+180 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+238 246 238
diff --git a/data/tilesets/secondary/82D4C2C/palettes/10.pal b/data/tilesets/secondary/82D4C2C/palettes/10.pal
new file mode 100644
index 000000000..fc8da5d40
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+98 98 74
+164 139 82
+222 205 74
+65 123 164
+82 139 197
+98 189 213
+148 213 213
+180 238 230
+189 197 205
+238 246 238
+222 222 172
+205 131 82
+246 172 106
diff --git a/data/tilesets/secondary/82D4C2C/palettes/11.pal b/data/tilesets/secondary/82D4C2C/palettes/11.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/12.pal b/data/tilesets/secondary/82D4C2C/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/13.pal b/data/tilesets/secondary/82D4C2C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/14.pal b/data/tilesets/secondary/82D4C2C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/15.pal b/data/tilesets/secondary/82D4C2C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/2.pal b/data/tilesets/secondary/82D4C2C/palettes/2.pal
new file mode 100644
index 000000000..330e35b02
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+213 131 82
+156 205 246
+98 156 238
+57 123 222
+222 139 106
+189 98 74
diff --git a/data/tilesets/secondary/82D4C2C/palettes/3.pal b/data/tilesets/secondary/82D4C2C/palettes/3.pal
new file mode 100644
index 000000000..1520bed0b
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+148 148 148
+180 180 180
+255 255 255
+238 246 238
+222 238 222
+197 205 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+90 90 90
+115 106 98
+148 123 98
diff --git a/data/tilesets/secondary/82D4C2C/palettes/4.pal b/data/tilesets/secondary/82D4C2C/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/5.pal b/data/tilesets/secondary/82D4C2C/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/6.pal b/data/tilesets/secondary/82D4C2C/palettes/6.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/7.pal b/data/tilesets/secondary/82D4C2C/palettes/7.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C2C/palettes/8.pal b/data/tilesets/secondary/82D4C2C/palettes/8.pal
new file mode 100644
index 000000000..223737ab6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+106 98 74
+139 123 74
+164 139 74
+222 205 74
+123 123 123
+189 197 205
+238 246 238
+98 90 98
+156 131 106
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4C2C/palettes/9.pal b/data/tilesets/secondary/82D4C2C/palettes/9.pal
new file mode 100644
index 000000000..6de173f90
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+98 98 74
+164 139 82
+222 205 74
+255 0 255
+255 0 255
+213 213 156
+222 230 172
+246 246 238
+90 90 98
+115 115 106
+156 131 106
+205 131 82
+238 164 106
diff --git a/data/tilesets/secondary/82D4C2C/tiles.png b/data/tilesets/secondary/82D4C2C/tiles.png
new file mode 100644
index 000000000..9be5ebca9
--- /dev/null
+++ b/data/tilesets/secondary/82D4C2C/tiles.png
diff --git a/data/tilesets/secondary/82D4C44/metatile_attributes.bin b/data/tilesets/secondary/82D4C44/metatile_attributes.bin
new file mode 100644
index 000000000..53505839d
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C44/metatiles.bin b/data/tilesets/secondary/82D4C44/metatiles.bin
new file mode 100644
index 000000000..0e2f2a6c3
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C44/palettes/0.pal b/data/tilesets/secondary/82D4C44/palettes/0.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/1.pal b/data/tilesets/secondary/82D4C44/palettes/1.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/10.pal b/data/tilesets/secondary/82D4C44/palettes/10.pal
new file mode 100644
index 000000000..ab8f75e5a
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+123 123 148
+246 255 255
+205 213 213
+0 0 0
+255 123 123
+172 123 115
+139 230 98
+115 189 57
+246 230 24
+189 180 49
+148 148 246
+123 123 180
+222 222 255
+180 172 213
diff --git a/data/tilesets/secondary/82D4C44/palettes/11.pal b/data/tilesets/secondary/82D4C44/palettes/11.pal
new file mode 100644
index 000000000..468d7212c
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+49 57 74
+172 164 255
+131 123 230
+106 98 172
+82 74 180
+82 74 98
+246 255 255
+115 172 65
+123 189 74
+148 205 90
+98 90 148
+139 156 213
+57 57 106
+148 205 90
+0 255 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/12.pal b/data/tilesets/secondary/82D4C44/palettes/12.pal
new file mode 100644
index 000000000..05794ac82
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+197 238 255
+172 205 213
+131 164 180
+123 156 180
+98 139 148
+246 255 255
+164 123 115
+180 74 24
+213 98 49
+98 139 148
+172 205 213
+197 238 255
+156 222 115
+148 189 98
diff --git a/data/tilesets/secondary/82D4C44/palettes/13.pal b/data/tilesets/secondary/82D4C44/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/14.pal b/data/tilesets/secondary/82D4C44/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/15.pal b/data/tilesets/secondary/82D4C44/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/2.pal b/data/tilesets/secondary/82D4C44/palettes/2.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/3.pal b/data/tilesets/secondary/82D4C44/palettes/3.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/4.pal b/data/tilesets/secondary/82D4C44/palettes/4.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/5.pal b/data/tilesets/secondary/82D4C44/palettes/5.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/6.pal b/data/tilesets/secondary/82D4C44/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C44/palettes/7.pal b/data/tilesets/secondary/82D4C44/palettes/7.pal
new file mode 100644
index 000000000..00ca6903f
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+255 213 131
+246 180 82
+213 148 41
+180 172 148
+148 139 123
+255 255 222
+230 230 197
+180 74 24
+213 98 49
+90 156 139
+131 197 180
+172 230 205
+156 222 115
+148 189 106
diff --git a/data/tilesets/secondary/82D4C44/palettes/8.pal b/data/tilesets/secondary/82D4C44/palettes/8.pal
new file mode 100644
index 000000000..43d6db90d
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+230 238 255
+213 205 246
+164 164 180
+156 197 156
+106 156 139
+246 255 255
+0 0 0
+180 74 24
+213 98 49
+123 106 164
+156 156 197
+197 197 230
+156 222 115
+148 189 106
diff --git a/data/tilesets/secondary/82D4C44/palettes/9.pal b/data/tilesets/secondary/82D4C44/palettes/9.pal
new file mode 100644
index 000000000..87857607f
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+238 255 255
+213 222 238
+189 205 197
+156 164 172
+0 0 0
+189 139 90
+222 172 106
+246 189 115
+82 156 164
+115 197 222
+213 98 82
+246 148 131
+148 205 90
+49 131 24
diff --git a/data/tilesets/secondary/82D4C44/tiles.png b/data/tilesets/secondary/82D4C44/tiles.png
new file mode 100644
index 000000000..f71f29432
--- /dev/null
+++ b/data/tilesets/secondary/82D4C44/tiles.png
diff --git a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin b/data/tilesets/secondary/82D4C5C/metatile_attributes.bin
new file mode 100644
index 000000000..d1a4900c5
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C5C/metatiles.bin b/data/tilesets/secondary/82D4C5C/metatiles.bin
new file mode 100644
index 000000000..f1c0ab02d
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C5C/palettes/0.pal b/data/tilesets/secondary/82D4C5C/palettes/0.pal
new file mode 100644
index 000000000..4b44e19f4
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 156 156
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4C5C/palettes/1.pal b/data/tilesets/secondary/82D4C5C/palettes/1.pal
new file mode 100644
index 000000000..a39ca6aa8
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 156 156
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4C5C/palettes/10.pal b/data/tilesets/secondary/82D4C5C/palettes/10.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/11.pal b/data/tilesets/secondary/82D4C5C/palettes/11.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/12.pal b/data/tilesets/secondary/82D4C5C/palettes/12.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/13.pal b/data/tilesets/secondary/82D4C5C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/14.pal b/data/tilesets/secondary/82D4C5C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/15.pal b/data/tilesets/secondary/82D4C5C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/2.pal b/data/tilesets/secondary/82D4C5C/palettes/2.pal
new file mode 100644
index 000000000..5a4f127be
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 156 156
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4C5C/palettes/3.pal b/data/tilesets/secondary/82D4C5C/palettes/3.pal
new file mode 100644
index 000000000..c84fa4a58
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 156 156
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4C5C/palettes/4.pal b/data/tilesets/secondary/82D4C5C/palettes/4.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/5.pal b/data/tilesets/secondary/82D4C5C/palettes/5.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/6.pal b/data/tilesets/secondary/82D4C5C/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/7.pal b/data/tilesets/secondary/82D4C5C/palettes/7.pal
new file mode 100644
index 000000000..a71b8fee2
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+82 82 106
+131 131 139
+172 172 139
+205 205 180
+238 238 222
+131 148 139
+172 189 172
+205 205 205
+213 222 213
+255 255 255
+164 123 74
+189 148 98
+222 172 123
+172 180 106
+197 205 131
diff --git a/data/tilesets/secondary/82D4C5C/palettes/8.pal b/data/tilesets/secondary/82D4C5C/palettes/8.pal
new file mode 100644
index 000000000..0a666a9c9
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+65 74 106
+139 139 131
+197 197 197
+255 255 255
+0 0 0
+246 197 197
+74 74 213
+123 123 246
+180 180 0
+213 197 65
+246 246 32
+148 82 74
+205 49 41
+255 123 74
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/palettes/9.pal b/data/tilesets/secondary/82D4C5C/palettes/9.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C5C/tiles.png b/data/tilesets/secondary/82D4C5C/tiles.png
new file mode 100644
index 000000000..90124ff4a
--- /dev/null
+++ b/data/tilesets/secondary/82D4C5C/tiles.png
diff --git a/data/tilesets/secondary/82D4C74/metatile_attributes.bin b/data/tilesets/secondary/82D4C74/metatile_attributes.bin
new file mode 100644
index 000000000..be95e451c
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C74/metatiles.bin b/data/tilesets/secondary/82D4C74/metatiles.bin
new file mode 100644
index 000000000..806d040ce
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C74/palettes/0.pal b/data/tilesets/secondary/82D4C74/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4C74/palettes/1.pal b/data/tilesets/secondary/82D4C74/palettes/1.pal
new file mode 100644
index 000000000..69f3f0b9e
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+180 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+238 246 238
diff --git a/data/tilesets/secondary/82D4C74/palettes/10.pal b/data/tilesets/secondary/82D4C74/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/11.pal b/data/tilesets/secondary/82D4C74/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/12.pal b/data/tilesets/secondary/82D4C74/palettes/12.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/13.pal b/data/tilesets/secondary/82D4C74/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/14.pal b/data/tilesets/secondary/82D4C74/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/15.pal b/data/tilesets/secondary/82D4C74/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/2.pal b/data/tilesets/secondary/82D4C74/palettes/2.pal
new file mode 100644
index 000000000..c8ee236d7
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+255 0 255
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4C74/palettes/3.pal b/data/tilesets/secondary/82D4C74/palettes/3.pal
new file mode 100644
index 000000000..b17dbb054
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+164 164 164
+180 189 189
+255 255 255
+238 246 238
+213 230 222
+197 205 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/4.pal b/data/tilesets/secondary/82D4C74/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/5.pal b/data/tilesets/secondary/82D4C74/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/6.pal b/data/tilesets/secondary/82D4C74/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/palettes/7.pal b/data/tilesets/secondary/82D4C74/palettes/7.pal
new file mode 100644
index 000000000..c1e7c3d5c
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
diff --git a/data/tilesets/secondary/82D4C74/palettes/8.pal b/data/tilesets/secondary/82D4C74/palettes/8.pal
new file mode 100644
index 000000000..18480092b
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 222 156
+82 82 106
+115 123 131
+98 90 65
+139 123 82
+197 172 90
+230 230 238
+205 115 74
+238 172 82
+238 213 82
+131 189 57
+164 222 82
+156 139 172
+205 172 222
+213 205 230
+246 255 255
diff --git a/data/tilesets/secondary/82D4C74/palettes/9.pal b/data/tilesets/secondary/82D4C74/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C74/tiles.png b/data/tilesets/secondary/82D4C74/tiles.png
new file mode 100644
index 000000000..191287197
--- /dev/null
+++ b/data/tilesets/secondary/82D4C74/tiles.png
diff --git a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin b/data/tilesets/secondary/82D4C8C/metatile_attributes.bin
new file mode 100644
index 000000000..0d685881c
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C8C/metatiles.bin b/data/tilesets/secondary/82D4C8C/metatiles.bin
new file mode 100644
index 000000000..a7833446f
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C8C/palettes/0.pal b/data/tilesets/secondary/82D4C8C/palettes/0.pal
new file mode 100644
index 000000000..9fc16da3b
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 238 246
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4C8C/palettes/1.pal b/data/tilesets/secondary/82D4C8C/palettes/1.pal
new file mode 100644
index 000000000..76403e6d6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4C8C/palettes/10.pal b/data/tilesets/secondary/82D4C8C/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/palettes/11.pal b/data/tilesets/secondary/82D4C8C/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/palettes/12.pal b/data/tilesets/secondary/82D4C8C/palettes/12.pal
new file mode 100644
index 000000000..3c32c9fd4
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 238 246
+82 82 106
+139 131 148
+180 172 180
+189 197 213
+255 255 255
+139 197 139
+156 205 246
+98 156 238
+90 123 180
+222 205 106
+213 230 246
+255 189 180
+230 106 65
+255 131 115
+246 238 148
diff --git a/data/tilesets/secondary/82D4C8C/palettes/13.pal b/data/tilesets/secondary/82D4C8C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/palettes/14.pal b/data/tilesets/secondary/82D4C8C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/palettes/15.pal b/data/tilesets/secondary/82D4C8C/palettes/15.pal
new file mode 100644
index 000000000..92e7ed309
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/palettes/2.pal b/data/tilesets/secondary/82D4C8C/palettes/2.pal
new file mode 100644
index 000000000..b1ecd71dc
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4C8C/palettes/3.pal b/data/tilesets/secondary/82D4C8C/palettes/3.pal
new file mode 100644
index 000000000..43d9b60e3
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D4C8C/palettes/4.pal b/data/tilesets/secondary/82D4C8C/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/palettes/5.pal b/data/tilesets/secondary/82D4C8C/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/palettes/6.pal b/data/tilesets/secondary/82D4C8C/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/palettes/7.pal b/data/tilesets/secondary/82D4C8C/palettes/7.pal
new file mode 100644
index 000000000..3d7f8bd89
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 131 148
+180 172 180
+189 197 213
+255 255 255
+255 205 139
+230 164 98
+197 131 65
+172 90 24
+82 148 197
+131 189 222
+189 230 255
+123 123 123
+197 180 74
+246 238 148
diff --git a/data/tilesets/secondary/82D4C8C/palettes/8.pal b/data/tilesets/secondary/82D4C8C/palettes/8.pal
new file mode 100644
index 000000000..7fce49d06
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 131 148
+180 172 180
+189 197 213
+255 255 255
+222 222 180
+197 197 148
+156 156 106
+230 164 98
+172 90 24
+172 164 65
+139 123 24
+246 238 148
+0 0 0
+246 238 148
diff --git a/data/tilesets/secondary/82D4C8C/palettes/9.pal b/data/tilesets/secondary/82D4C8C/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4C8C/tiles.png b/data/tilesets/secondary/82D4C8C/tiles.png
new file mode 100644
index 000000000..6caeac8a8
--- /dev/null
+++ b/data/tilesets/secondary/82D4C8C/tiles.png
diff --git a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin b/data/tilesets/secondary/82D4CA4/metatile_attributes.bin
new file mode 100644
index 000000000..1b7a02c1f
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CA4/metatiles.bin b/data/tilesets/secondary/82D4CA4/metatiles.bin
new file mode 100644
index 000000000..25e3b6297
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CA4/palettes/0.pal b/data/tilesets/secondary/82D4CA4/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4CA4/palettes/1.pal b/data/tilesets/secondary/82D4CA4/palettes/1.pal
new file mode 100644
index 000000000..d99adafff
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4CA4/palettes/10.pal b/data/tilesets/secondary/82D4CA4/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/palettes/11.pal b/data/tilesets/secondary/82D4CA4/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/palettes/12.pal b/data/tilesets/secondary/82D4CA4/palettes/12.pal
new file mode 100644
index 000000000..ebfedc7d5
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+131 131 131
+180 180 164
+255 255 255
+172 131 115
+197 156 148
+238 180 164
+255 222 197
+255 238 238
+230 164 98
+255 197 98
+205 164 156
+180 139 123
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4CA4/palettes/13.pal b/data/tilesets/secondary/82D4CA4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/palettes/14.pal b/data/tilesets/secondary/82D4CA4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/palettes/15.pal b/data/tilesets/secondary/82D4CA4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/palettes/2.pal b/data/tilesets/secondary/82D4CA4/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4CA4/palettes/3.pal b/data/tilesets/secondary/82D4CA4/palettes/3.pal
new file mode 100644
index 000000000..7ec794ae5
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4CA4/palettes/4.pal b/data/tilesets/secondary/82D4CA4/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/palettes/5.pal b/data/tilesets/secondary/82D4CA4/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/palettes/6.pal b/data/tilesets/secondary/82D4CA4/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/palettes/7.pal b/data/tilesets/secondary/82D4CA4/palettes/7.pal
new file mode 100644
index 000000000..9020b628f
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+156 131 57
+213 197 106
+246 238 148
+213 222 238
+222 230 255
+41 106 82
+57 131 115
+172 131 115
+197 156 148
+238 180 164
+180 139 123
diff --git a/data/tilesets/secondary/82D4CA4/palettes/8.pal b/data/tilesets/secondary/82D4CA4/palettes/8.pal
new file mode 100644
index 000000000..1873ad439
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+156 131 57
+213 197 106
+246 238 148
+156 205 246
+115 172 222
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4CA4/palettes/9.pal b/data/tilesets/secondary/82D4CA4/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CA4/tiles.png b/data/tilesets/secondary/82D4CA4/tiles.png
new file mode 100644
index 000000000..cf2fa4ff7
--- /dev/null
+++ b/data/tilesets/secondary/82D4CA4/tiles.png
diff --git a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin b/data/tilesets/secondary/82D4CBC/metatile_attributes.bin
new file mode 100644
index 000000000..a84364708
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CBC/metatiles.bin b/data/tilesets/secondary/82D4CBC/metatiles.bin
new file mode 100644
index 000000000..2980877c1
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CBC/palettes/0.pal b/data/tilesets/secondary/82D4CBC/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4CBC/palettes/1.pal b/data/tilesets/secondary/82D4CBC/palettes/1.pal
new file mode 100644
index 000000000..3a16a45c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+238 246 238
diff --git a/data/tilesets/secondary/82D4CBC/palettes/10.pal b/data/tilesets/secondary/82D4CBC/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/11.pal b/data/tilesets/secondary/82D4CBC/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/12.pal b/data/tilesets/secondary/82D4CBC/palettes/12.pal
new file mode 100644
index 000000000..d2c6cb089
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+230 230 230
+255 255 255
+180 115 82
+213 156 123
+123 123 123
+106 156 148
+139 189 180
+180 222 213
+255 0 255
+213 213 213
+230 189 123
+246 197 156
diff --git a/data/tilesets/secondary/82D4CBC/palettes/13.pal b/data/tilesets/secondary/82D4CBC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/14.pal b/data/tilesets/secondary/82D4CBC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/15.pal b/data/tilesets/secondary/82D4CBC/palettes/15.pal
new file mode 100644
index 000000000..92e7ed309
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/2.pal b/data/tilesets/secondary/82D4CBC/palettes/2.pal
new file mode 100644
index 000000000..c8ee236d7
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+255 0 255
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4CBC/palettes/3.pal b/data/tilesets/secondary/82D4CBC/palettes/3.pal
new file mode 100644
index 000000000..b17dbb054
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+164 164 164
+180 189 189
+255 255 255
+238 246 238
+213 230 222
+197 205 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/4.pal b/data/tilesets/secondary/82D4CBC/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/5.pal b/data/tilesets/secondary/82D4CBC/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/6.pal b/data/tilesets/secondary/82D4CBC/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/palettes/7.pal b/data/tilesets/secondary/82D4CBC/palettes/7.pal
new file mode 100644
index 000000000..f55e52fe2
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 139 148
+197 189 213
+255 255 255
+205 197 106
+246 238 148
+255 255 222
+98 98 123
+238 238 238
+82 222 123
+131 255 164
+82 164 57
+255 0 255
+255 0 255
+172 106 74
diff --git a/data/tilesets/secondary/82D4CBC/palettes/8.pal b/data/tilesets/secondary/82D4CBC/palettes/8.pal
new file mode 100644
index 000000000..3a7dbc274
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 139 148
+197 189 213
+255 255 255
+222 222 238
+230 205 131
+189 197 82
+222 230 115
+238 230 148
+74 123 180
+131 131 139
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4CBC/palettes/9.pal b/data/tilesets/secondary/82D4CBC/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CBC/tiles.png b/data/tilesets/secondary/82D4CBC/tiles.png
new file mode 100644
index 000000000..b53b94b96
--- /dev/null
+++ b/data/tilesets/secondary/82D4CBC/tiles.png
diff --git a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin b/data/tilesets/secondary/82D4CD4/metatile_attributes.bin
new file mode 100644
index 000000000..6c4ffed21
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CD4/metatiles.bin b/data/tilesets/secondary/82D4CD4/metatiles.bin
new file mode 100644
index 000000000..af8effb11
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CD4/palettes/0.pal b/data/tilesets/secondary/82D4CD4/palettes/0.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/1.pal b/data/tilesets/secondary/82D4CD4/palettes/1.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/10.pal b/data/tilesets/secondary/82D4CD4/palettes/10.pal
new file mode 100644
index 000000000..432f42149
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+123 123 131
+189 189 164
+255 255 255
+213 197 74
+213 180 131
+148 115 41
+172 139 57
+213 213 180
+106 139 49
+131 172 74
+164 205 106
+197 255 172
+115 90 57
+255 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/11.pal b/data/tilesets/secondary/82D4CD4/palettes/11.pal
new file mode 100644
index 000000000..8c2460403
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+139 139 139
+189 189 164
+255 255 255
+222 197 74
+230 230 106
+230 222 246
+148 98 123
+197 131 156
+197 164 189
+123 164 189
+131 197 98
+172 238 139
+90 156 57
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/12.pal b/data/tilesets/secondary/82D4CD4/palettes/12.pal
new file mode 100644
index 000000000..920ad12c9
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+139 139 139
+180 180 164
+255 255 255
+189 180 49
+222 213 82
+123 115 49
+156 148 16
+213 213 180
+98 156 139
+123 180 189
+172 222 230
+255 205 139
+246 246 164
+222 131 90
diff --git a/data/tilesets/secondary/82D4CD4/palettes/13.pal b/data/tilesets/secondary/82D4CD4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/14.pal b/data/tilesets/secondary/82D4CD4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/15.pal b/data/tilesets/secondary/82D4CD4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/2.pal b/data/tilesets/secondary/82D4CD4/palettes/2.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/3.pal b/data/tilesets/secondary/82D4CD4/palettes/3.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/4.pal b/data/tilesets/secondary/82D4CD4/palettes/4.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/5.pal b/data/tilesets/secondary/82D4CD4/palettes/5.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/6.pal b/data/tilesets/secondary/82D4CD4/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/7.pal b/data/tilesets/secondary/82D4CD4/palettes/7.pal
new file mode 100644
index 000000000..533778712
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+139 139 139
+189 189 164
+255 255 255
+230 222 246
+255 238 213
+255 0 0
+115 115 164
+131 139 230
+164 164 255
+156 106 16
+115 115 139
+213 213 172
+222 172 82
+189 139 49
diff --git a/data/tilesets/secondary/82D4CD4/palettes/8.pal b/data/tilesets/secondary/82D4CD4/palettes/8.pal
new file mode 100644
index 000000000..0b01f1a0f
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+139 139 148
+180 180 164
+255 255 255
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+172 90 49
+205 98 57
+246 139 98
+255 205 139
+255 0 0
+255 0 0
+255 0 0
diff --git a/data/tilesets/secondary/82D4CD4/palettes/9.pal b/data/tilesets/secondary/82D4CD4/palettes/9.pal
new file mode 100644
index 000000000..371e5a211
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 74 106
+139 139 139
+189 189 164
+255 255 255
+230 222 246
+148 148 197
+189 189 246
+205 106 49
+246 180 49
+255 246 131
+255 0 0
+189 172 82
+213 205 98
+148 115 41
+172 139 57
diff --git a/data/tilesets/secondary/82D4CD4/tiles.png b/data/tilesets/secondary/82D4CD4/tiles.png
new file mode 100644
index 000000000..ef8a943fa
--- /dev/null
+++ b/data/tilesets/secondary/82D4CD4/tiles.png
diff --git a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin b/data/tilesets/secondary/82D4CEC/metatile_attributes.bin
new file mode 100644
index 000000000..a2bcd959e
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CEC/metatiles.bin b/data/tilesets/secondary/82D4CEC/metatiles.bin
new file mode 100644
index 000000000..1529f8582
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CEC/palettes/0.pal b/data/tilesets/secondary/82D4CEC/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4CEC/palettes/1.pal b/data/tilesets/secondary/82D4CEC/palettes/1.pal
new file mode 100644
index 000000000..d99adafff
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4CEC/palettes/10.pal b/data/tilesets/secondary/82D4CEC/palettes/10.pal
new file mode 100644
index 000000000..6d76050a9
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+230 230 230
+172 148 197
+205 164 230
+230 197 255
+238 230 123
+189 172 98
+255 255 148
+131 255 255
+74 131 197
+230 189 164
+255 0 255
diff --git a/data/tilesets/secondary/82D4CEC/palettes/11.pal b/data/tilesets/secondary/82D4CEC/palettes/11.pal
new file mode 100644
index 000000000..9359b8858
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+172 172 156
+230 230 205
+197 197 172
+172 172 164
+189 189 164
+255 0 255
+131 172 238
+106 197 106
+197 180 74
+255 0 255
+222 222 222
+213 139 57
+255 255 255
diff --git a/data/tilesets/secondary/82D4CEC/palettes/12.pal b/data/tilesets/secondary/82D4CEC/palettes/12.pal
new file mode 100644
index 000000000..61b3764be
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+222 238 255
+255 0 255
+255 0 255
+32 156 222
+139 197 255
+180 98 0
+197 123 0
+205 139 0
+213 164 0
+230 180 0
+230 197 65
diff --git a/data/tilesets/secondary/82D4CEC/palettes/13.pal b/data/tilesets/secondary/82D4CEC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CEC/palettes/14.pal b/data/tilesets/secondary/82D4CEC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CEC/palettes/15.pal b/data/tilesets/secondary/82D4CEC/palettes/15.pal
new file mode 100644
index 000000000..3bb14e445
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+230 230 205
+205 205 180
+172 172 148
+222 222 222
+156 115 197
+131 172 238
+106 197 106
+197 180 74
+0 0 0
+213 139 57
+238 222 131
+255 255 255
diff --git a/data/tilesets/secondary/82D4CEC/palettes/2.pal b/data/tilesets/secondary/82D4CEC/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4CEC/palettes/3.pal b/data/tilesets/secondary/82D4CEC/palettes/3.pal
new file mode 100644
index 000000000..7ec794ae5
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4CEC/palettes/4.pal b/data/tilesets/secondary/82D4CEC/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CEC/palettes/5.pal b/data/tilesets/secondary/82D4CEC/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CEC/palettes/6.pal b/data/tilesets/secondary/82D4CEC/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4CEC/palettes/7.pal b/data/tilesets/secondary/82D4CEC/palettes/7.pal
new file mode 100644
index 000000000..b3612e537
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+131 131 131
+180 180 164
+255 255 255
+255 164 115
+255 222 189
+123 164 238
+172 205 238
+213 230 238
+164 255 180
+238 164 0
+139 90 197
+213 156 255
+255 255 148
+255 0 255
diff --git a/data/tilesets/secondary/82D4CEC/palettes/8.pal b/data/tilesets/secondary/82D4CEC/palettes/8.pal
new file mode 100644
index 000000000..e58f94305
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 255 0
+82 82 106
+131 131 131
+180 180 164
+255 255 255
+255 255 123
+205 180 98
+246 230 172
+74 131 197
+139 197 255
+164 255 180
+238 246 246
+164 74 32
+213 115 57
+238 148 98
+255 189 98
diff --git a/data/tilesets/secondary/82D4CEC/palettes/9.pal b/data/tilesets/secondary/82D4CEC/palettes/9.pal
new file mode 100644
index 000000000..75f1d81b5
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+255 0 255
+255 0 255
+255 255 255
+255 0 255
+131 172 238
+246 230 172
+82 180 172
+32 115 123
+255 148 115
+230 106 90
+90 213 156
+255 189 82
+16 123 255
+131 189 246
diff --git a/data/tilesets/secondary/82D4CEC/tiles.png b/data/tilesets/secondary/82D4CEC/tiles.png
new file mode 100644
index 000000000..b5b249d0a
--- /dev/null
+++ b/data/tilesets/secondary/82D4CEC/tiles.png
diff --git a/data/tilesets/secondary/82D4D04/metatile_attributes.bin b/data/tilesets/secondary/82D4D04/metatile_attributes.bin
new file mode 100644
index 000000000..ead3610f0
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D04/metatiles.bin b/data/tilesets/secondary/82D4D04/metatiles.bin
new file mode 100644
index 000000000..7034bb6d6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D04/palettes/0.pal b/data/tilesets/secondary/82D4D04/palettes/0.pal
new file mode 100644
index 000000000..8db07d418
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4D04/palettes/1.pal b/data/tilesets/secondary/82D4D04/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4D04/palettes/10.pal b/data/tilesets/secondary/82D4D04/palettes/10.pal
new file mode 100644
index 000000000..131aaa71c
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4D04/palettes/11.pal b/data/tilesets/secondary/82D4D04/palettes/11.pal
new file mode 100644
index 000000000..131aaa71c
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4D04/palettes/12.pal b/data/tilesets/secondary/82D4D04/palettes/12.pal
new file mode 100644
index 000000000..c8dfac7d2
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+131 131 131
+98 74 49
+131 106 82
+164 139 115
+197 189 139
+148 148 156
+172 172 172
+172 189 115
+205 222 148
+98 131 131
+131 164 164
+164 197 197
+82 82 106
+123 123 139
+205 205 197
+255 255 255
diff --git a/data/tilesets/secondary/82D4D04/palettes/13.pal b/data/tilesets/secondary/82D4D04/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D04/palettes/14.pal b/data/tilesets/secondary/82D4D04/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D04/palettes/15.pal b/data/tilesets/secondary/82D4D04/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D04/palettes/2.pal b/data/tilesets/secondary/82D4D04/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4D04/palettes/3.pal b/data/tilesets/secondary/82D4D04/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D4D04/palettes/4.pal b/data/tilesets/secondary/82D4D04/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/secondary/82D4D04/palettes/5.pal b/data/tilesets/secondary/82D4D04/palettes/5.pal
new file mode 100644
index 000000000..0eef3df8e
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+255 0 255
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4D04/palettes/6.pal b/data/tilesets/secondary/82D4D04/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D04/palettes/7.pal b/data/tilesets/secondary/82D4D04/palettes/7.pal
new file mode 100644
index 000000000..34c0ddd17
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+131 131 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+82 82 106
+123 123 139
+205 205 197
+255 255 255
diff --git a/data/tilesets/secondary/82D4D04/palettes/8.pal b/data/tilesets/secondary/82D4D04/palettes/8.pal
new file mode 100644
index 000000000..77e03a48c
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+172 172 164
+222 213 139
+180 172 98
+156 148 82
+213 255 197
+164 230 148
+123 172 148
+148 213 164
+156 74 41
+180 90 65
+213 131 106
+238 164 139
+246 238 205
diff --git a/data/tilesets/secondary/82D4D04/palettes/9.pal b/data/tilesets/secondary/82D4D04/palettes/9.pal
new file mode 100644
index 000000000..ef91ae987
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+172 172 164
+156 189 131
+222 205 115
+156 148 82
+123 106 57
+74 131 164
+98 172 205
+49 139 49
+106 205 164
+156 148 82
+115 164 106
+205 230 197
+238 255 238
diff --git a/data/tilesets/secondary/82D4D04/tiles.png b/data/tilesets/secondary/82D4D04/tiles.png
new file mode 100644
index 000000000..6e97a68a1
--- /dev/null
+++ b/data/tilesets/secondary/82D4D04/tiles.png
diff --git a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin b/data/tilesets/secondary/82D4D1C/metatile_attributes.bin
new file mode 100644
index 000000000..84b5e2049
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D1C/metatiles.bin b/data/tilesets/secondary/82D4D1C/metatiles.bin
new file mode 100644
index 000000000..c026eb65a
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D1C/palettes/0.pal b/data/tilesets/secondary/82D4D1C/palettes/0.pal
new file mode 100644
index 000000000..4b44e19f4
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 156 156
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4D1C/palettes/1.pal b/data/tilesets/secondary/82D4D1C/palettes/1.pal
new file mode 100644
index 000000000..a39ca6aa8
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 156 156
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4D1C/palettes/10.pal b/data/tilesets/secondary/82D4D1C/palettes/10.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/11.pal b/data/tilesets/secondary/82D4D1C/palettes/11.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/12.pal b/data/tilesets/secondary/82D4D1C/palettes/12.pal
new file mode 100644
index 000000000..419c00911
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+123 164 172
+222 189 172
+246 213 189
+246 230 180
+255 246 213
+164 189 213
+189 205 230
+222 230 246
+98 123 148
+123 148 172
+148 172 197
+98 98 123
+148 139 131
+205 189 197
+255 255 255
diff --git a/data/tilesets/secondary/82D4D1C/palettes/13.pal b/data/tilesets/secondary/82D4D1C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/14.pal b/data/tilesets/secondary/82D4D1C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/15.pal b/data/tilesets/secondary/82D4D1C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/2.pal b/data/tilesets/secondary/82D4D1C/palettes/2.pal
new file mode 100644
index 000000000..5a4f127be
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 156 156
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4D1C/palettes/3.pal b/data/tilesets/secondary/82D4D1C/palettes/3.pal
new file mode 100644
index 000000000..c84fa4a58
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 156 156
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4D1C/palettes/4.pal b/data/tilesets/secondary/82D4D1C/palettes/4.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/5.pal b/data/tilesets/secondary/82D4D1C/palettes/5.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/6.pal b/data/tilesets/secondary/82D4D1C/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/7.pal b/data/tilesets/secondary/82D4D1C/palettes/7.pal
new file mode 100644
index 000000000..aac016a72
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+156 205 246
+98 156 238
+0 0 0
+0 0 0
+123 164 172
+148 189 197
+172 205 213
+205 222 230
+98 123 148
+123 148 172
+148 172 197
+98 98 123
+148 139 131
+222 205 213
+255 255 255
diff --git a/data/tilesets/secondary/82D4D1C/palettes/8.pal b/data/tilesets/secondary/82D4D1C/palettes/8.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/palettes/9.pal b/data/tilesets/secondary/82D4D1C/palettes/9.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D1C/tiles.png b/data/tilesets/secondary/82D4D1C/tiles.png
new file mode 100644
index 000000000..44b7c0c34
--- /dev/null
+++ b/data/tilesets/secondary/82D4D1C/tiles.png
diff --git a/data/tilesets/secondary/82D4D34/metatile_attributes.bin b/data/tilesets/secondary/82D4D34/metatile_attributes.bin
new file mode 100644
index 000000000..a5e733de0
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D34/metatiles.bin b/data/tilesets/secondary/82D4D34/metatiles.bin
new file mode 100644
index 000000000..25a46724b
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D34/palettes/0.pal b/data/tilesets/secondary/82D4D34/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4D34/palettes/1.pal b/data/tilesets/secondary/82D4D34/palettes/1.pal
new file mode 100644
index 000000000..d99adafff
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4D34/palettes/10.pal b/data/tilesets/secondary/82D4D34/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/11.pal b/data/tilesets/secondary/82D4D34/palettes/11.pal
new file mode 100644
index 000000000..9fa42f21f
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+65 74 106
+90 90 115
+123 123 131
+148 164 180
+172 189 205
+205 222 238
+246 246 255
+255 0 255
+255 0 255
+205 82 65
+255 131 115
+230 172 57
+222 213 0
+222 180 65
+255 222 98
diff --git a/data/tilesets/secondary/82D4D34/palettes/12.pal b/data/tilesets/secondary/82D4D34/palettes/12.pal
new file mode 100644
index 000000000..5e2756cc9
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+131 131 131
+180 180 164
+255 255 255
+222 180 65
+238 197 82
+189 148 49
+246 238 164
+213 213 222
+156 156 205
+180 180 246
+82 106 156
+123 148 197
+189 197 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/13.pal b/data/tilesets/secondary/82D4D34/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/14.pal b/data/tilesets/secondary/82D4D34/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/15.pal b/data/tilesets/secondary/82D4D34/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/2.pal b/data/tilesets/secondary/82D4D34/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4D34/palettes/3.pal b/data/tilesets/secondary/82D4D34/palettes/3.pal
new file mode 100644
index 000000000..7ec794ae5
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4D34/palettes/4.pal b/data/tilesets/secondary/82D4D34/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/5.pal b/data/tilesets/secondary/82D4D34/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/6.pal b/data/tilesets/secondary/82D4D34/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/7.pal b/data/tilesets/secondary/82D4D34/palettes/7.pal
new file mode 100644
index 000000000..efd64bcc5
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+32 180 230
+172 255 230
+189 189 115
+238 222 164
+255 255 180
+205 82 65
+255 131 115
+189 180 106
+205 197 123
+222 222 148
+164 164 98
diff --git a/data/tilesets/secondary/82D4D34/palettes/8.pal b/data/tilesets/secondary/82D4D34/palettes/8.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/palettes/9.pal b/data/tilesets/secondary/82D4D34/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D34/tiles.png b/data/tilesets/secondary/82D4D34/tiles.png
new file mode 100644
index 000000000..1baac0893
--- /dev/null
+++ b/data/tilesets/secondary/82D4D34/tiles.png
diff --git a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin b/data/tilesets/secondary/82D4D4C/metatile_attributes.bin
new file mode 100644
index 000000000..def1ee695
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D4C/metatiles.bin b/data/tilesets/secondary/82D4D4C/metatiles.bin
new file mode 100644
index 000000000..f3f58a44d
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D4C/palettes/0.pal b/data/tilesets/secondary/82D4D4C/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4D4C/palettes/1.pal b/data/tilesets/secondary/82D4D4C/palettes/1.pal
new file mode 100644
index 000000000..69f3f0b9e
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+180 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+238 246 238
diff --git a/data/tilesets/secondary/82D4D4C/palettes/10.pal b/data/tilesets/secondary/82D4D4C/palettes/10.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/11.pal b/data/tilesets/secondary/82D4D4C/palettes/11.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/12.pal b/data/tilesets/secondary/82D4D4C/palettes/12.pal
new file mode 100644
index 000000000..041512724
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+41 123 123
+41 156 156
+49 189 172
+65 230 189
+65 246 230
+106 90 74
+131 106 74
+156 131 65
+172 156 74
+172 156 106
+205 180 106
+222 205 98
+230 222 106
diff --git a/data/tilesets/secondary/82D4D4C/palettes/13.pal b/data/tilesets/secondary/82D4D4C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/14.pal b/data/tilesets/secondary/82D4D4C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/15.pal b/data/tilesets/secondary/82D4D4C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/2.pal b/data/tilesets/secondary/82D4D4C/palettes/2.pal
new file mode 100644
index 000000000..330e35b02
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+213 131 82
+156 205 246
+98 156 238
+57 123 222
+222 139 106
+189 98 74
diff --git a/data/tilesets/secondary/82D4D4C/palettes/3.pal b/data/tilesets/secondary/82D4D4C/palettes/3.pal
new file mode 100644
index 000000000..eac8236f1
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+148 148 148
+180 180 180
+255 255 255
+238 246 238
+222 238 222
+197 205 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/4.pal b/data/tilesets/secondary/82D4D4C/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/5.pal b/data/tilesets/secondary/82D4D4C/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/6.pal b/data/tilesets/secondary/82D4D4C/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D4C/palettes/7.pal b/data/tilesets/secondary/82D4D4C/palettes/7.pal
new file mode 100644
index 000000000..9d84ecaba
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 139 148
+74 156 90
+65 139 139
+115 205 90
+148 238 74
+189 255 98
+156 131 82
+197 115 123
+255 164 123
+238 238 172
+82 115 82
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4D4C/palettes/8.pal b/data/tilesets/secondary/82D4D4C/palettes/8.pal
new file mode 100644
index 000000000..085c49344
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 139 148
+222 213 246
+238 238 255
+123 156 246
+106 197 255
+131 222 255
+156 230 255
+115 90 98
+189 115 131
+246 189 115
+222 189 246
+255 230 115
+90 98 213
+255 172 197
diff --git a/data/tilesets/secondary/82D4D4C/palettes/9.pal b/data/tilesets/secondary/82D4D4C/palettes/9.pal
new file mode 100644
index 000000000..9020b628f
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+156 131 57
+213 197 106
+246 238 148
+213 222 238
+222 230 255
+41 106 82
+57 131 115
+172 131 115
+197 156 148
+238 180 164
+180 139 123
diff --git a/data/tilesets/secondary/82D4D4C/tiles.png b/data/tilesets/secondary/82D4D4C/tiles.png
new file mode 100644
index 000000000..ef08ccc83
--- /dev/null
+++ b/data/tilesets/secondary/82D4D4C/tiles.png
diff --git a/data/tilesets/secondary/82D4D64/metatile_attributes.bin b/data/tilesets/secondary/82D4D64/metatile_attributes.bin
new file mode 100644
index 000000000..ee895c35a
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D64/metatiles.bin b/data/tilesets/secondary/82D4D64/metatiles.bin
new file mode 100644
index 000000000..e0fdb79fb
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D64/palettes/0.pal b/data/tilesets/secondary/82D4D64/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4D64/palettes/1.pal b/data/tilesets/secondary/82D4D64/palettes/1.pal
new file mode 100644
index 000000000..3a16a45c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+238 246 238
diff --git a/data/tilesets/secondary/82D4D64/palettes/10.pal b/data/tilesets/secondary/82D4D64/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/11.pal b/data/tilesets/secondary/82D4D64/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/12.pal b/data/tilesets/secondary/82D4D64/palettes/12.pal
new file mode 100644
index 000000000..702c67ecb
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 131
+197 189 213
+255 255 255
+148 148 156
+180 139 222
+205 172 246
+222 205 255
+106 123 172
+131 148 197
+156 172 230
+65 205 82
+180 255 197
+246 164 115
+255 230 148
diff --git a/data/tilesets/secondary/82D4D64/palettes/13.pal b/data/tilesets/secondary/82D4D64/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/14.pal b/data/tilesets/secondary/82D4D64/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/15.pal b/data/tilesets/secondary/82D4D64/palettes/15.pal
new file mode 100644
index 000000000..92e7ed309
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/2.pal b/data/tilesets/secondary/82D4D64/palettes/2.pal
new file mode 100644
index 000000000..c8ee236d7
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+255 0 255
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4D64/palettes/3.pal b/data/tilesets/secondary/82D4D64/palettes/3.pal
new file mode 100644
index 000000000..b17dbb054
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+164 164 164
+180 189 189
+255 255 255
+238 246 238
+213 230 222
+197 205 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/4.pal b/data/tilesets/secondary/82D4D64/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/5.pal b/data/tilesets/secondary/82D4D64/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/6.pal b/data/tilesets/secondary/82D4D64/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/7.pal b/data/tilesets/secondary/82D4D64/palettes/7.pal
new file mode 100644
index 000000000..c66eaedff
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 131
+197 189 213
+255 255 255
+180 123 148
+230 139 230
+255 222 255
+213 213 222
+213 98 65
+246 139 106
+255 0 255
+255 0 255
+255 0 255
+205 246 255
+98 197 238
diff --git a/data/tilesets/secondary/82D4D64/palettes/8.pal b/data/tilesets/secondary/82D4D64/palettes/8.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/palettes/9.pal b/data/tilesets/secondary/82D4D64/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D64/tiles.png b/data/tilesets/secondary/82D4D64/tiles.png
new file mode 100644
index 000000000..87641a309
--- /dev/null
+++ b/data/tilesets/secondary/82D4D64/tiles.png
diff --git a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin b/data/tilesets/secondary/82D4D7C/metatile_attributes.bin
new file mode 100644
index 000000000..1d68a40a4
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D7C/metatiles.bin b/data/tilesets/secondary/82D4D7C/metatiles.bin
new file mode 100644
index 000000000..7a5532619
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D7C/palettes/0.pal b/data/tilesets/secondary/82D4D7C/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4D7C/palettes/1.pal b/data/tilesets/secondary/82D4D7C/palettes/1.pal
new file mode 100644
index 000000000..69f3f0b9e
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+180 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+238 246 238
diff --git a/data/tilesets/secondary/82D4D7C/palettes/10.pal b/data/tilesets/secondary/82D4D7C/palettes/10.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/11.pal b/data/tilesets/secondary/82D4D7C/palettes/11.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/12.pal b/data/tilesets/secondary/82D4D7C/palettes/12.pal
new file mode 100644
index 000000000..3f9aa94d6
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+106 90 82
+148 115 82
+172 131 90
+213 172 90
+230 180 90
+164 90 172
+197 115 205
+230 148 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4D7C/palettes/13.pal b/data/tilesets/secondary/82D4D7C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/14.pal b/data/tilesets/secondary/82D4D7C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/15.pal b/data/tilesets/secondary/82D4D7C/palettes/15.pal
new file mode 100644
index 000000000..92e7ed309
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/2.pal b/data/tilesets/secondary/82D4D7C/palettes/2.pal
new file mode 100644
index 000000000..330e35b02
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+213 131 82
+156 205 246
+98 156 238
+57 123 222
+222 139 106
+189 98 74
diff --git a/data/tilesets/secondary/82D4D7C/palettes/3.pal b/data/tilesets/secondary/82D4D7C/palettes/3.pal
new file mode 100644
index 000000000..eac8236f1
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+148 148 148
+180 180 180
+255 255 255
+238 246 238
+222 238 222
+197 205 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/4.pal b/data/tilesets/secondary/82D4D7C/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/5.pal b/data/tilesets/secondary/82D4D7C/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/6.pal b/data/tilesets/secondary/82D4D7C/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/palettes/7.pal b/data/tilesets/secondary/82D4D7C/palettes/7.pal
new file mode 100644
index 000000000..5b659ef1b
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 139 148
+180 156 172
+205 189 189
+230 222 189
+90 115 90
+131 197 115
+205 238 115
+123 82 74
+180 98 98
+255 139 74
+238 246 172
+255 230 74
+106 90 82
+255 0 255
diff --git a/data/tilesets/secondary/82D4D7C/palettes/8.pal b/data/tilesets/secondary/82D4D7C/palettes/8.pal
new file mode 100644
index 000000000..f5a4ee678
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 139 148
+205 189 189
+246 246 255
+148 131 180
+205 189 230
+123 98 255
+82 172 148
+255 98 98
+90 115 90
+131 197 115
+205 238 115
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4D7C/palettes/9.pal b/data/tilesets/secondary/82D4D7C/palettes/9.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D7C/tiles.png b/data/tilesets/secondary/82D4D7C/tiles.png
new file mode 100644
index 000000000..213799158
--- /dev/null
+++ b/data/tilesets/secondary/82D4D7C/tiles.png
diff --git a/data/tilesets/secondary/82D4D94/metatile_attributes.bin b/data/tilesets/secondary/82D4D94/metatile_attributes.bin
new file mode 100644
index 000000000..949846f90
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D94/metatiles.bin b/data/tilesets/secondary/82D4D94/metatiles.bin
new file mode 100644
index 000000000..a976297b3
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/palettes/0.pal b/data/tilesets/secondary/82D4D94/palettes/0.pal
new file mode 100644
index 000000000..28232d99e
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4D94/palettes/1.pal b/data/tilesets/secondary/82D4D94/palettes/1.pal
new file mode 100644
index 000000000..b43532470
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4D94/palettes/10.pal b/data/tilesets/secondary/82D4D94/palettes/10.pal
new file mode 100644
index 000000000..2a1743eaa
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4D94/palettes/11.pal b/data/tilesets/secondary/82D4D94/palettes/11.pal
new file mode 100644
index 000000000..307e0ea7e
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4D94/palettes/12.pal b/data/tilesets/secondary/82D4D94/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D94/palettes/13.pal b/data/tilesets/secondary/82D4D94/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D94/palettes/14.pal b/data/tilesets/secondary/82D4D94/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D94/palettes/15.pal b/data/tilesets/secondary/82D4D94/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4D94/palettes/2.pal b/data/tilesets/secondary/82D4D94/palettes/2.pal
new file mode 100644
index 000000000..e267ae90e
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4D94/palettes/3.pal b/data/tilesets/secondary/82D4D94/palettes/3.pal
new file mode 100644
index 000000000..503f22878
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4D94/palettes/4.pal b/data/tilesets/secondary/82D4D94/palettes/4.pal
new file mode 100644
index 000000000..cdf1b6190
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+222 255 255
+172 222 255
+148 189 238
+106 156 230
+57 148 197
+32 131 172
+82 148 213
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+230 213 148
+238 230 139
+222 197 139
+213 189 106
diff --git a/data/tilesets/secondary/82D4D94/palettes/5.pal b/data/tilesets/secondary/82D4D94/palettes/5.pal
new file mode 100644
index 000000000..09555ded5
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4D94/palettes/6.pal b/data/tilesets/secondary/82D4D94/palettes/6.pal
new file mode 100644
index 000000000..0dba59a72
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+222 255 255
+172 222 255
+148 189 238
+106 156 230
+41 90 172
+41 57 148
+74 123 197
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+230 213 148
+238 230 139
+222 197 139
+213 189 106
diff --git a/data/tilesets/secondary/82D4D94/palettes/7.pal b/data/tilesets/secondary/82D4D94/palettes/7.pal
new file mode 100644
index 000000000..e9848a1c0
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+82 82 106
+115 115 139
+148 148 172
+189 189 205
+222 222 230
+255 255 255
+180 180 74
+205 205 98
+255 255 98
+98 98 172
+131 131 213
+164 164 255
+131 98 41
+164 139 82
+205 180 123
diff --git a/data/tilesets/secondary/82D4D94/palettes/8.pal b/data/tilesets/secondary/82D4D94/palettes/8.pal
new file mode 100644
index 000000000..b5c80c8f4
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+90 156 57
+131 180 49
+172 205 49
+197 230 98
+222 255 148
+222 172 98
+255 197 98
+255 222 156
+131 98 41
+164 139 82
+205 180 123
diff --git a/data/tilesets/secondary/82D4D94/palettes/9.pal b/data/tilesets/secondary/82D4D94/palettes/9.pal
new file mode 100644
index 000000000..b66b2399a
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+255 0 255
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+255 0 255
+255 0 255
+255 0 255
+131 98 41
+164 139 82
+205 180 123
diff --git a/data/tilesets/secondary/82D4D94/tiles.png b/data/tilesets/secondary/82D4D94/tiles.png
new file mode 100644
index 000000000..280f3e227
--- /dev/null
+++ b/data/tilesets/secondary/82D4D94/tiles.png
diff --git a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin b/data/tilesets/secondary/82D4DAC/metatile_attributes.bin
new file mode 100644
index 000000000..1b1cb4d44
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DAC/metatiles.bin b/data/tilesets/secondary/82D4DAC/metatiles.bin
new file mode 100644
index 000000000..c15edf653
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DAC/palettes/0.pal b/data/tilesets/secondary/82D4DAC/palettes/0.pal
new file mode 100644
index 000000000..0fd74602e
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+189 189 131
+115 189 246
+98 172 238
+115 189 246
+98 164 222
+82 139 197
+74 115 172
+115 197 164
diff --git a/data/tilesets/secondary/82D4DAC/palettes/1.pal b/data/tilesets/secondary/82D4DAC/palettes/1.pal
new file mode 100644
index 000000000..3c6e40c2e
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+115 189 246
+98 172 238
+255 189 131
+238 148 115
+222 106 98
+205 65 82
+115 197 164
diff --git a/data/tilesets/secondary/82D4DAC/palettes/10.pal b/data/tilesets/secondary/82D4DAC/palettes/10.pal
new file mode 100644
index 000000000..cd86ca4ae
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+82 82 106
+148 148 164
+205 189 197
+255 255 255
+222 213 230
+189 172 180
+255 205 106
+230 189 106
+205 156 82
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+57 139 49
+106 106 123
diff --git a/data/tilesets/secondary/82D4DAC/palettes/11.pal b/data/tilesets/secondary/82D4DAC/palettes/11.pal
new file mode 100644
index 000000000..ec8e2f42d
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 74 98
+106 106 115
+0 0 0
+0 0 0
+148 106 57
+189 139 57
+213 189 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DAC/palettes/12.pal b/data/tilesets/secondary/82D4DAC/palettes/12.pal
new file mode 100644
index 000000000..5caa038ad
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 255 255
+213 222 246
+164 172 222
+98 98 123
+65 74 106
+238 213 205
+222 172 164
+205 131 123
+189 98 82
+222 222 222
+172 180 189
+139 148 164
+106 123 123
+222 74 0
+213 213 57
diff --git a/data/tilesets/secondary/82D4DAC/palettes/13.pal b/data/tilesets/secondary/82D4DAC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DAC/palettes/14.pal b/data/tilesets/secondary/82D4DAC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DAC/palettes/15.pal b/data/tilesets/secondary/82D4DAC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DAC/palettes/2.pal b/data/tilesets/secondary/82D4DAC/palettes/2.pal
new file mode 100644
index 000000000..4c41030f6
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+180 255 131
+131 197 98
+57 139 49
+57 82 0
+222 148 115
+106 90 90
+164 98 90
+65 57 49
+255 197 148
+222 106 98
+205 65 82
+164 213 197
+115 197 164
+65 180 131
+24 164 106
diff --git a/data/tilesets/secondary/82D4DAC/palettes/3.pal b/data/tilesets/secondary/82D4DAC/palettes/3.pal
new file mode 100644
index 000000000..5665ddc22
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+213 213 213
+189 189 189
+164 164 164
+131 131 139
+65 180 131
+164 213 197
+65 49 65
+238 213 205
+222 180 164
+189 148 139
+156 115 115
+131 90 90
+98 65 82
+115 197 164
diff --git a/data/tilesets/secondary/82D4DAC/palettes/4.pal b/data/tilesets/secondary/82D4DAC/palettes/4.pal
new file mode 100644
index 000000000..d8051b7ba
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+255 0 255
+255 0 255
+255 0 255
+156 164 189
+82 106 213
+65 90 189
+57 82 156
+41 65 139
+172 197 230
+139 164 222
+106 131 213
+82 106 213
+115 197 164
diff --git a/data/tilesets/secondary/82D4DAC/palettes/5.pal b/data/tilesets/secondary/82D4DAC/palettes/5.pal
new file mode 100644
index 000000000..4e684594c
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+131 197 246
+106 180 222
+238 230 164
+222 205 131
+213 180 106
+205 156 82
+115 197 164
diff --git a/data/tilesets/secondary/82D4DAC/palettes/6.pal b/data/tilesets/secondary/82D4DAC/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DAC/palettes/7.pal b/data/tilesets/secondary/82D4DAC/palettes/7.pal
new file mode 100644
index 000000000..2064b3bd2
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 255 255
+238 222 172
+230 156 98
+197 90 65
+65 74 106
+106 106 123
+131 90 49
+90 65 49
+57 57 57
+222 222 197
+172 180 148
+131 148 115
+106 123 65
+156 205 230
+156 156 156
diff --git a/data/tilesets/secondary/82D4DAC/palettes/8.pal b/data/tilesets/secondary/82D4DAC/palettes/8.pal
new file mode 100644
index 000000000..42a3483c0
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 255 255
+213 222 246
+131 131 139
+98 98 123
+65 74 106
+164 205 189
+139 180 172
+115 156 139
+98 139 131
+189 172 180
+156 139 148
+230 106 57
+205 49 24
+148 57 24
+0 0 0
diff --git a/data/tilesets/secondary/82D4DAC/palettes/9.pal b/data/tilesets/secondary/82D4DAC/palettes/9.pal
new file mode 100644
index 000000000..b06dfbda7
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 255 255
+213 222 246
+164 172 222
+98 98 123
+65 74 106
+98 98 123
+65 74 106
+115 123 164
+49 49 74
+189 238 180
+106 222 115
+74 180 98
+57 131 82
+131 197 230
+98 156 172
diff --git a/data/tilesets/secondary/82D4DAC/tiles.png b/data/tilesets/secondary/82D4DAC/tiles.png
new file mode 100644
index 000000000..c00ba0d61
--- /dev/null
+++ b/data/tilesets/secondary/82D4DAC/tiles.png
diff --git a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin b/data/tilesets/secondary/82D4DC4/metatile_attributes.bin
new file mode 100644
index 000000000..990d6861c
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DC4/metatiles.bin b/data/tilesets/secondary/82D4DC4/metatiles.bin
new file mode 100644
index 000000000..cd0bd5f53
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DC4/palettes/0.pal b/data/tilesets/secondary/82D4DC4/palettes/0.pal
new file mode 100644
index 000000000..7af5bb7d2
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4DC4/palettes/1.pal b/data/tilesets/secondary/82D4DC4/palettes/1.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D4DC4/palettes/10.pal b/data/tilesets/secondary/82D4DC4/palettes/10.pal
new file mode 100644
index 000000000..746437492
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+222 230 246
+189 197 222
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+49 139 49
+57 82 0
+49 180 98
+238 230 164
+222 205 131
+213 180 106
+205 156 82
+106 205 164
diff --git a/data/tilesets/secondary/82D4DC4/palettes/11.pal b/data/tilesets/secondary/82D4DC4/palettes/11.pal
new file mode 100644
index 000000000..410d5193a
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4DC4/palettes/12.pal b/data/tilesets/secondary/82D4DC4/palettes/12.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DC4/palettes/13.pal b/data/tilesets/secondary/82D4DC4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DC4/palettes/14.pal b/data/tilesets/secondary/82D4DC4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DC4/palettes/15.pal b/data/tilesets/secondary/82D4DC4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DC4/palettes/2.pal b/data/tilesets/secondary/82D4DC4/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4DC4/palettes/3.pal b/data/tilesets/secondary/82D4DC4/palettes/3.pal
new file mode 100644
index 000000000..9581f2cd8
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 131
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4DC4/palettes/4.pal b/data/tilesets/secondary/82D4DC4/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4DC4/palettes/5.pal b/data/tilesets/secondary/82D4DC4/palettes/5.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4DC4/palettes/6.pal b/data/tilesets/secondary/82D4DC4/palettes/6.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4DC4/palettes/7.pal b/data/tilesets/secondary/82D4DC4/palettes/7.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DC4/palettes/8.pal b/data/tilesets/secondary/82D4DC4/palettes/8.pal
new file mode 100644
index 000000000..650a35cc8
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+57 115 24
+98 65 74
+131 106 82
+65 57 49
+255 0 255
+255 0 255
+255 0 255
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4DC4/palettes/9.pal b/data/tilesets/secondary/82D4DC4/palettes/9.pal
new file mode 100644
index 000000000..df2d04037
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+213 230 189
+57 172 131
+222 230 246
+230 172 123
+106 205 164
diff --git a/data/tilesets/secondary/82D4DC4/tiles.png b/data/tilesets/secondary/82D4DC4/tiles.png
new file mode 100644
index 000000000..451eb8d5a
--- /dev/null
+++ b/data/tilesets/secondary/82D4DC4/tiles.png
diff --git a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin b/data/tilesets/secondary/82D4DDC/metatile_attributes.bin
new file mode 100644
index 000000000..3549eaa93
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DDC/metatiles.bin b/data/tilesets/secondary/82D4DDC/metatiles.bin
new file mode 100644
index 000000000..ea1398be3
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DDC/palettes/0.pal b/data/tilesets/secondary/82D4DDC/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4DDC/palettes/1.pal b/data/tilesets/secondary/82D4DDC/palettes/1.pal
new file mode 100644
index 000000000..d99adafff
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4DDC/palettes/10.pal b/data/tilesets/secondary/82D4DDC/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/palettes/11.pal b/data/tilesets/secondary/82D4DDC/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/palettes/12.pal b/data/tilesets/secondary/82D4DDC/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/palettes/13.pal b/data/tilesets/secondary/82D4DDC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/palettes/14.pal b/data/tilesets/secondary/82D4DDC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/palettes/15.pal b/data/tilesets/secondary/82D4DDC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/palettes/2.pal b/data/tilesets/secondary/82D4DDC/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4DDC/palettes/3.pal b/data/tilesets/secondary/82D4DDC/palettes/3.pal
new file mode 100644
index 000000000..7ec794ae5
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4DDC/palettes/4.pal b/data/tilesets/secondary/82D4DDC/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/palettes/5.pal b/data/tilesets/secondary/82D4DDC/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/palettes/6.pal b/data/tilesets/secondary/82D4DDC/palettes/6.pal
new file mode 100644
index 000000000..2903bb074
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+131 131 131
+180 180 164
+255 255 255
+189 164 82
+222 197 106
+230 222 156
+123 197 189
+156 222 213
+213 255 246
+255 0 255
+255 0 255
+213 131 65
+222 230 222
+246 238 189
diff --git a/data/tilesets/secondary/82D4DDC/palettes/7.pal b/data/tilesets/secondary/82D4DDC/palettes/7.pal
new file mode 100644
index 000000000..c62a40b0d
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+148 172 139
+180 197 164
+213 222 197
+238 255 213
+115 156 180
+197 222 238
+123 197 189
+156 222 213
+213 255 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4DDC/palettes/8.pal b/data/tilesets/secondary/82D4DDC/palettes/8.pal
new file mode 100644
index 000000000..8c66b4998
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+230 222 156
+189 98 74
+230 156 98
+213 205 156
+115 156 180
+246 238 189
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4DDC/palettes/9.pal b/data/tilesets/secondary/82D4DDC/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DDC/tiles.png b/data/tilesets/secondary/82D4DDC/tiles.png
new file mode 100644
index 000000000..6d376f447
--- /dev/null
+++ b/data/tilesets/secondary/82D4DDC/tiles.png
diff --git a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin b/data/tilesets/secondary/82D4DF4/metatile_attributes.bin
new file mode 100644
index 000000000..96ef6a853
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DF4/metatiles.bin b/data/tilesets/secondary/82D4DF4/metatiles.bin
new file mode 100644
index 000000000..0ee478c87
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DF4/palettes/0.pal b/data/tilesets/secondary/82D4DF4/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4DF4/palettes/1.pal b/data/tilesets/secondary/82D4DF4/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4DF4/palettes/10.pal b/data/tilesets/secondary/82D4DF4/palettes/10.pal
new file mode 100644
index 000000000..4235579fc
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+238 238 180
+230 213 123
+205 180 98
+156 156 115
+197 230 230
+180 213 213
+172 189 197
+131 156 156
+90 115 115
+74 82 82
+49 57 57
diff --git a/data/tilesets/secondary/82D4DF4/palettes/11.pal b/data/tilesets/secondary/82D4DF4/palettes/11.pal
new file mode 100644
index 000000000..277172976
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+205 189 115
+172 172 115
+156 156 115
+131 131 115
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 156 98
+148 139 98
+115 123 98
diff --git a/data/tilesets/secondary/82D4DF4/palettes/12.pal b/data/tilesets/secondary/82D4DF4/palettes/12.pal
new file mode 100644
index 000000000..2fa21e9fb
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4DF4/palettes/13.pal b/data/tilesets/secondary/82D4DF4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DF4/palettes/14.pal b/data/tilesets/secondary/82D4DF4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DF4/palettes/15.pal b/data/tilesets/secondary/82D4DF4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DF4/palettes/2.pal b/data/tilesets/secondary/82D4DF4/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4DF4/palettes/3.pal b/data/tilesets/secondary/82D4DF4/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4DF4/palettes/4.pal b/data/tilesets/secondary/82D4DF4/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4DF4/palettes/5.pal b/data/tilesets/secondary/82D4DF4/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4DF4/palettes/6.pal b/data/tilesets/secondary/82D4DF4/palettes/6.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DF4/palettes/7.pal b/data/tilesets/secondary/82D4DF4/palettes/7.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4DF4/palettes/8.pal b/data/tilesets/secondary/82D4DF4/palettes/8.pal
new file mode 100644
index 000000000..34a637b1a
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+205 189 115
+172 172 115
+156 156 115
+131 131 115
+98 106 90
+255 0 255
+255 0 255
+255 0 255
+197 230 230
+180 213 213
+172 189 197
+131 156 156
+90 115 115
+74 82 82
+49 57 57
diff --git a/data/tilesets/secondary/82D4DF4/palettes/9.pal b/data/tilesets/secondary/82D4DF4/palettes/9.pal
new file mode 100644
index 000000000..f10a94f7c
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+205 189 115
+172 172 115
+156 156 115
+131 131 115
+238 222 123
+255 0 255
+222 180 57
+189 148 57
+148 115 74
+106 106 82
+74 74 74
+0 0 0
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D4DF4/tiles.png b/data/tilesets/secondary/82D4DF4/tiles.png
new file mode 100644
index 000000000..cb4078fa9
--- /dev/null
+++ b/data/tilesets/secondary/82D4DF4/tiles.png
diff --git a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin b/data/tilesets/secondary/82D4E0C/metatile_attributes.bin
new file mode 100644
index 000000000..2b24a5266
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E0C/metatiles.bin b/data/tilesets/secondary/82D4E0C/metatiles.bin
new file mode 100644
index 000000000..37ef8fe34
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E0C/palettes/0.pal b/data/tilesets/secondary/82D4E0C/palettes/0.pal
new file mode 100644
index 000000000..a3fab1c2f
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4E0C/palettes/1.pal b/data/tilesets/secondary/82D4E0C/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4E0C/palettes/10.pal b/data/tilesets/secondary/82D4E0C/palettes/10.pal
new file mode 100644
index 000000000..5ccabc5a0
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+255 238 180
+222 205 148
+197 172 123
+172 139 90
+222 222 156
+189 189 123
+148 148 106
+115 106 90
+82 74 65
+57 49 41
+65 65 74
diff --git a/data/tilesets/secondary/82D4E0C/palettes/11.pal b/data/tilesets/secondary/82D4E0C/palettes/11.pal
new file mode 100644
index 000000000..fa0038726
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+197 172 123
+172 139 90
+148 106 65
+123 74 41
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+230 222 164
+213 197 131
+197 172 106
+172 148 74
diff --git a/data/tilesets/secondary/82D4E0C/palettes/12.pal b/data/tilesets/secondary/82D4E0C/palettes/12.pal
new file mode 100644
index 000000000..c19d59bd0
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+180 180 98
+164 164 74
+139 139 49
+123 115 41
+255 238 180
+222 205 148
+197 172 123
+172 139 90
+222 222 156
+189 189 123
+148 148 82
+115 106 49
+90 82 41
+57 49 41
+65 65 74
diff --git a/data/tilesets/secondary/82D4E0C/palettes/13.pal b/data/tilesets/secondary/82D4E0C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E0C/palettes/14.pal b/data/tilesets/secondary/82D4E0C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E0C/palettes/15.pal b/data/tilesets/secondary/82D4E0C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E0C/palettes/2.pal b/data/tilesets/secondary/82D4E0C/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4E0C/palettes/3.pal b/data/tilesets/secondary/82D4E0C/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4E0C/palettes/4.pal b/data/tilesets/secondary/82D4E0C/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4E0C/palettes/5.pal b/data/tilesets/secondary/82D4E0C/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4E0C/palettes/6.pal b/data/tilesets/secondary/82D4E0C/palettes/6.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E0C/palettes/7.pal b/data/tilesets/secondary/82D4E0C/palettes/7.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E0C/palettes/8.pal b/data/tilesets/secondary/82D4E0C/palettes/8.pal
new file mode 100644
index 000000000..74cbc54c6
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+197 172 123
+172 139 90
+148 106 65
+123 74 41
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+222 222 156
+189 189 123
+148 148 106
+115 106 90
+82 74 65
+57 49 41
+65 65 74
diff --git a/data/tilesets/secondary/82D4E0C/palettes/9.pal b/data/tilesets/secondary/82D4E0C/palettes/9.pal
new file mode 100644
index 000000000..def7acffc
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+197 172 123
+172 139 90
+148 106 65
+123 74 41
+164 180 230
+139 156 222
+98 106 139
+65 65 57
+255 0 255
+255 0 255
+65 65 74
+0 0 0
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D4E0C/tiles.png b/data/tilesets/secondary/82D4E0C/tiles.png
new file mode 100644
index 000000000..77b767b79
--- /dev/null
+++ b/data/tilesets/secondary/82D4E0C/tiles.png
diff --git a/data/tilesets/secondary/82D4E24/metatile_attributes.bin b/data/tilesets/secondary/82D4E24/metatile_attributes.bin
new file mode 100644
index 000000000..87564066c
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E24/metatiles.bin b/data/tilesets/secondary/82D4E24/metatiles.bin
new file mode 100644
index 000000000..8f8bd569b
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E24/palettes/0.pal b/data/tilesets/secondary/82D4E24/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4E24/palettes/1.pal b/data/tilesets/secondary/82D4E24/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4E24/palettes/10.pal b/data/tilesets/secondary/82D4E24/palettes/10.pal
new file mode 100644
index 000000000..7116e91ff
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+238 238 180
+238 222 148
+189 222 156
+205 230 238
+238 238 246
+180 205 238
+123 180 230
+90 156 197
+98 123 172
+82 98 131
+65 74 82
diff --git a/data/tilesets/secondary/82D4E24/palettes/11.pal b/data/tilesets/secondary/82D4E24/palettes/11.pal
new file mode 100644
index 000000000..b237ef1c8
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 213 230
+189 197 230
+172 180 213
+148 156 172
+156 238 255
+164 246 255
+213 255 255
+106 230 255
+41 205 255
+32 131 255
+32 82 197
+32 74 131
+205 230 172
+189 213 172
+0 0 0
diff --git a/data/tilesets/secondary/82D4E24/palettes/12.pal b/data/tilesets/secondary/82D4E24/palettes/12.pal
new file mode 100644
index 000000000..ed56edee1
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4E24/palettes/13.pal b/data/tilesets/secondary/82D4E24/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E24/palettes/14.pal b/data/tilesets/secondary/82D4E24/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E24/palettes/15.pal b/data/tilesets/secondary/82D4E24/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E24/palettes/2.pal b/data/tilesets/secondary/82D4E24/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4E24/palettes/3.pal b/data/tilesets/secondary/82D4E24/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4E24/palettes/4.pal b/data/tilesets/secondary/82D4E24/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4E24/palettes/5.pal b/data/tilesets/secondary/82D4E24/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4E24/palettes/6.pal b/data/tilesets/secondary/82D4E24/palettes/6.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E24/palettes/7.pal b/data/tilesets/secondary/82D4E24/palettes/7.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E24/palettes/8.pal b/data/tilesets/secondary/82D4E24/palettes/8.pal
new file mode 100644
index 000000000..d96f3f0fc
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 213 230
+189 197 230
+172 180 213
+148 156 172
+156 238 255
+164 246 255
+213 255 255
+205 230 238
+238 238 246
+180 205 238
+123 180 230
+90 156 197
+98 123 172
+82 98 131
+65 74 82
diff --git a/data/tilesets/secondary/82D4E24/palettes/9.pal b/data/tilesets/secondary/82D4E24/palettes/9.pal
new file mode 100644
index 000000000..1a1dc881b
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 213 230
+189 197 230
+172 180 213
+148 156 172
+255 238 164
+238 230 139
+230 205 90
+197 172 74
+156 123 57
+106 82 115
+65 57 74
+0 0 0
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D4E24/tiles.png b/data/tilesets/secondary/82D4E24/tiles.png
new file mode 100644
index 000000000..e085d8e33
--- /dev/null
+++ b/data/tilesets/secondary/82D4E24/tiles.png
diff --git a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin b/data/tilesets/secondary/82D4E3C/metatile_attributes.bin
new file mode 100644
index 000000000..3549eaa93
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E3C/metatiles.bin b/data/tilesets/secondary/82D4E3C/metatiles.bin
new file mode 100644
index 000000000..ea1398be3
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E3C/palettes/0.pal b/data/tilesets/secondary/82D4E3C/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4E3C/palettes/1.pal b/data/tilesets/secondary/82D4E3C/palettes/1.pal
new file mode 100644
index 000000000..d99adafff
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4E3C/palettes/10.pal b/data/tilesets/secondary/82D4E3C/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/palettes/11.pal b/data/tilesets/secondary/82D4E3C/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/palettes/12.pal b/data/tilesets/secondary/82D4E3C/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/palettes/13.pal b/data/tilesets/secondary/82D4E3C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/palettes/14.pal b/data/tilesets/secondary/82D4E3C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/palettes/15.pal b/data/tilesets/secondary/82D4E3C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/palettes/2.pal b/data/tilesets/secondary/82D4E3C/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4E3C/palettes/3.pal b/data/tilesets/secondary/82D4E3C/palettes/3.pal
new file mode 100644
index 000000000..7ec794ae5
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E3C/palettes/4.pal b/data/tilesets/secondary/82D4E3C/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/palettes/5.pal b/data/tilesets/secondary/82D4E3C/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/palettes/6.pal b/data/tilesets/secondary/82D4E3C/palettes/6.pal
new file mode 100644
index 000000000..2903bb074
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+131 131 131
+180 180 164
+255 255 255
+189 164 82
+222 197 106
+230 222 156
+123 197 189
+156 222 213
+213 255 246
+255 0 255
+255 0 255
+213 131 65
+222 230 222
+246 238 189
diff --git a/data/tilesets/secondary/82D4E3C/palettes/7.pal b/data/tilesets/secondary/82D4E3C/palettes/7.pal
new file mode 100644
index 000000000..c62a40b0d
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+148 172 139
+180 197 164
+213 222 197
+238 255 213
+115 156 180
+197 222 238
+123 197 189
+156 222 213
+213 255 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E3C/palettes/8.pal b/data/tilesets/secondary/82D4E3C/palettes/8.pal
new file mode 100644
index 000000000..8c66b4998
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+230 222 156
+189 98 74
+230 156 98
+213 205 156
+115 156 180
+246 238 189
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E3C/palettes/9.pal b/data/tilesets/secondary/82D4E3C/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E3C/tiles.png b/data/tilesets/secondary/82D4E3C/tiles.png
new file mode 100644
index 000000000..6d376f447
--- /dev/null
+++ b/data/tilesets/secondary/82D4E3C/tiles.png
diff --git a/data/tilesets/secondary/82D4E54/metatile_attributes.bin b/data/tilesets/secondary/82D4E54/metatile_attributes.bin
new file mode 100644
index 000000000..45b5bef90
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E54/metatiles.bin b/data/tilesets/secondary/82D4E54/metatiles.bin
new file mode 100644
index 000000000..249addbc7
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E54/palettes/0.pal b/data/tilesets/secondary/82D4E54/palettes/0.pal
new file mode 100644
index 000000000..a3fab1c2f
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4E54/palettes/1.pal b/data/tilesets/secondary/82D4E54/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4E54/palettes/10.pal b/data/tilesets/secondary/82D4E54/palettes/10.pal
new file mode 100644
index 000000000..eb9198b0a
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+255 238 180
+230 205 164
+189 180 164
+172 164 156
+205 246 172
+172 213 148
+139 180 131
+115 156 106
+82 123 90
+57 98 74
+65 65 74
diff --git a/data/tilesets/secondary/82D4E54/palettes/11.pal b/data/tilesets/secondary/82D4E54/palettes/11.pal
new file mode 100644
index 000000000..9afe8750d
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+197 205 222
+172 180 197
+156 164 180
+115 123 139
+148 156 164
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+123 189 156
+106 156 139
+98 123 123
+90 98 115
diff --git a/data/tilesets/secondary/82D4E54/palettes/12.pal b/data/tilesets/secondary/82D4E54/palettes/12.pal
new file mode 100644
index 000000000..aced117f7
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 205 222
+197 205 222
+172 180 197
+156 164 180
+115 123 139
+238 238 164
+205 205 106
+172 172 90
+123 131 74
+115 123 139
+82 90 32
+65 65 74
+16 16 24
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E54/palettes/13.pal b/data/tilesets/secondary/82D4E54/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E54/palettes/14.pal b/data/tilesets/secondary/82D4E54/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E54/palettes/15.pal b/data/tilesets/secondary/82D4E54/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E54/palettes/2.pal b/data/tilesets/secondary/82D4E54/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4E54/palettes/3.pal b/data/tilesets/secondary/82D4E54/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4E54/palettes/4.pal b/data/tilesets/secondary/82D4E54/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4E54/palettes/5.pal b/data/tilesets/secondary/82D4E54/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4E54/palettes/6.pal b/data/tilesets/secondary/82D4E54/palettes/6.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E54/palettes/7.pal b/data/tilesets/secondary/82D4E54/palettes/7.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E54/palettes/8.pal b/data/tilesets/secondary/82D4E54/palettes/8.pal
new file mode 100644
index 000000000..db2216a05
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+197 205 222
+172 180 197
+156 164 180
+115 123 139
+148 156 164
+255 0 255
+255 0 255
+255 0 255
+205 246 172
+172 213 148
+139 180 131
+115 156 106
+82 123 90
+57 98 74
+65 65 74
diff --git a/data/tilesets/secondary/82D4E54/palettes/9.pal b/data/tilesets/secondary/82D4E54/palettes/9.pal
new file mode 100644
index 000000000..c1a5d4f29
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 205 222
+197 205 222
+172 180 197
+156 164 180
+115 123 139
+255 246 164
+205 189 106
+156 131 57
+82 74 32
+90 106 115
+255 0 255
+65 65 74
+16 16 24
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D4E54/tiles.png b/data/tilesets/secondary/82D4E54/tiles.png
new file mode 100644
index 000000000..d53a0cf17
--- /dev/null
+++ b/data/tilesets/secondary/82D4E54/tiles.png
diff --git a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin b/data/tilesets/secondary/82D4E6C/metatile_attributes.bin
new file mode 100644
index 000000000..5eca0b5c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E6C/metatiles.bin b/data/tilesets/secondary/82D4E6C/metatiles.bin
new file mode 100644
index 000000000..053045190
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E6C/palettes/0.pal b/data/tilesets/secondary/82D4E6C/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4E6C/palettes/1.pal b/data/tilesets/secondary/82D4E6C/palettes/1.pal
new file mode 100644
index 000000000..30be2fbe3
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4E6C/palettes/10.pal b/data/tilesets/secondary/82D4E6C/palettes/10.pal
new file mode 100644
index 000000000..c6e769ccc
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 222 156
+82 82 106
+131 131 131
+57 106 82
+41 156 98
+90 205 115
+197 172 90
+156 131 82
+213 205 106
+230 197 238
+180 189 164
+213 222 189
+156 172 172
+205 180 213
+189 197 213
+230 246 238
diff --git a/data/tilesets/secondary/82D4E6C/palettes/11.pal b/data/tilesets/secondary/82D4E6C/palettes/11.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/12.pal b/data/tilesets/secondary/82D4E6C/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/13.pal b/data/tilesets/secondary/82D4E6C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/14.pal b/data/tilesets/secondary/82D4E6C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/15.pal b/data/tilesets/secondary/82D4E6C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/2.pal b/data/tilesets/secondary/82D4E6C/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4E6C/palettes/3.pal b/data/tilesets/secondary/82D4E6C/palettes/3.pal
new file mode 100644
index 000000000..7ec794ae5
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E6C/palettes/4.pal b/data/tilesets/secondary/82D4E6C/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/5.pal b/data/tilesets/secondary/82D4E6C/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/6.pal b/data/tilesets/secondary/82D4E6C/palettes/6.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/7.pal b/data/tilesets/secondary/82D4E6C/palettes/7.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E6C/palettes/8.pal b/data/tilesets/secondary/82D4E6C/palettes/8.pal
new file mode 100644
index 000000000..18480092b
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 222 156
+82 82 106
+115 123 131
+98 90 65
+139 123 82
+197 172 90
+230 230 238
+205 115 74
+238 172 82
+238 213 82
+131 189 57
+164 222 82
+156 139 172
+205 172 222
+213 205 230
+246 255 255
diff --git a/data/tilesets/secondary/82D4E6C/palettes/9.pal b/data/tilesets/secondary/82D4E6C/palettes/9.pal
new file mode 100644
index 000000000..dd18b9d07
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 222 156
+82 82 106
+131 131 131
+172 123 82
+205 131 65
+213 148 65
+205 148 82
+238 164 82
+238 180 82
+148 106 74
+189 197 213
+222 230 230
+156 172 172
+90 131 238
+106 164 255
+156 189 255
diff --git a/data/tilesets/secondary/82D4E6C/tiles.png b/data/tilesets/secondary/82D4E6C/tiles.png
new file mode 100644
index 000000000..421932118
--- /dev/null
+++ b/data/tilesets/secondary/82D4E6C/tiles.png
diff --git a/data/tilesets/secondary/82D4E84/metatile_attributes.bin b/data/tilesets/secondary/82D4E84/metatile_attributes.bin
new file mode 100644
index 000000000..18d7517d9
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E84/metatiles.bin b/data/tilesets/secondary/82D4E84/metatiles.bin
new file mode 100644
index 000000000..0943dc7af
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E84/palettes/0.pal b/data/tilesets/secondary/82D4E84/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4E84/palettes/1.pal b/data/tilesets/secondary/82D4E84/palettes/1.pal
new file mode 100644
index 000000000..d99adafff
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+255 230 156
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4E84/palettes/10.pal b/data/tilesets/secondary/82D4E84/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/palettes/11.pal b/data/tilesets/secondary/82D4E84/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/palettes/12.pal b/data/tilesets/secondary/82D4E84/palettes/12.pal
new file mode 100644
index 000000000..2903bb074
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+131 131 131
+180 180 164
+255 255 255
+189 164 82
+222 197 106
+230 222 156
+123 197 189
+156 222 213
+213 255 246
+255 0 255
+255 0 255
+213 131 65
+222 230 222
+246 238 189
diff --git a/data/tilesets/secondary/82D4E84/palettes/13.pal b/data/tilesets/secondary/82D4E84/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/palettes/14.pal b/data/tilesets/secondary/82D4E84/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/palettes/15.pal b/data/tilesets/secondary/82D4E84/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/palettes/2.pal b/data/tilesets/secondary/82D4E84/palettes/2.pal
new file mode 100644
index 000000000..cc3a9457d
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+139 197 139
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4E84/palettes/3.pal b/data/tilesets/secondary/82D4E84/palettes/3.pal
new file mode 100644
index 000000000..7ec794ae5
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E84/palettes/4.pal b/data/tilesets/secondary/82D4E84/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/palettes/5.pal b/data/tilesets/secondary/82D4E84/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/palettes/6.pal b/data/tilesets/secondary/82D4E84/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/palettes/7.pal b/data/tilesets/secondary/82D4E84/palettes/7.pal
new file mode 100644
index 000000000..c62a40b0d
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+148 172 139
+180 197 164
+213 222 197
+238 255 213
+115 156 180
+197 222 238
+123 197 189
+156 222 213
+213 255 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E84/palettes/8.pal b/data/tilesets/secondary/82D4E84/palettes/8.pal
new file mode 100644
index 000000000..8c66b4998
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+230 222 156
+189 98 74
+230 156 98
+213 205 156
+115 156 180
+246 238 189
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E84/palettes/9.pal b/data/tilesets/secondary/82D4E84/palettes/9.pal
new file mode 100644
index 000000000..25d5d7019
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+156 213 255
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+0 0 0
diff --git a/data/tilesets/secondary/82D4E84/tiles.png b/data/tilesets/secondary/82D4E84/tiles.png
new file mode 100644
index 000000000..ca6e21f03
--- /dev/null
+++ b/data/tilesets/secondary/82D4E84/tiles.png
diff --git a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin b/data/tilesets/secondary/82D4E9C/metatile_attributes.bin
new file mode 100644
index 000000000..1105056c9
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E9C/metatiles.bin b/data/tilesets/secondary/82D4E9C/metatiles.bin
new file mode 100644
index 000000000..7d1e15676
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E9C/palettes/0.pal b/data/tilesets/secondary/82D4E9C/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4E9C/palettes/1.pal b/data/tilesets/secondary/82D4E9C/palettes/1.pal
new file mode 100644
index 000000000..30be2fbe3
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4E9C/palettes/10.pal b/data/tilesets/secondary/82D4E9C/palettes/10.pal
new file mode 100644
index 000000000..2a1743eaa
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E9C/palettes/11.pal b/data/tilesets/secondary/82D4E9C/palettes/11.pal
new file mode 100644
index 000000000..307e0ea7e
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4E9C/palettes/12.pal b/data/tilesets/secondary/82D4E9C/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E9C/palettes/13.pal b/data/tilesets/secondary/82D4E9C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E9C/palettes/14.pal b/data/tilesets/secondary/82D4E9C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E9C/palettes/15.pal b/data/tilesets/secondary/82D4E9C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E9C/palettes/2.pal b/data/tilesets/secondary/82D4E9C/palettes/2.pal
new file mode 100644
index 000000000..e7c4b911a
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4E9C/palettes/3.pal b/data/tilesets/secondary/82D4E9C/palettes/3.pal
new file mode 100644
index 000000000..54b77e0c8
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E9C/palettes/4.pal b/data/tilesets/secondary/82D4E9C/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E9C/palettes/5.pal b/data/tilesets/secondary/82D4E9C/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E9C/palettes/6.pal b/data/tilesets/secondary/82D4E9C/palettes/6.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4E9C/palettes/7.pal b/data/tilesets/secondary/82D4E9C/palettes/7.pal
new file mode 100644
index 000000000..b69e6cfa4
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+156 65 65
+57 106 16
+0 0 139
+98 123 156
+131 156 180
+164 189 213
+197 197 148
+213 205 172
+230 222 197
+164 156 164
+205 197 189
+82 82 106
+123 123 139
+246 238 222
+255 255 255
diff --git a/data/tilesets/secondary/82D4E9C/palettes/8.pal b/data/tilesets/secondary/82D4E9C/palettes/8.pal
new file mode 100644
index 000000000..3cada9fa1
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+180 180 90
+222 222 148
+246 246 180
+156 65 65
+222 131 131
+189 98 98
+255 0 255
+255 0 255
+255 0 255
+164 156 164
+205 197 189
+82 82 106
+123 123 139
+246 238 222
+255 255 255
diff --git a/data/tilesets/secondary/82D4E9C/palettes/9.pal b/data/tilesets/secondary/82D4E9C/palettes/9.pal
new file mode 100644
index 000000000..2a1743eaa
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 156
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4E9C/tiles.png b/data/tilesets/secondary/82D4E9C/tiles.png
new file mode 100644
index 000000000..d252dbcd3
--- /dev/null
+++ b/data/tilesets/secondary/82D4E9C/tiles.png
diff --git a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin b/data/tilesets/secondary/82D4EB4/metatile_attributes.bin
new file mode 100644
index 000000000..05caeb58b
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EB4/metatiles.bin b/data/tilesets/secondary/82D4EB4/metatiles.bin
new file mode 100644
index 000000000..6ac3cbf98
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EB4/palettes/0.pal b/data/tilesets/secondary/82D4EB4/palettes/0.pal
new file mode 100644
index 000000000..ed708dd79
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4EB4/palettes/1.pal b/data/tilesets/secondary/82D4EB4/palettes/1.pal
new file mode 100644
index 000000000..4d2b48991
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D4EB4/palettes/10.pal b/data/tilesets/secondary/82D4EB4/palettes/10.pal
new file mode 100644
index 000000000..e8624e82f
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+82 82 106
+131 131 131
+139 164 164
+164 189 189
+205 222 222
+205 238 238
+90 139 115
+0 0 0
+0 0 0
+82 180 106
+115 222 148
+205 197 57
+230 230 139
+238 131 74
+255 180 98
diff --git a/data/tilesets/secondary/82D4EB4/palettes/11.pal b/data/tilesets/secondary/82D4EB4/palettes/11.pal
new file mode 100644
index 000000000..9cec1272b
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+82 82 106
+131 131 131
+0 0 0
+0 0 0
+0 0 0
+205 238 238
+222 255 255
+0 0 0
+106 189 197
+106 246 230
+164 255 238
+0 0 0
+131 123 57
+197 106 74
+238 148 74
diff --git a/data/tilesets/secondary/82D4EB4/palettes/12.pal b/data/tilesets/secondary/82D4EB4/palettes/12.pal
new file mode 100644
index 000000000..600d8f469
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+82 82 106
+131 131 131
+255 255 255
+90 230 255
+213 255 255
+148 238 255
+90 139 115
+0 0 0
+0 0 0
+82 180 106
+115 222 148
+148 246 180
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EB4/palettes/13.pal b/data/tilesets/secondary/82D4EB4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EB4/palettes/14.pal b/data/tilesets/secondary/82D4EB4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EB4/palettes/15.pal b/data/tilesets/secondary/82D4EB4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EB4/palettes/2.pal b/data/tilesets/secondary/82D4EB4/palettes/2.pal
new file mode 100644
index 000000000..878c13c95
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4EB4/palettes/3.pal b/data/tilesets/secondary/82D4EB4/palettes/3.pal
new file mode 100644
index 000000000..bed4c20c3
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4EB4/palettes/4.pal b/data/tilesets/secondary/82D4EB4/palettes/4.pal
new file mode 100644
index 000000000..b77ba3e87
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4EB4/palettes/5.pal b/data/tilesets/secondary/82D4EB4/palettes/5.pal
new file mode 100644
index 000000000..74a2a9ed0
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4EB4/palettes/6.pal b/data/tilesets/secondary/82D4EB4/palettes/6.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D4EB4/palettes/7.pal b/data/tilesets/secondary/82D4EB4/palettes/7.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EB4/palettes/8.pal b/data/tilesets/secondary/82D4EB4/palettes/8.pal
new file mode 100644
index 000000000..370a3d2db
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+82 82 106
+131 131 131
+139 164 164
+164 189 189
+205 222 222
+205 238 238
+90 139 115
+139 148 115
+106 189 197
+82 180 106
+115 222 148
+148 246 180
+131 123 57
+197 106 74
+238 148 74
diff --git a/data/tilesets/secondary/82D4EB4/palettes/9.pal b/data/tilesets/secondary/82D4EB4/palettes/9.pal
new file mode 100644
index 000000000..1193cc807
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 205 172
+82 82 106
+131 131 131
+98 106 148
+115 131 197
+139 164 230
+164 213 246
+197 197 197
+238 230 205
+255 0 255
+106 98 90
+131 115 90
+156 139 90
+131 139 90
+164 156 90
+189 172 90
diff --git a/data/tilesets/secondary/82D4EB4/tiles.png b/data/tilesets/secondary/82D4EB4/tiles.png
new file mode 100644
index 000000000..42d557bcf
--- /dev/null
+++ b/data/tilesets/secondary/82D4EB4/tiles.png
diff --git a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin b/data/tilesets/secondary/82D4ECC/metatile_attributes.bin
new file mode 100644
index 000000000..a118a0181
--- /dev/null
+++ b/data/tilesets/secondary/82D4ECC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ECC/metatiles.bin b/data/tilesets/secondary/82D4ECC/metatiles.bin
new file mode 100644
index 000000000..c86070668
--- /dev/null
+++ b/data/tilesets/secondary/82D4ECC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin b/data/tilesets/secondary/82D4EE4/metatile_attributes.bin
new file mode 100644
index 000000000..29caa862d
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EE4/metatiles.bin b/data/tilesets/secondary/82D4EE4/metatiles.bin
new file mode 100644
index 000000000..2010e1eca
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EE4/palettes/0.pal b/data/tilesets/secondary/82D4EE4/palettes/0.pal
new file mode 100644
index 000000000..6d876039d
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4EE4/palettes/1.pal b/data/tilesets/secondary/82D4EE4/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4EE4/palettes/10.pal b/data/tilesets/secondary/82D4EE4/palettes/10.pal
new file mode 100644
index 000000000..e12b8edac
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4EE4/palettes/11.pal b/data/tilesets/secondary/82D4EE4/palettes/11.pal
new file mode 100644
index 000000000..e12b8edac
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4EE4/palettes/12.pal b/data/tilesets/secondary/82D4EE4/palettes/12.pal
new file mode 100644
index 000000000..e12b8edac
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4EE4/palettes/13.pal b/data/tilesets/secondary/82D4EE4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EE4/palettes/14.pal b/data/tilesets/secondary/82D4EE4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EE4/palettes/15.pal b/data/tilesets/secondary/82D4EE4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EE4/palettes/2.pal b/data/tilesets/secondary/82D4EE4/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4EE4/palettes/3.pal b/data/tilesets/secondary/82D4EE4/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D4EE4/palettes/4.pal b/data/tilesets/secondary/82D4EE4/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/secondary/82D4EE4/palettes/5.pal b/data/tilesets/secondary/82D4EE4/palettes/5.pal
new file mode 100644
index 000000000..0eef3df8e
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+255 0 255
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4EE4/palettes/6.pal b/data/tilesets/secondary/82D4EE4/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EE4/palettes/7.pal b/data/tilesets/secondary/82D4EE4/palettes/7.pal
new file mode 100644
index 000000000..23e995640
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+148 148 156
+205 205 197
+148 139 90
+172 164 106
+197 189 131
+82 139 148
+115 164 172
+156 189 197
+180 90 74
+205 115 90
+238 156 123
diff --git a/data/tilesets/secondary/82D4EE4/palettes/8.pal b/data/tilesets/secondary/82D4EE4/palettes/8.pal
new file mode 100644
index 000000000..3ce3570a1
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+255 255 156
+197 197 156
+172 172 139
+148 148 131
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4EE4/palettes/9.pal b/data/tilesets/secondary/82D4EE4/palettes/9.pal
new file mode 100644
index 000000000..e12b8edac
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4EE4/tiles.png b/data/tilesets/secondary/82D4EE4/tiles.png
new file mode 100644
index 000000000..b8865022d
--- /dev/null
+++ b/data/tilesets/secondary/82D4EE4/tiles.png
diff --git a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin b/data/tilesets/secondary/82D4EFC/metatile_attributes.bin
new file mode 100644
index 000000000..8c16318f0
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EFC/metatiles.bin b/data/tilesets/secondary/82D4EFC/metatiles.bin
new file mode 100644
index 000000000..d4216989e
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EFC/palettes/0.pal b/data/tilesets/secondary/82D4EFC/palettes/0.pal
new file mode 100644
index 000000000..8db07d418
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4EFC/palettes/1.pal b/data/tilesets/secondary/82D4EFC/palettes/1.pal
new file mode 100644
index 000000000..30be2fbe3
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4EFC/palettes/10.pal b/data/tilesets/secondary/82D4EFC/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EFC/palettes/11.pal b/data/tilesets/secondary/82D4EFC/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EFC/palettes/12.pal b/data/tilesets/secondary/82D4EFC/palettes/12.pal
new file mode 100644
index 000000000..fa56f966e
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+131 106 189
+156 123 205
+230 230 255
+115 115 123
+106 156 106
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+106 82 156
+156 131 205
+205 172 246
+189 164 230
+115 115 123
diff --git a/data/tilesets/secondary/82D4EFC/palettes/13.pal b/data/tilesets/secondary/82D4EFC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EFC/palettes/14.pal b/data/tilesets/secondary/82D4EFC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EFC/palettes/15.pal b/data/tilesets/secondary/82D4EFC/palettes/15.pal
new file mode 100644
index 000000000..92e7ed309
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4EFC/palettes/2.pal b/data/tilesets/secondary/82D4EFC/palettes/2.pal
new file mode 100644
index 000000000..e7c4b911a
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4EFC/palettes/3.pal b/data/tilesets/secondary/82D4EFC/palettes/3.pal
new file mode 100644
index 000000000..54b77e0c8
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4EFC/palettes/4.pal b/data/tilesets/secondary/82D4EFC/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EFC/palettes/5.pal b/data/tilesets/secondary/82D4EFC/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EFC/palettes/6.pal b/data/tilesets/secondary/82D4EFC/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4EFC/palettes/7.pal b/data/tilesets/secondary/82D4EFC/palettes/7.pal
new file mode 100644
index 000000000..241a2678c
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+115 115 115
+180 180 164
+238 238 246
+82 123 82
+90 131 90
+106 156 106
+131 172 131
+180 156 222
+106 82 156
+139 115 189
+213 189 255
+255 0 255
+65 106 65
+255 255 255
diff --git a/data/tilesets/secondary/82D4EFC/palettes/8.pal b/data/tilesets/secondary/82D4EFC/palettes/8.pal
new file mode 100644
index 000000000..ebd9e912c
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+115 115 115
+180 180 164
+238 238 246
+98 139 98
+106 156 106
+131 172 131
+148 189 148
+180 156 222
+205 139 32
+222 172 57
+246 238 164
+255 0 255
+82 123 82
+255 255 255
diff --git a/data/tilesets/secondary/82D4EFC/palettes/9.pal b/data/tilesets/secondary/82D4EFC/palettes/9.pal
new file mode 100644
index 000000000..51daf6701
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+115 115 115
+180 180 164
+238 238 246
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+172 123 32
+238 189 74
+74 205 205
+164 255 255
+255 255 255
diff --git a/data/tilesets/secondary/82D4EFC/tiles.png b/data/tilesets/secondary/82D4EFC/tiles.png
new file mode 100644
index 000000000..b8f8c6a4d
--- /dev/null
+++ b/data/tilesets/secondary/82D4EFC/tiles.png
diff --git a/data/tilesets/secondary/82D4F14/metatile_attributes.bin b/data/tilesets/secondary/82D4F14/metatile_attributes.bin
new file mode 100644
index 000000000..9656d8ed7
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F14/metatiles.bin b/data/tilesets/secondary/82D4F14/metatiles.bin
new file mode 100644
index 000000000..3337a5393
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F14/palettes/0.pal b/data/tilesets/secondary/82D4F14/palettes/0.pal
new file mode 100644
index 000000000..620015e77
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 139 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4F14/palettes/1.pal b/data/tilesets/secondary/82D4F14/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4F14/palettes/10.pal b/data/tilesets/secondary/82D4F14/palettes/10.pal
new file mode 100644
index 000000000..1f08b0f6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+238 172 115
+205 156 115
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+156 148 98
diff --git a/data/tilesets/secondary/82D4F14/palettes/11.pal b/data/tilesets/secondary/82D4F14/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F14/palettes/12.pal b/data/tilesets/secondary/82D4F14/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F14/palettes/13.pal b/data/tilesets/secondary/82D4F14/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F14/palettes/14.pal b/data/tilesets/secondary/82D4F14/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F14/palettes/15.pal b/data/tilesets/secondary/82D4F14/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F14/palettes/2.pal b/data/tilesets/secondary/82D4F14/palettes/2.pal
new file mode 100644
index 000000000..ddec077d0
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+115 82 74
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+197 172 139
diff --git a/data/tilesets/secondary/82D4F14/palettes/3.pal b/data/tilesets/secondary/82D4F14/palettes/3.pal
new file mode 100644
index 000000000..6d1dfb5af
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 238 246
+189 139 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+172 32 41
diff --git a/data/tilesets/secondary/82D4F14/palettes/4.pal b/data/tilesets/secondary/82D4F14/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4F14/palettes/5.pal b/data/tilesets/secondary/82D4F14/palettes/5.pal
new file mode 100644
index 000000000..9de0ef422
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 238 164
+255 0 255
+255 0 255
+180 222 164
+131 213 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4F14/palettes/6.pal b/data/tilesets/secondary/82D4F14/palettes/6.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F14/palettes/7.pal b/data/tilesets/secondary/82D4F14/palettes/7.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F14/palettes/8.pal b/data/tilesets/secondary/82D4F14/palettes/8.pal
new file mode 100644
index 000000000..eed6dbc35
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+123 197 180
+74 74 90
+123 123 131
+189 197 189
+255 0 255
+205 222 222
+90 90 65
+131 115 74
+148 148 115
+189 189 131
+238 238 139
+238 238 246
+74 98 65
+74 156 65
+115 197 98
+156 230 98
diff --git a/data/tilesets/secondary/82D4F14/palettes/9.pal b/data/tilesets/secondary/82D4F14/palettes/9.pal
new file mode 100644
index 000000000..e9b93cfd2
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+123 197 180
+74 74 90
+123 123 131
+205 213 213
+205 156 115
+238 172 115
+106 123 74
+156 148 98
+197 172 115
+222 205 139
+230 222 156
+90 90 49
+213 180 230
+164 139 197
+148 115 172
+123 98 131
diff --git a/data/tilesets/secondary/82D4F14/tiles.png b/data/tilesets/secondary/82D4F14/tiles.png
new file mode 100644
index 000000000..6c8d53e34
--- /dev/null
+++ b/data/tilesets/secondary/82D4F14/tiles.png
diff --git a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin b/data/tilesets/secondary/82D4F2C/metatile_attributes.bin
new file mode 100644
index 000000000..91b8105d3
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F2C/metatiles.bin b/data/tilesets/secondary/82D4F2C/metatiles.bin
new file mode 100644
index 000000000..5caba25a7
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F2C/palettes/0.pal b/data/tilesets/secondary/82D4F2C/palettes/0.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/1.pal b/data/tilesets/secondary/82D4F2C/palettes/1.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/10.pal b/data/tilesets/secondary/82D4F2C/palettes/10.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/11.pal b/data/tilesets/secondary/82D4F2C/palettes/11.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/12.pal b/data/tilesets/secondary/82D4F2C/palettes/12.pal
new file mode 100644
index 000000000..9c9a571ef
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+148 148 148
+164 98 74
+222 148 123
+255 189 164
+139 82 57
+189 131 156
+246 205 238
+139 115 49
+156 131 90
+189 164 115
+222 205 156
+255 238 189
+82 82 106
+123 123 139
+205 205 197
+255 255 255
diff --git a/data/tilesets/secondary/82D4F2C/palettes/13.pal b/data/tilesets/secondary/82D4F2C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/14.pal b/data/tilesets/secondary/82D4F2C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/15.pal b/data/tilesets/secondary/82D4F2C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/2.pal b/data/tilesets/secondary/82D4F2C/palettes/2.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/3.pal b/data/tilesets/secondary/82D4F2C/palettes/3.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/4.pal b/data/tilesets/secondary/82D4F2C/palettes/4.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/5.pal b/data/tilesets/secondary/82D4F2C/palettes/5.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/6.pal b/data/tilesets/secondary/82D4F2C/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/palettes/7.pal b/data/tilesets/secondary/82D4F2C/palettes/7.pal
new file mode 100644
index 000000000..4d22869cd
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+148 148 148
+82 131 106
+131 180 156
+180 230 205
+180 0 0
+255 0 0
+148 148 156
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+82 82 106
+123 123 139
+205 205 197
+255 255 255
diff --git a/data/tilesets/secondary/82D4F2C/palettes/8.pal b/data/tilesets/secondary/82D4F2C/palettes/8.pal
new file mode 100644
index 000000000..2a9d791a4
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+148 148 148
+164 98 74
+222 148 123
+255 189 164
+139 82 57
+172 197 230
+213 222 238
+0 0 0
+0 0 0
+189 164 115
+0 0 0
+255 238 189
+82 82 106
+123 123 139
+205 205 197
+255 255 255
diff --git a/data/tilesets/secondary/82D4F2C/palettes/9.pal b/data/tilesets/secondary/82D4F2C/palettes/9.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F2C/tiles.png b/data/tilesets/secondary/82D4F2C/tiles.png
new file mode 100644
index 000000000..3e69db5c3
--- /dev/null
+++ b/data/tilesets/secondary/82D4F2C/tiles.png
diff --git a/data/tilesets/secondary/82D4F44/metatile_attributes.bin b/data/tilesets/secondary/82D4F44/metatile_attributes.bin
new file mode 100644
index 000000000..a2ac291b5
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F44/metatiles.bin b/data/tilesets/secondary/82D4F44/metatiles.bin
new file mode 100644
index 000000000..5cddd954c
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F44/palettes/0.pal b/data/tilesets/secondary/82D4F44/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4F44/palettes/1.pal b/data/tilesets/secondary/82D4F44/palettes/1.pal
new file mode 100644
index 000000000..30be2fbe3
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4F44/palettes/10.pal b/data/tilesets/secondary/82D4F44/palettes/10.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/palettes/11.pal b/data/tilesets/secondary/82D4F44/palettes/11.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/palettes/12.pal b/data/tilesets/secondary/82D4F44/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/palettes/13.pal b/data/tilesets/secondary/82D4F44/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/palettes/14.pal b/data/tilesets/secondary/82D4F44/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/palettes/15.pal b/data/tilesets/secondary/82D4F44/palettes/15.pal
new file mode 100644
index 000000000..71b5ee827
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
diff --git a/data/tilesets/secondary/82D4F44/palettes/2.pal b/data/tilesets/secondary/82D4F44/palettes/2.pal
new file mode 100644
index 000000000..e7c4b911a
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4F44/palettes/3.pal b/data/tilesets/secondary/82D4F44/palettes/3.pal
new file mode 100644
index 000000000..54b77e0c8
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4F44/palettes/4.pal b/data/tilesets/secondary/82D4F44/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/palettes/5.pal b/data/tilesets/secondary/82D4F44/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/palettes/6.pal b/data/tilesets/secondary/82D4F44/palettes/6.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/palettes/7.pal b/data/tilesets/secondary/82D4F44/palettes/7.pal
new file mode 100644
index 000000000..5e3bac102
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+106 197 106
+255 205 90
+82 148 197
+189 230 255
+139 98 41
+156 123 65
+180 148 90
+205 172 115
+246 213 172
+205 106 90
+255 148 131
diff --git a/data/tilesets/secondary/82D4F44/palettes/8.pal b/data/tilesets/secondary/82D4F44/palettes/8.pal
new file mode 100644
index 000000000..2257c0006
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+82 82 106
+131 131 139
+230 222 246
+255 255 255
+255 205 98
+255 255 148
+189 230 255
+180 148 90
+255 139 180
+197 180 131
+213 213 164
+238 238 213
+106 197 106
+205 106 90
+131 115 16
diff --git a/data/tilesets/secondary/82D4F44/palettes/9.pal b/data/tilesets/secondary/82D4F44/palettes/9.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F44/tiles.png b/data/tilesets/secondary/82D4F44/tiles.png
new file mode 100644
index 000000000..5c8a38b9e
--- /dev/null
+++ b/data/tilesets/secondary/82D4F44/tiles.png
diff --git a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin b/data/tilesets/secondary/82D4F5C/metatile_attributes.bin
new file mode 100644
index 000000000..cdcb96c53
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F5C/metatiles.bin b/data/tilesets/secondary/82D4F5C/metatiles.bin
new file mode 100644
index 000000000..35009a690
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F5C/palettes/0.pal b/data/tilesets/secondary/82D4F5C/palettes/0.pal
new file mode 100644
index 000000000..88e712348
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+32 32 57
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4F5C/palettes/1.pal b/data/tilesets/secondary/82D4F5C/palettes/1.pal
new file mode 100644
index 000000000..30be2fbe3
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+156 189 213
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4F5C/palettes/10.pal b/data/tilesets/secondary/82D4F5C/palettes/10.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/11.pal b/data/tilesets/secondary/82D4F5C/palettes/11.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/12.pal b/data/tilesets/secondary/82D4F5C/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/13.pal b/data/tilesets/secondary/82D4F5C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/14.pal b/data/tilesets/secondary/82D4F5C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/15.pal b/data/tilesets/secondary/82D4F5C/palettes/15.pal
new file mode 100644
index 000000000..71b5ee827
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
diff --git a/data/tilesets/secondary/82D4F5C/palettes/2.pal b/data/tilesets/secondary/82D4F5C/palettes/2.pal
new file mode 100644
index 000000000..e7c4b911a
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+115 115 123
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4F5C/palettes/3.pal b/data/tilesets/secondary/82D4F5C/palettes/3.pal
new file mode 100644
index 000000000..54b77e0c8
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+164 164 172
+205 205 213
+238 238 246
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D4F5C/palettes/4.pal b/data/tilesets/secondary/82D4F5C/palettes/4.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/5.pal b/data/tilesets/secondary/82D4F5C/palettes/5.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/6.pal b/data/tilesets/secondary/82D4F5C/palettes/6.pal
new file mode 100644
index 000000000..6f31ca776
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/7.pal b/data/tilesets/secondary/82D4F5C/palettes/7.pal
new file mode 100644
index 000000000..6c1a5b096
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+172 148 90
+213 189 131
+255 230 172
+255 255 98
+255 197 197
+98 156 74
+148 205 123
+98 156 172
+123 180 197
+156 205 222
+189 230 246
diff --git a/data/tilesets/secondary/82D4F5C/palettes/8.pal b/data/tilesets/secondary/82D4F5C/palettes/8.pal
new file mode 100644
index 000000000..1557a55f0
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+82 82 106
+131 131 139
+197 189 213
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+123 131 82
+139 148 82
+156 164 90
+172 180 106
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/palettes/9.pal b/data/tilesets/secondary/82D4F5C/palettes/9.pal
new file mode 100644
index 000000000..c06a049b0
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F5C/tiles.png b/data/tilesets/secondary/82D4F5C/tiles.png
new file mode 100644
index 000000000..935afccd2
--- /dev/null
+++ b/data/tilesets/secondary/82D4F5C/tiles.png
diff --git a/data/tilesets/secondary/82D4F74/metatile_attributes.bin b/data/tilesets/secondary/82D4F74/metatile_attributes.bin
new file mode 100644
index 000000000..8255cca20
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F74/metatiles.bin b/data/tilesets/secondary/82D4F74/metatiles.bin
new file mode 100644
index 000000000..63ddd975b
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F74/palettes/0.pal b/data/tilesets/secondary/82D4F74/palettes/0.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/1.pal b/data/tilesets/secondary/82D4F74/palettes/1.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/10.pal b/data/tilesets/secondary/82D4F74/palettes/10.pal
new file mode 100644
index 000000000..afe462f8e
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 197
+82 82 106
+131 131 131
+123 189 222
+123 156 189
+164 222 246
+189 238 238
+74 139 98
+106 172 106
+123 205 123
+90 148 115
+139 197 131
+197 238 123
+197 172 74
+255 0 255
+230 230 106
diff --git a/data/tilesets/secondary/82D4F74/palettes/11.pal b/data/tilesets/secondary/82D4F74/palettes/11.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/12.pal b/data/tilesets/secondary/82D4F74/palettes/12.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/13.pal b/data/tilesets/secondary/82D4F74/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/14.pal b/data/tilesets/secondary/82D4F74/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/15.pal b/data/tilesets/secondary/82D4F74/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/2.pal b/data/tilesets/secondary/82D4F74/palettes/2.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/3.pal b/data/tilesets/secondary/82D4F74/palettes/3.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/4.pal b/data/tilesets/secondary/82D4F74/palettes/4.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/5.pal b/data/tilesets/secondary/82D4F74/palettes/5.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/6.pal b/data/tilesets/secondary/82D4F74/palettes/6.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/7.pal b/data/tilesets/secondary/82D4F74/palettes/7.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F74/palettes/8.pal b/data/tilesets/secondary/82D4F74/palettes/8.pal
new file mode 100644
index 000000000..4b7de8012
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 197
+82 82 106
+131 131 131
+131 115 90
+189 131 90
+205 156 90
+238 180 90
+172 172 131
+222 222 172
+172 180 205
+238 230 172
+255 255 246
+255 255 246
+197 205 222
+205 213 230
+230 230 246
diff --git a/data/tilesets/secondary/82D4F74/palettes/9.pal b/data/tilesets/secondary/82D4F74/palettes/9.pal
new file mode 100644
index 000000000..8fe0861de
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 189 197
+82 82 106
+131 131 131
+246 246 189
+180 180 139
+205 156 90
+230 230 131
+222 213 131
+205 205 115
+197 180 115
+255 0 255
+123 123 98
+156 156 98
+205 148 197
+90 164 205
+90 189 246
diff --git a/data/tilesets/secondary/82D4F74/tiles.png b/data/tilesets/secondary/82D4F74/tiles.png
new file mode 100644
index 000000000..b8a2a1a4f
--- /dev/null
+++ b/data/tilesets/secondary/82D4F74/tiles.png
diff --git a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin b/data/tilesets/secondary/82D4F8C/metatile_attributes.bin
new file mode 100644
index 000000000..aa43d15ee
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F8C/metatiles.bin b/data/tilesets/secondary/82D4F8C/metatiles.bin
new file mode 100644
index 000000000..117c036fa
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F8C/palettes/0.pal b/data/tilesets/secondary/82D4F8C/palettes/0.pal
new file mode 100644
index 000000000..5867e5ba6
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+156 213 255
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4F8C/palettes/1.pal b/data/tilesets/secondary/82D4F8C/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4F8C/palettes/10.pal b/data/tilesets/secondary/82D4F8C/palettes/10.pal
new file mode 100644
index 000000000..3c091df8b
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+148 148 164
+205 189 197
+255 255 255
+255 213 115
+189 148 49
+139 98 74
+90 106 180
+255 205 139
+230 172 90
+230 148 65
+180 98 24
+238 213 172
+222 156 139
+123 123 123
diff --git a/data/tilesets/secondary/82D4F8C/palettes/11.pal b/data/tilesets/secondary/82D4F8C/palettes/11.pal
new file mode 100644
index 000000000..79494336b
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+115 115 115
+180 180 164
+238 238 238
+213 222 164
+115 156 148
+230 213 115
+180 172 90
+139 148 90
+98 123 180
+148 156 156
+189 197 197
+246 230 164
+180 189 131
+205 213 213
diff --git a/data/tilesets/secondary/82D4F8C/palettes/12.pal b/data/tilesets/secondary/82D4F8C/palettes/12.pal
new file mode 100644
index 000000000..b9b1e6061
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+131 131 82
+164 164 98
+197 197 156
+106 164 172
+197 205 213
+205 156 32
+172 148 197
+205 164 230
+230 197 255
+205 197 106
+230 230 230
diff --git a/data/tilesets/secondary/82D4F8C/palettes/13.pal b/data/tilesets/secondary/82D4F8C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F8C/palettes/14.pal b/data/tilesets/secondary/82D4F8C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F8C/palettes/15.pal b/data/tilesets/secondary/82D4F8C/palettes/15.pal
new file mode 100644
index 000000000..093fbdd6c
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+213 222 164
+180 189 131
+139 148 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F8C/palettes/2.pal b/data/tilesets/secondary/82D4F8C/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4F8C/palettes/3.pal b/data/tilesets/secondary/82D4F8C/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D4F8C/palettes/4.pal b/data/tilesets/secondary/82D4F8C/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/secondary/82D4F8C/palettes/5.pal b/data/tilesets/secondary/82D4F8C/palettes/5.pal
new file mode 100644
index 000000000..c7780e5c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+255 0 255
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+197 197 205
+205 82 65
+0 0 0
diff --git a/data/tilesets/secondary/82D4F8C/palettes/6.pal b/data/tilesets/secondary/82D4F8C/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4F8C/palettes/7.pal b/data/tilesets/secondary/82D4F8C/palettes/7.pal
new file mode 100644
index 000000000..35987db53
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+139 139 148
+180 180 164
+255 255 255
+205 197 106
+246 238 148
+255 255 222
+98 98 123
+238 238 238
+82 222 123
+131 255 164
+82 164 57
+230 139 98
+189 98 74
+213 213 213
diff --git a/data/tilesets/secondary/82D4F8C/palettes/8.pal b/data/tilesets/secondary/82D4F8C/palettes/8.pal
new file mode 100644
index 000000000..7f33e006f
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+148 148 164
+180 180 164
+255 255 255
+213 213 213
+106 156 164
+131 189 197
+172 222 230
+238 180 222
+180 115 164
+213 213 180
+255 0 255
+156 205 246
+98 156 238
diff --git a/data/tilesets/secondary/82D4F8C/palettes/9.pal b/data/tilesets/secondary/82D4F8C/palettes/9.pal
new file mode 100644
index 000000000..75022050d
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+148 148 164
+180 180 164
+255 255 255
+213 213 213
+148 205 180
+115 172 148
+106 148 139
+197 238 255
+172 213 255
+123 164 222
+98 139 189
+123 164 189
+148 189 238
diff --git a/data/tilesets/secondary/82D4F8C/tiles.png b/data/tilesets/secondary/82D4F8C/tiles.png
new file mode 100644
index 000000000..324b42c9f
--- /dev/null
+++ b/data/tilesets/secondary/82D4F8C/tiles.png
diff --git a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin b/data/tilesets/secondary/82D4FA4/metatile_attributes.bin
new file mode 100644
index 000000000..db0f7817e
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FA4/metatiles.bin b/data/tilesets/secondary/82D4FA4/metatiles.bin
new file mode 100644
index 000000000..dfe78c910
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FA4/palettes/0.pal b/data/tilesets/secondary/82D4FA4/palettes/0.pal
new file mode 100644
index 000000000..6d876039d
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D4FA4/palettes/1.pal b/data/tilesets/secondary/82D4FA4/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D4FA4/palettes/10.pal b/data/tilesets/secondary/82D4FA4/palettes/10.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/palettes/11.pal b/data/tilesets/secondary/82D4FA4/palettes/11.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/palettes/12.pal b/data/tilesets/secondary/82D4FA4/palettes/12.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/palettes/13.pal b/data/tilesets/secondary/82D4FA4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/palettes/14.pal b/data/tilesets/secondary/82D4FA4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/palettes/15.pal b/data/tilesets/secondary/82D4FA4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/palettes/2.pal b/data/tilesets/secondary/82D4FA4/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D4FA4/palettes/3.pal b/data/tilesets/secondary/82D4FA4/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D4FA4/palettes/4.pal b/data/tilesets/secondary/82D4FA4/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/secondary/82D4FA4/palettes/5.pal b/data/tilesets/secondary/82D4FA4/palettes/5.pal
new file mode 100644
index 000000000..0eef3df8e
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+255 0 255
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/palettes/6.pal b/data/tilesets/secondary/82D4FA4/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/palettes/7.pal b/data/tilesets/secondary/82D4FA4/palettes/7.pal
new file mode 100644
index 000000000..c1e7c3d5c
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
diff --git a/data/tilesets/secondary/82D4FA4/palettes/8.pal b/data/tilesets/secondary/82D4FA4/palettes/8.pal
new file mode 100644
index 000000000..c1e7c3d5c
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
diff --git a/data/tilesets/secondary/82D4FA4/palettes/9.pal b/data/tilesets/secondary/82D4FA4/palettes/9.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FA4/tiles.png b/data/tilesets/secondary/82D4FA4/tiles.png
new file mode 100644
index 000000000..9fcf94314
--- /dev/null
+++ b/data/tilesets/secondary/82D4FA4/tiles.png
diff --git a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin b/data/tilesets/secondary/82D4FBC/metatile_attributes.bin
new file mode 100644
index 000000000..1b1cb4d44
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FBC/metatiles.bin b/data/tilesets/secondary/82D4FBC/metatiles.bin
new file mode 100644
index 000000000..274da22a6
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FBC/palettes/0.pal b/data/tilesets/secondary/82D4FBC/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4FBC/palettes/1.pal b/data/tilesets/secondary/82D4FBC/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4FBC/palettes/10.pal b/data/tilesets/secondary/82D4FBC/palettes/10.pal
new file mode 100644
index 000000000..937405d15
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+255 238 164
+230 197 139
+205 172 123
+172 139 106
+213 197 189
+205 180 156
+189 148 139
+148 115 106
+115 65 74
+82 49 65
+90 90 98
diff --git a/data/tilesets/secondary/82D4FBC/palettes/11.pal b/data/tilesets/secondary/82D4FBC/palettes/11.pal
new file mode 100644
index 000000000..bb4f4867c
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+238 222 148
+222 205 115
+205 180 98
+189 172 98
diff --git a/data/tilesets/secondary/82D4FBC/palettes/12.pal b/data/tilesets/secondary/82D4FBC/palettes/12.pal
new file mode 100644
index 000000000..583384664
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4FBC/palettes/13.pal b/data/tilesets/secondary/82D4FBC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FBC/palettes/14.pal b/data/tilesets/secondary/82D4FBC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FBC/palettes/15.pal b/data/tilesets/secondary/82D4FBC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FBC/palettes/2.pal b/data/tilesets/secondary/82D4FBC/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4FBC/palettes/3.pal b/data/tilesets/secondary/82D4FBC/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4FBC/palettes/4.pal b/data/tilesets/secondary/82D4FBC/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4FBC/palettes/5.pal b/data/tilesets/secondary/82D4FBC/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4FBC/palettes/6.pal b/data/tilesets/secondary/82D4FBC/palettes/6.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FBC/palettes/7.pal b/data/tilesets/secondary/82D4FBC/palettes/7.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FBC/palettes/8.pal b/data/tilesets/secondary/82D4FBC/palettes/8.pal
new file mode 100644
index 000000000..6774e407f
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+222 197 189
+205 180 156
+189 148 139
+148 115 106
+115 65 74
+82 49 65
+90 90 98
diff --git a/data/tilesets/secondary/82D4FBC/palettes/9.pal b/data/tilesets/secondary/82D4FBC/palettes/9.pal
new file mode 100644
index 000000000..3795f6c6a
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 222 213
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+255 238 164
+230 197 139
+205 172 123
+164 123 90
+148 115 74
+106 65 41
+74 74 57
+0 0 0
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D4FBC/tiles.png b/data/tilesets/secondary/82D4FBC/tiles.png
new file mode 100644
index 000000000..b2d960c60
--- /dev/null
+++ b/data/tilesets/secondary/82D4FBC/tiles.png
diff --git a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin b/data/tilesets/secondary/82D4FD4/metatile_attributes.bin
new file mode 100644
index 000000000..1b1cb4d44
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FD4/metatiles.bin b/data/tilesets/secondary/82D4FD4/metatiles.bin
new file mode 100644
index 000000000..8f740f6af
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FD4/palettes/0.pal b/data/tilesets/secondary/82D4FD4/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4FD4/palettes/1.pal b/data/tilesets/secondary/82D4FD4/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4FD4/palettes/10.pal b/data/tilesets/secondary/82D4FD4/palettes/10.pal
new file mode 100644
index 000000000..937405d15
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+255 238 164
+230 197 139
+205 172 123
+172 139 106
+213 197 189
+205 180 156
+189 148 139
+148 115 106
+115 65 74
+82 49 65
+90 90 98
diff --git a/data/tilesets/secondary/82D4FD4/palettes/11.pal b/data/tilesets/secondary/82D4FD4/palettes/11.pal
new file mode 100644
index 000000000..bb4f4867c
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+238 222 148
+222 205 115
+205 180 98
+189 172 98
diff --git a/data/tilesets/secondary/82D4FD4/palettes/12.pal b/data/tilesets/secondary/82D4FD4/palettes/12.pal
new file mode 100644
index 000000000..583384664
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
diff --git a/data/tilesets/secondary/82D4FD4/palettes/13.pal b/data/tilesets/secondary/82D4FD4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FD4/palettes/14.pal b/data/tilesets/secondary/82D4FD4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FD4/palettes/15.pal b/data/tilesets/secondary/82D4FD4/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FD4/palettes/2.pal b/data/tilesets/secondary/82D4FD4/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4FD4/palettes/3.pal b/data/tilesets/secondary/82D4FD4/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4FD4/palettes/4.pal b/data/tilesets/secondary/82D4FD4/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D4FD4/palettes/5.pal b/data/tilesets/secondary/82D4FD4/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4FD4/palettes/6.pal b/data/tilesets/secondary/82D4FD4/palettes/6.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FD4/palettes/7.pal b/data/tilesets/secondary/82D4FD4/palettes/7.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FD4/palettes/8.pal b/data/tilesets/secondary/82D4FD4/palettes/8.pal
new file mode 100644
index 000000000..6774e407f
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+222 197 189
+205 180 156
+189 148 139
+148 115 106
+115 65 74
+82 49 65
+90 90 98
diff --git a/data/tilesets/secondary/82D4FD4/palettes/9.pal b/data/tilesets/secondary/82D4FD4/palettes/9.pal
new file mode 100644
index 000000000..3795f6c6a
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 222 213
+189 189 156
+172 172 139
+148 139 115
+123 115 90
+255 238 164
+230 197 139
+205 172 123
+164 123 90
+148 115 74
+106 65 41
+74 74 57
+0 0 0
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D4FD4/tiles.png b/data/tilesets/secondary/82D4FD4/tiles.png
new file mode 100644
index 000000000..201df80fb
--- /dev/null
+++ b/data/tilesets/secondary/82D4FD4/tiles.png
diff --git a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin b/data/tilesets/secondary/82D4FEC/metatile_attributes.bin
new file mode 100644
index 000000000..45432b773
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FEC/metatiles.bin b/data/tilesets/secondary/82D4FEC/metatiles.bin
new file mode 100644
index 000000000..b80796821
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FEC/palettes/0.pal b/data/tilesets/secondary/82D4FEC/palettes/0.pal
new file mode 100644
index 000000000..30ff4070a
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D4FEC/palettes/1.pal b/data/tilesets/secondary/82D4FEC/palettes/1.pal
new file mode 100644
index 000000000..e15d979f1
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+222 230 230
+197 205 213
+172 189 205
+123 123 131
+65 49 65
+230 238 238
+90 189 139
+90 90 115
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D4FEC/palettes/10.pal b/data/tilesets/secondary/82D4FEC/palettes/10.pal
new file mode 100644
index 000000000..fc340ed15
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+255 238 164
+230 197 139
+205 172 123
+172 139 106
+213 172 172
+197 156 148
+172 123 123
+131 82 74
+115 49 49
+90 24 24
+90 90 98
diff --git a/data/tilesets/secondary/82D4FEC/palettes/11.pal b/data/tilesets/secondary/82D4FEC/palettes/11.pal
new file mode 100644
index 000000000..e07ce6909
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+197 197 180
+172 172 156
+148 148 123
+123 123 106
+164 172 172
+255 230 65
+123 123 106
+255 255 255
+74 65 74
+238 238 230
+189 189 180
+230 230 205
+205 205 180
+180 180 164
+164 164 148
diff --git a/data/tilesets/secondary/82D4FEC/palettes/12.pal b/data/tilesets/secondary/82D4FEC/palettes/12.pal
new file mode 100644
index 000000000..cc53a5940
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+139 205 246
+98 172 197
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+139 90 90
+106 65 65
+82 49 49
+49 32 32
+24 16 16
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FEC/palettes/13.pal b/data/tilesets/secondary/82D4FEC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FEC/palettes/14.pal b/data/tilesets/secondary/82D4FEC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FEC/palettes/15.pal b/data/tilesets/secondary/82D4FEC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D4FEC/palettes/2.pal b/data/tilesets/secondary/82D4FEC/palettes/2.pal
new file mode 100644
index 000000000..372fb5d7c
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D4FEC/palettes/3.pal b/data/tilesets/secondary/82D4FEC/palettes/3.pal
new file mode 100644
index 000000000..973765509
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4FEC/palettes/4.pal b/data/tilesets/secondary/82D4FEC/palettes/4.pal
new file mode 100644
index 000000000..91fdcabdf
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+213 238 255
+172 205 255
+139 180 238
+106 156 230
+74 139 189
+65 123 189
+82 139 205
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 172
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D4FEC/palettes/5.pal b/data/tilesets/secondary/82D4FEC/palettes/5.pal
new file mode 100644
index 000000000..0edb843f5
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D4FEC/palettes/6.pal b/data/tilesets/secondary/82D4FEC/palettes/6.pal
new file mode 100644
index 000000000..32afdccbb
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+213 238 255
+172 205 255
+139 180 238
+106 156 230
+65 123 172
+41 98 156
+74 115 197
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 172
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D4FEC/palettes/7.pal b/data/tilesets/secondary/82D4FEC/palettes/7.pal
new file mode 100644
index 000000000..fa9d5d633
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+172 123 123
+139 98 98
+115 74 74
+90 49 49
+65 24 24
+41 0 0
+41 41 49
diff --git a/data/tilesets/secondary/82D4FEC/palettes/8.pal b/data/tilesets/secondary/82D4FEC/palettes/8.pal
new file mode 100644
index 000000000..f4a797b87
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+197 197 180
+172 172 156
+148 148 123
+123 123 106
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+213 172 172
+197 156 148
+172 123 123
+131 82 74
+115 49 49
+90 24 24
+90 90 98
diff --git a/data/tilesets/secondary/82D4FEC/palettes/9.pal b/data/tilesets/secondary/82D4FEC/palettes/9.pal
new file mode 100644
index 000000000..0a2109195
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+197 197 180
+172 172 156
+148 148 123
+123 123 106
+255 238 164
+230 197 139
+205 172 123
+164 123 90
+148 115 74
+106 65 41
+74 74 57
+0 0 0
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D4FEC/tiles.png b/data/tilesets/secondary/82D4FEC/tiles.png
new file mode 100644
index 000000000..04d2b7b67
--- /dev/null
+++ b/data/tilesets/secondary/82D4FEC/tiles.png
diff --git a/data/tilesets/secondary/82D5004/metatile_attributes.bin b/data/tilesets/secondary/82D5004/metatile_attributes.bin
new file mode 100644
index 000000000..6d6c6d544
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5004/metatiles.bin b/data/tilesets/secondary/82D5004/metatiles.bin
new file mode 100644
index 000000000..fb47747c4
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/metatiles.bin
diff --git a/data/tilesets/secondary/82D5004/palettes/0.pal b/data/tilesets/secondary/82D5004/palettes/0.pal
new file mode 100644
index 000000000..7af5bb7d2
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D5004/palettes/1.pal b/data/tilesets/secondary/82D5004/palettes/1.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/82D5004/palettes/10.pal b/data/tilesets/secondary/82D5004/palettes/10.pal
new file mode 100644
index 000000000..746437492
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+222 230 246
+189 197 222
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+49 139 49
+57 82 0
+49 180 98
+238 230 164
+222 205 131
+213 180 106
+205 156 82
+106 205 164
diff --git a/data/tilesets/secondary/82D5004/palettes/11.pal b/data/tilesets/secondary/82D5004/palettes/11.pal
new file mode 100644
index 000000000..6fe747b2d
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 148
+222 213 98
+57 148 49
+57 82 0
+57 115 24
+98 65 74
+131 106 82
+65 57 49
+164 164 49
+115 106 49
+255 0 255
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D5004/palettes/12.pal b/data/tilesets/secondary/82D5004/palettes/12.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5004/palettes/13.pal b/data/tilesets/secondary/82D5004/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5004/palettes/14.pal b/data/tilesets/secondary/82D5004/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5004/palettes/15.pal b/data/tilesets/secondary/82D5004/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5004/palettes/2.pal b/data/tilesets/secondary/82D5004/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D5004/palettes/3.pal b/data/tilesets/secondary/82D5004/palettes/3.pal
new file mode 100644
index 000000000..9581f2cd8
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 131
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D5004/palettes/4.pal b/data/tilesets/secondary/82D5004/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D5004/palettes/5.pal b/data/tilesets/secondary/82D5004/palettes/5.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D5004/palettes/6.pal b/data/tilesets/secondary/82D5004/palettes/6.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/82D5004/palettes/7.pal b/data/tilesets/secondary/82D5004/palettes/7.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5004/palettes/8.pal b/data/tilesets/secondary/82D5004/palettes/8.pal
new file mode 100644
index 000000000..650a35cc8
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+57 115 24
+98 65 74
+131 106 82
+65 57 49
+255 0 255
+255 0 255
+255 0 255
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D5004/palettes/9.pal b/data/tilesets/secondary/82D5004/palettes/9.pal
new file mode 100644
index 000000000..df2d04037
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+213 230 189
+57 172 131
+222 230 246
+230 172 123
+106 205 164
diff --git a/data/tilesets/secondary/82D5004/tiles.png b/data/tilesets/secondary/82D5004/tiles.png
new file mode 100644
index 000000000..dacbc0120
--- /dev/null
+++ b/data/tilesets/secondary/82D5004/tiles.png
diff --git a/data/tilesets/secondary/82D501C/metatile_attributes.bin b/data/tilesets/secondary/82D501C/metatile_attributes.bin
new file mode 100644
index 000000000..6e3d955e2
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D501C/metatiles.bin b/data/tilesets/secondary/82D501C/metatiles.bin
new file mode 100644
index 000000000..7fdc5c55d
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/metatiles.bin
diff --git a/data/tilesets/secondary/82D501C/palettes/0.pal b/data/tilesets/secondary/82D501C/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D501C/palettes/1.pal b/data/tilesets/secondary/82D501C/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D501C/palettes/10.pal b/data/tilesets/secondary/82D501C/palettes/10.pal
new file mode 100644
index 000000000..334da8f23
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+238 238 230
+172 172 164
+74 74 74
+0 0 0
+255 246 180
+238 222 123
+197 205 123
+197 213 205
+255 255 255
+255 255 255
+246 246 238
+222 222 213
+189 189 180
+156 156 139
+98 98 90
diff --git a/data/tilesets/secondary/82D501C/palettes/11.pal b/data/tilesets/secondary/82D501C/palettes/11.pal
new file mode 100644
index 000000000..0c3d2870e
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+230 197 65
+197 213 205
+180 197 189
+164 172 172
+205 205 197
+255 230 65
+123 123 131
+255 255 255
+74 65 74
+238 238 230
+189 189 180
+238 238 230
+222 222 213
+205 205 197
+156 156 164
diff --git a/data/tilesets/secondary/82D501C/palettes/12.pal b/data/tilesets/secondary/82D501C/palettes/12.pal
new file mode 100644
index 000000000..a68c94c2c
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+197 213 205
+180 197 189
+164 172 172
+131 148 139
+255 0 255
+255 0 255
+255 0 255
+139 156 180
+139 139 164
+131 139 148
+115 115 131
+90 90 106
+82 82 82
+57 65 65
diff --git a/data/tilesets/secondary/82D501C/palettes/13.pal b/data/tilesets/secondary/82D501C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D501C/palettes/14.pal b/data/tilesets/secondary/82D501C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D501C/palettes/15.pal b/data/tilesets/secondary/82D501C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D501C/palettes/2.pal b/data/tilesets/secondary/82D501C/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D501C/palettes/3.pal b/data/tilesets/secondary/82D501C/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D501C/palettes/4.pal b/data/tilesets/secondary/82D501C/palettes/4.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/82D501C/palettes/5.pal b/data/tilesets/secondary/82D501C/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D501C/palettes/6.pal b/data/tilesets/secondary/82D501C/palettes/6.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D501C/palettes/7.pal b/data/tilesets/secondary/82D501C/palettes/7.pal
new file mode 100644
index 000000000..364379ad9
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+255 0 255
+197 213 205
+180 197 189
+164 172 172
+131 148 139
+255 0 255
+246 205 74
+255 0 255
+180 189 197
+180 189 197
+189 197 197
+164 172 172
+131 139 139
+106 106 106
+90 90 82
diff --git a/data/tilesets/secondary/82D501C/palettes/8.pal b/data/tilesets/secondary/82D501C/palettes/8.pal
new file mode 100644
index 000000000..102aaaf2c
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+255 0 255
+197 213 205
+180 197 189
+164 172 172
+131 148 139
+255 0 255
+255 0 255
+255 0 255
+255 255 255
+255 255 255
+246 246 238
+222 222 213
+189 189 180
+156 156 139
+98 98 90
diff --git a/data/tilesets/secondary/82D501C/palettes/9.pal b/data/tilesets/secondary/82D501C/palettes/9.pal
new file mode 100644
index 000000000..91329f82e
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+238 238 164
+197 213 205
+180 197 189
+164 172 172
+205 205 106
+205 205 197
+172 172 90
+123 131 74
+82 90 32
+106 106 82
+74 74 74
+0 0 0
+98 139 197
+74 115 172
+57 98 156
diff --git a/data/tilesets/secondary/82D501C/tiles.png b/data/tilesets/secondary/82D501C/tiles.png
new file mode 100644
index 000000000..cbce25763
--- /dev/null
+++ b/data/tilesets/secondary/82D501C/tiles.png
diff --git a/data/tilesets/secondary/82D5034/metatile_attributes.bin b/data/tilesets/secondary/82D5034/metatile_attributes.bin
new file mode 100644
index 000000000..5fe7d59fc
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5034/metatiles.bin b/data/tilesets/secondary/82D5034/metatiles.bin
new file mode 100644
index 000000000..2b3a9543e
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/metatiles.bin
diff --git a/data/tilesets/secondary/82D5034/palettes/0.pal b/data/tilesets/secondary/82D5034/palettes/0.pal
new file mode 100644
index 000000000..83b30fc17
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 172 82
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D5034/palettes/1.pal b/data/tilesets/secondary/82D5034/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D5034/palettes/10.pal b/data/tilesets/secondary/82D5034/palettes/10.pal
new file mode 100644
index 000000000..fb565545b
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 172 82
+82 82 106
+230 222 164
+156 148 90
+123 115 115
+205 197 106
+164 156 90
+189 172 90
+246 246 222
+238 238 164
+98 106 90
+205 213 156
+139 148 106
+98 98 106
+90 0 255
+222 222 230
diff --git a/data/tilesets/secondary/82D5034/palettes/11.pal b/data/tilesets/secondary/82D5034/palettes/11.pal
new file mode 100644
index 000000000..e637019c6
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 172 82
+82 82 106
+230 222 164
+156 148 90
+123 115 115
+205 197 106
+164 156 90
+189 172 90
+246 246 222
+238 238 164
+98 106 90
+205 213 156
+139 148 106
+98 98 106
+90 0 255
+139 148 139
diff --git a/data/tilesets/secondary/82D5034/palettes/12.pal b/data/tilesets/secondary/82D5034/palettes/12.pal
new file mode 100644
index 000000000..775369fed
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 172 82
+82 82 106
+230 222 164
+156 148 90
+123 115 115
+205 197 106
+164 156 90
+189 172 90
+246 246 222
+238 238 164
+98 106 90
+205 213 156
+139 148 106
+98 98 106
+90 0 255
+156 197 213
diff --git a/data/tilesets/secondary/82D5034/palettes/13.pal b/data/tilesets/secondary/82D5034/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5034/palettes/14.pal b/data/tilesets/secondary/82D5034/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5034/palettes/15.pal b/data/tilesets/secondary/82D5034/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5034/palettes/2.pal b/data/tilesets/secondary/82D5034/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D5034/palettes/3.pal b/data/tilesets/secondary/82D5034/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D5034/palettes/4.pal b/data/tilesets/secondary/82D5034/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/secondary/82D5034/palettes/5.pal b/data/tilesets/secondary/82D5034/palettes/5.pal
new file mode 100644
index 000000000..c7780e5c7
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+255 0 255
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+197 197 205
+205 82 65
+0 0 0
diff --git a/data/tilesets/secondary/82D5034/palettes/6.pal b/data/tilesets/secondary/82D5034/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5034/palettes/7.pal b/data/tilesets/secondary/82D5034/palettes/7.pal
new file mode 100644
index 000000000..dfa779635
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 172 82
+82 82 106
+131 131 131
+98 131 131
+139 172 172
+164 205 189
+98 106 131
+90 98 106
+98 156 197
+164 172 139
+139 156 139
+115 123 123
+205 213 156
+180 197 156
+164 172 156
+90 0 255
diff --git a/data/tilesets/secondary/82D5034/palettes/8.pal b/data/tilesets/secondary/82D5034/palettes/8.pal
new file mode 100644
index 000000000..fd7d8a9d7
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 172 82
+82 82 106
+230 222 164
+156 148 90
+123 115 115
+205 197 106
+164 156 90
+189 172 90
+246 246 222
+238 238 164
+98 106 90
+205 213 156
+139 148 106
+98 98 106
+205 139 189
+213 148 74
diff --git a/data/tilesets/secondary/82D5034/palettes/9.pal b/data/tilesets/secondary/82D5034/palettes/9.pal
new file mode 100644
index 000000000..0d43d6ef9
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 172 82
+82 82 106
+230 222 164
+156 148 90
+123 115 115
+205 197 106
+164 156 90
+189 172 90
+246 246 222
+238 238 164
+98 106 90
+205 213 156
+139 148 106
+98 98 106
+131 205 82
+230 213 82
diff --git a/data/tilesets/secondary/82D5034/tiles.png b/data/tilesets/secondary/82D5034/tiles.png
new file mode 100644
index 000000000..c61f91c47
--- /dev/null
+++ b/data/tilesets/secondary/82D5034/tiles.png
diff --git a/data/tilesets/secondary/82D504C/metatile_attributes.bin b/data/tilesets/secondary/82D504C/metatile_attributes.bin
new file mode 100644
index 000000000..62eb1b917
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D504C/metatiles.bin b/data/tilesets/secondary/82D504C/metatiles.bin
new file mode 100644
index 000000000..52d2f020d
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/metatiles.bin
diff --git a/data/tilesets/secondary/82D504C/palettes/0.pal b/data/tilesets/secondary/82D504C/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D504C/palettes/1.pal b/data/tilesets/secondary/82D504C/palettes/1.pal
new file mode 100644
index 000000000..e15d979f1
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+222 230 230
+197 205 213
+172 189 205
+123 123 131
+65 49 65
+230 238 238
+90 189 139
+90 90 115
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D504C/palettes/10.pal b/data/tilesets/secondary/82D504C/palettes/10.pal
new file mode 100644
index 000000000..265fb0625
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+205 222 238
+156 172 189
+123 123 131
+90 90 115
+65 74 106
+255 255 180
+255 238 123
+156 115 65
+238 197 246
+213 156 213
+189 106 172
+238 230 74
+238 189 0
+222 156 0
+255 255 255
diff --git a/data/tilesets/secondary/82D504C/palettes/11.pal b/data/tilesets/secondary/82D504C/palettes/11.pal
new file mode 100644
index 000000000..9e1e423c6
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+238 238 246
+197 205 222
+172 172 197
+139 156 172
+123 123 131
+90 90 115
+65 74 106
+123 139 222
+115 189 246
+255 230 156
+255 189 65
+238 164 41
+213 131 16
+180 82 0
+255 205 106
diff --git a/data/tilesets/secondary/82D504C/palettes/12.pal b/data/tilesets/secondary/82D504C/palettes/12.pal
new file mode 100644
index 000000000..375e3914b
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+222 230 230
+197 205 213
+172 189 205
+123 123 131
+65 49 65
+230 238 238
+90 189 139
+90 90 115
+230 230 222
+213 213 197
+180 180 164
+148 148 131
+123 123 90
+98 98 74
+115 205 164
diff --git a/data/tilesets/secondary/82D504C/palettes/13.pal b/data/tilesets/secondary/82D504C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D504C/palettes/14.pal b/data/tilesets/secondary/82D504C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D504C/palettes/15.pal b/data/tilesets/secondary/82D504C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D504C/palettes/2.pal b/data/tilesets/secondary/82D504C/palettes/2.pal
new file mode 100644
index 000000000..372fb5d7c
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D504C/palettes/3.pal b/data/tilesets/secondary/82D504C/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D504C/palettes/4.pal b/data/tilesets/secondary/82D504C/palettes/4.pal
new file mode 100644
index 000000000..fca4a2623
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+213 238 255
+172 205 255
+139 180 238
+106 156 230
+74 139 189
+65 123 189
+82 139 205
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 172
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D504C/palettes/5.pal b/data/tilesets/secondary/82D504C/palettes/5.pal
new file mode 100644
index 000000000..09555ded5
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D504C/palettes/6.pal b/data/tilesets/secondary/82D504C/palettes/6.pal
new file mode 100644
index 000000000..f8ebbc6dc
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+213 238 255
+172 205 255
+139 180 238
+106 156 230
+65 123 172
+41 98 156
+74 115 197
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 172
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D504C/palettes/7.pal b/data/tilesets/secondary/82D504C/palettes/7.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D504C/palettes/8.pal b/data/tilesets/secondary/82D504C/palettes/8.pal
new file mode 100644
index 000000000..4d9ab6348
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+131 197 164
+98 164 131
+123 123 131
+90 90 115
+65 74 106
+222 230 238
+197 213 230
+164 180 197
+255 222 255
+222 172 230
+172 123 189
+148 98 164
+115 65 131
+238 213 156
+205 189 123
diff --git a/data/tilesets/secondary/82D504C/palettes/9.pal b/data/tilesets/secondary/82D504C/palettes/9.pal
new file mode 100644
index 000000000..b66fdcdbf
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+115 189 246
+98 164 222
+123 123 131
+90 90 115
+65 74 106
+246 246 213
+230 230 189
+189 189 148
+172 172 131
+156 156 115
+230 222 115
+246 156 115
+222 115 98
+131 230 180
+49 164 123
diff --git a/data/tilesets/secondary/82D504C/tiles.png b/data/tilesets/secondary/82D504C/tiles.png
new file mode 100644
index 000000000..ad8f73a2c
--- /dev/null
+++ b/data/tilesets/secondary/82D504C/tiles.png
diff --git a/data/tilesets/secondary/82D5064/metatile_attributes.bin b/data/tilesets/secondary/82D5064/metatile_attributes.bin
new file mode 100644
index 000000000..d67c4690c
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5064/metatiles.bin b/data/tilesets/secondary/82D5064/metatiles.bin
new file mode 100644
index 000000000..7613f3702
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/metatiles.bin
diff --git a/data/tilesets/secondary/82D5064/palettes/0.pal b/data/tilesets/secondary/82D5064/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D5064/palettes/1.pal b/data/tilesets/secondary/82D5064/palettes/1.pal
new file mode 100644
index 000000000..d8a4e7757
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D5064/palettes/10.pal b/data/tilesets/secondary/82D5064/palettes/10.pal
new file mode 100644
index 000000000..86502dd48
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+205 222 230
+164 180 197
+123 123 131
+90 90 115
+65 74 106
+205 197 148
+180 172 123
+156 148 106
+230 156 106
+197 115 74
+172 98 49
+148 82 32
+205 222 230
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5064/palettes/11.pal b/data/tilesets/secondary/82D5064/palettes/11.pal
new file mode 100644
index 000000000..b05410cba
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+0 0 0
+0 0 0
+0 0 0
+131 131 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+0 0 0
diff --git a/data/tilesets/secondary/82D5064/palettes/12.pal b/data/tilesets/secondary/82D5064/palettes/12.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5064/palettes/13.pal b/data/tilesets/secondary/82D5064/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5064/palettes/14.pal b/data/tilesets/secondary/82D5064/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5064/palettes/15.pal b/data/tilesets/secondary/82D5064/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5064/palettes/2.pal b/data/tilesets/secondary/82D5064/palettes/2.pal
new file mode 100644
index 000000000..372fb5d7c
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D5064/palettes/3.pal b/data/tilesets/secondary/82D5064/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D5064/palettes/4.pal b/data/tilesets/secondary/82D5064/palettes/4.pal
new file mode 100644
index 000000000..fca4a2623
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+213 238 255
+172 205 255
+139 180 238
+106 156 230
+74 139 189
+65 123 189
+82 139 205
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 172
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D5064/palettes/5.pal b/data/tilesets/secondary/82D5064/palettes/5.pal
new file mode 100644
index 000000000..09555ded5
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D5064/palettes/6.pal b/data/tilesets/secondary/82D5064/palettes/6.pal
new file mode 100644
index 000000000..f8ebbc6dc
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+213 238 255
+172 205 255
+139 180 238
+106 156 230
+65 123 172
+41 98 156
+74 115 197
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 172
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D5064/palettes/7.pal b/data/tilesets/secondary/82D5064/palettes/7.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5064/palettes/8.pal b/data/tilesets/secondary/82D5064/palettes/8.pal
new file mode 100644
index 000000000..4d9ab6348
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+131 197 164
+98 164 131
+123 123 131
+90 90 115
+65 74 106
+222 230 238
+197 213 230
+164 180 197
+255 222 255
+222 172 230
+172 123 189
+148 98 164
+115 65 131
+238 213 156
+205 189 123
diff --git a/data/tilesets/secondary/82D5064/palettes/9.pal b/data/tilesets/secondary/82D5064/palettes/9.pal
new file mode 100644
index 000000000..5ac617b25
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+156 156 222
+255 238 189
+123 123 131
+90 90 115
+65 74 106
+222 230 238
+197 213 230
+164 180 197
+255 222 139
+230 172 98
+213 139 74
+197 115 49
+156 90 16
+115 189 246
+74 131 197
diff --git a/data/tilesets/secondary/82D5064/tiles.png b/data/tilesets/secondary/82D5064/tiles.png
new file mode 100644
index 000000000..744b38638
--- /dev/null
+++ b/data/tilesets/secondary/82D5064/tiles.png
diff --git a/data/tilesets/secondary/82D507C/metatile_attributes.bin b/data/tilesets/secondary/82D507C/metatile_attributes.bin
new file mode 100644
index 000000000..edf192276
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D507C/metatiles.bin b/data/tilesets/secondary/82D507C/metatiles.bin
new file mode 100644
index 000000000..13f97073b
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/metatiles.bin
diff --git a/data/tilesets/secondary/82D507C/palettes/0.pal b/data/tilesets/secondary/82D507C/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D507C/palettes/1.pal b/data/tilesets/secondary/82D507C/palettes/1.pal
new file mode 100644
index 000000000..09828f4f1
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+123 123 131
+32 49 57
+230 238 238
+90 189 139
+90 90 115
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+123 74 74
+90 57 65
+115 205 164
diff --git a/data/tilesets/secondary/82D507C/palettes/10.pal b/data/tilesets/secondary/82D507C/palettes/10.pal
new file mode 100644
index 000000000..d26d003af
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+238 246 255
+197 213 222
+172 189 197
+139 156 172
+123 123 131
+90 90 115
+65 74 106
+255 0 255
+131 172 148
+189 180 164
+172 164 156
+148 139 139
+123 115 115
+106 98 106
+115 205 164
diff --git a/data/tilesets/secondary/82D507C/palettes/11.pal b/data/tilesets/secondary/82D507C/palettes/11.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D507C/palettes/12.pal b/data/tilesets/secondary/82D507C/palettes/12.pal
new file mode 100644
index 000000000..995731c23
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D507C/palettes/13.pal b/data/tilesets/secondary/82D507C/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D507C/palettes/14.pal b/data/tilesets/secondary/82D507C/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D507C/palettes/15.pal b/data/tilesets/secondary/82D507C/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D507C/palettes/2.pal b/data/tilesets/secondary/82D507C/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D507C/palettes/3.pal b/data/tilesets/secondary/82D507C/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D507C/palettes/4.pal b/data/tilesets/secondary/82D507C/palettes/4.pal
new file mode 100644
index 000000000..5871a448c
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+230 246 255
+189 222 255
+139 189 255
+115 164 255
+65 139 222
+57 115 222
+82 148 230
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 197
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D507C/palettes/5.pal b/data/tilesets/secondary/82D507C/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D507C/palettes/6.pal b/data/tilesets/secondary/82D507C/palettes/6.pal
new file mode 100644
index 000000000..9bad44649
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+205 230 246
+180 213 255
+123 180 246
+98 148 230
+65 123 189
+49 98 180
+82 131 222
+213 230 238
+172 189 205
+123 123 131
+90 90 115
+238 246 246
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D507C/palettes/7.pal b/data/tilesets/secondary/82D507C/palettes/7.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D507C/palettes/8.pal b/data/tilesets/secondary/82D507C/palettes/8.pal
new file mode 100644
index 000000000..4d9ab6348
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+131 197 164
+98 164 131
+123 123 131
+90 90 115
+65 74 106
+222 230 238
+197 213 230
+164 180 197
+255 222 255
+222 172 230
+172 123 189
+148 98 164
+115 65 131
+238 213 156
+205 189 123
diff --git a/data/tilesets/secondary/82D507C/palettes/9.pal b/data/tilesets/secondary/82D507C/palettes/9.pal
new file mode 100644
index 000000000..edc5961bb
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+238 246 255
+197 213 222
+139 156 172
+123 123 131
+90 90 115
+65 74 106
+115 172 246
+65 123 172
+49 90 139
+32 74 123
+189 230 164
+115 156 90
+148 131 74
+156 213 255
+98 164 230
diff --git a/data/tilesets/secondary/82D507C/tiles.png b/data/tilesets/secondary/82D507C/tiles.png
new file mode 100644
index 000000000..d40c92649
--- /dev/null
+++ b/data/tilesets/secondary/82D507C/tiles.png
diff --git a/data/tilesets/secondary/82D5094/metatile_attributes.bin b/data/tilesets/secondary/82D5094/metatile_attributes.bin
new file mode 100644
index 000000000..96b25bb0f
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5094/metatiles.bin b/data/tilesets/secondary/82D5094/metatiles.bin
new file mode 100644
index 000000000..f045f57e8
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/metatiles.bin
diff --git a/data/tilesets/secondary/82D5094/palettes/0.pal b/data/tilesets/secondary/82D5094/palettes/0.pal
new file mode 100644
index 000000000..8db07d418
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D5094/palettes/1.pal b/data/tilesets/secondary/82D5094/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D5094/palettes/10.pal b/data/tilesets/secondary/82D5094/palettes/10.pal
new file mode 100644
index 000000000..ab3a7d14f
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+172 213 255
+139 189 246
+123 172 222
+98 180 230
+106 148 213
+255 0 255
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+189 230 255
+189 230 255
+156 189 213
+90 131 180
diff --git a/data/tilesets/secondary/82D5094/palettes/11.pal b/data/tilesets/secondary/82D5094/palettes/11.pal
new file mode 100644
index 000000000..bb88b4d57
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+148 148 148
+123 123 123
+98 98 98
+82 82 106
+255 213 90
+230 164 74
+255 0 255
+222 230 238
+197 205 156
+205 139 115
+172 172 172
+222 230 189
+230 172 139
+0 0 0
+255 255 255
diff --git a/data/tilesets/secondary/82D5094/palettes/12.pal b/data/tilesets/secondary/82D5094/palettes/12.pal
new file mode 100644
index 000000000..b0d005f21
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+205 205 205
+255 131 65
+222 98 32
+255 0 255
+222 213 90
+197 189 65
+189 180 49
+172 164 32
+213 205 90
+148 148 148
+230 230 230
diff --git a/data/tilesets/secondary/82D5094/palettes/13.pal b/data/tilesets/secondary/82D5094/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5094/palettes/14.pal b/data/tilesets/secondary/82D5094/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5094/palettes/15.pal b/data/tilesets/secondary/82D5094/palettes/15.pal
new file mode 100644
index 000000000..6a17f18dc
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+172 222 172
+189 238 197
+139 189 139
+205 246 213
+172 222 172
+74 106 156
+90 131 180
+213 222 222
+156 189 213
+238 139 98
+189 98 74
+156 65 49
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5094/palettes/2.pal b/data/tilesets/secondary/82D5094/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D5094/palettes/3.pal b/data/tilesets/secondary/82D5094/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D5094/palettes/4.pal b/data/tilesets/secondary/82D5094/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/secondary/82D5094/palettes/5.pal b/data/tilesets/secondary/82D5094/palettes/5.pal
new file mode 100644
index 000000000..c7780e5c7
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+255 0 255
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+197 197 205
+205 82 65
+0 0 0
diff --git a/data/tilesets/secondary/82D5094/palettes/6.pal b/data/tilesets/secondary/82D5094/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D5094/palettes/7.pal b/data/tilesets/secondary/82D5094/palettes/7.pal
new file mode 100644
index 000000000..edc5961bb
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+238 246 255
+197 213 222
+139 156 172
+123 123 131
+90 90 115
+65 74 106
+115 172 246
+65 123 172
+49 90 139
+32 74 123
+189 230 164
+115 156 90
+148 131 74
+156 213 255
+98 164 230
diff --git a/data/tilesets/secondary/82D5094/palettes/8.pal b/data/tilesets/secondary/82D5094/palettes/8.pal
new file mode 100644
index 000000000..317213c42
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+123 74 148
+148 106 180
+230 213 246
+205 172 213
+222 213 90
+197 189 65
+189 180 49
+172 164 32
+213 205 90
+255 0 255
+255 0 255
diff --git a/data/tilesets/secondary/82D5094/palettes/9.pal b/data/tilesets/secondary/82D5094/palettes/9.pal
new file mode 100644
index 000000000..19dc9a47e
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+255 0 255
+255 131 115
+106 197 106
+164 255 180
+238 197 115
+213 131 74
+189 213 230
+123 156 180
+90 123 156
+156 180 205
+222 230 238
diff --git a/data/tilesets/secondary/82D5094/tiles.png b/data/tilesets/secondary/82D5094/tiles.png
new file mode 100644
index 000000000..f74f7c9f7
--- /dev/null
+++ b/data/tilesets/secondary/82D5094/tiles.png
diff --git a/data/tilesets/secondary/82D50AC/metatile_attributes.bin b/data/tilesets/secondary/82D50AC/metatile_attributes.bin
new file mode 100644
index 000000000..9dd5f613d
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50AC/metatiles.bin b/data/tilesets/secondary/82D50AC/metatiles.bin
new file mode 100644
index 000000000..d5916a2cf
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/metatiles.bin
diff --git a/data/tilesets/secondary/82D50AC/palettes/0.pal b/data/tilesets/secondary/82D50AC/palettes/0.pal
new file mode 100644
index 000000000..2f3f97d6f
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+189 255 139
+131 213 98
+57 148 49
+57 90 16
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/82D50AC/palettes/1.pal b/data/tilesets/secondary/82D50AC/palettes/1.pal
new file mode 100644
index 000000000..22eb1667c
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+123 123 131
+65 49 65
+230 238 238
+90 189 139
+90 90 115
+238 213 197
+222 197 164
+189 148 139
+148 106 106
+115 65 74
+82 49 65
+115 205 164
diff --git a/data/tilesets/secondary/82D50AC/palettes/10.pal b/data/tilesets/secondary/82D50AC/palettes/10.pal
new file mode 100644
index 000000000..3c091df8b
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+148 148 164
+205 189 197
+255 255 255
+255 213 115
+189 148 49
+139 98 74
+90 106 180
+255 205 139
+230 172 90
+230 148 65
+180 98 24
+238 213 172
+222 156 139
+123 123 123
diff --git a/data/tilesets/secondary/82D50AC/palettes/11.pal b/data/tilesets/secondary/82D50AC/palettes/11.pal
new file mode 100644
index 000000000..c42eeb7e1
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+148 148 164
+172 172 164
+164 222 255
+115 180 205
+65 139 164
+41 106 148
+205 213 213
+238 230 139
+189 180 98
+139 131 65
+0 0 0
+255 255 255
+230 172 90
+189 246 255
diff --git a/data/tilesets/secondary/82D50AC/palettes/12.pal b/data/tilesets/secondary/82D50AC/palettes/12.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50AC/palettes/13.pal b/data/tilesets/secondary/82D50AC/palettes/13.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50AC/palettes/14.pal b/data/tilesets/secondary/82D50AC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50AC/palettes/15.pal b/data/tilesets/secondary/82D50AC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50AC/palettes/2.pal b/data/tilesets/secondary/82D50AC/palettes/2.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/82D50AC/palettes/3.pal b/data/tilesets/secondary/82D50AC/palettes/3.pal
new file mode 100644
index 000000000..205c464c7
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/82D50AC/palettes/4.pal b/data/tilesets/secondary/82D50AC/palettes/4.pal
new file mode 100644
index 000000000..5871a448c
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+230 246 255
+189 222 255
+139 189 255
+115 164 255
+65 139 222
+57 115 222
+82 148 230
+205 222 238
+172 189 205
+123 123 131
+90 90 115
+49 115 197
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D50AC/palettes/5.pal b/data/tilesets/secondary/82D50AC/palettes/5.pal
new file mode 100644
index 000000000..c5a653979
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+213 197 131
+197 172 106
+172 148 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/82D50AC/palettes/6.pal b/data/tilesets/secondary/82D50AC/palettes/6.pal
new file mode 100644
index 000000000..9bad44649
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+205 230 246
+180 213 255
+123 180 246
+98 148 230
+65 123 189
+49 98 180
+82 131 222
+213 230 238
+172 189 205
+123 123 131
+90 90 115
+238 246 246
+238 230 139
+230 213 139
+213 197 106
diff --git a/data/tilesets/secondary/82D50AC/palettes/7.pal b/data/tilesets/secondary/82D50AC/palettes/7.pal
new file mode 100644
index 000000000..6b0281bd6
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50AC/palettes/8.pal b/data/tilesets/secondary/82D50AC/palettes/8.pal
new file mode 100644
index 000000000..5c1251024
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+172 172 164
+205 213 213
+180 189 189
+148 156 156
+106 115 115
+197 246 230
+106 205 164
+57 156 115
+222 106 98
+222 213 123
+255 180 148
+197 189 98
+238 246 255
diff --git a/data/tilesets/secondary/82D50AC/palettes/9.pal b/data/tilesets/secondary/82D50AC/palettes/9.pal
new file mode 100644
index 000000000..c25501332
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+65 123 180
+238 246 255
+222 230 238
+189 205 230
+156 164 189
+139 139 156
+98 98 123
+57 57 106
+197 98 98
+172 65 106
+32 74 156
+197 148 0
+246 213 24
+222 238 255
+255 255 255
+74 106 139
diff --git a/data/tilesets/secondary/82D50AC/tiles.png b/data/tilesets/secondary/82D50AC/tiles.png
new file mode 100644
index 000000000..166ae2e18
--- /dev/null
+++ b/data/tilesets/secondary/82D50AC/tiles.png
diff --git a/data/tilesets/secondary/82D50C4/metatile_attributes.bin b/data/tilesets/secondary/82D50C4/metatile_attributes.bin
new file mode 100644
index 000000000..bcc2fedb4
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50C4/metatiles.bin b/data/tilesets/secondary/82D50C4/metatiles.bin
new file mode 100644
index 000000000..7cdfa846a
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/metatiles.bin
diff --git a/data/tilesets/secondary/82D50C4/palettes/0.pal b/data/tilesets/secondary/82D50C4/palettes/0.pal
new file mode 100644
index 000000000..8db07d418
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D50C4/palettes/1.pal b/data/tilesets/secondary/82D50C4/palettes/1.pal
new file mode 100644
index 000000000..fc945ef6c
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D50C4/palettes/10.pal b/data/tilesets/secondary/82D50C4/palettes/10.pal
new file mode 100644
index 000000000..18908d2ef
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+222 222 222
+106 115 115
+230 197 246
+180 82 205
+148 57 180
+230 222 123
+189 180 82
+230 230 172
+222 213 139
+222 164 164
+205 139 139
+205 180 238
+189 148 230
+164 131 205
diff --git a/data/tilesets/secondary/82D50C4/palettes/11.pal b/data/tilesets/secondary/82D50C4/palettes/11.pal
new file mode 100644
index 000000000..edc05893b
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+82 164 164
+255 255 255
+230 230 230
+123 123 123
+189 189 197
+148 148 156
+213 213 222
+98 98 106
+180 180 164
+230 172 164
+197 131 131
+180 82 205
+148 57 180
+106 189 189
+82 164 164
+57 139 139
diff --git a/data/tilesets/secondary/82D50C4/palettes/12.pal b/data/tilesets/secondary/82D50C4/palettes/12.pal
new file mode 100644
index 000000000..36807053a
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 90 98
+98 123 139
+164 197 197
+222 238 238
+255 255 255
+123 123 123
+180 82 205
+131 49 164
+131 164 164
+230 213 156
+255 0 255
+213 131 222
+255 246 156
+90 16 131
+41 49 57
diff --git a/data/tilesets/secondary/82D50C4/palettes/13.pal b/data/tilesets/secondary/82D50C4/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50C4/palettes/14.pal b/data/tilesets/secondary/82D50C4/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50C4/palettes/15.pal b/data/tilesets/secondary/82D50C4/palettes/15.pal
new file mode 100644
index 000000000..0b5e86def
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+131 230 255
diff --git a/data/tilesets/secondary/82D50C4/palettes/2.pal b/data/tilesets/secondary/82D50C4/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D50C4/palettes/3.pal b/data/tilesets/secondary/82D50C4/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D50C4/palettes/4.pal b/data/tilesets/secondary/82D50C4/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/secondary/82D50C4/palettes/5.pal b/data/tilesets/secondary/82D50C4/palettes/5.pal
new file mode 100644
index 000000000..34ef2f2d2
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+222 164 115
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+197 197 205
+205 82 65
+0 0 0
diff --git a/data/tilesets/secondary/82D50C4/palettes/6.pal b/data/tilesets/secondary/82D50C4/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50C4/palettes/7.pal b/data/tilesets/secondary/82D50C4/palettes/7.pal
new file mode 100644
index 000000000..6528f9f75
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
diff --git a/data/tilesets/secondary/82D50C4/palettes/8.pal b/data/tilesets/secondary/82D50C4/palettes/8.pal
new file mode 100644
index 000000000..6b56cd49e
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+222 222 222
+106 115 115
+189 230 255
+123 205 255
+98 180 246
+49 139 213
+180 180 164
+172 213 222
+156 197 205
+180 156 222
+156 131 205
+139 197 230
+131 172 222
+98 148 197
diff --git a/data/tilesets/secondary/82D50C4/palettes/9.pal b/data/tilesets/secondary/82D50C4/palettes/9.pal
new file mode 100644
index 000000000..5c2ed43a0
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+222 222 222
+106 115 115
+222 230 238
+180 197 205
+148 164 180
+131 139 139
+238 238 238
+230 230 230
+213 213 213
+139 213 156
+123 189 139
+230 222 123
+213 205 106
+189 180 90
diff --git a/data/tilesets/secondary/82D50C4/tiles.png b/data/tilesets/secondary/82D50C4/tiles.png
new file mode 100644
index 000000000..0f65e1ff3
--- /dev/null
+++ b/data/tilesets/secondary/82D50C4/tiles.png
diff --git a/data/tilesets/secondary/82D50DC/metatile_attributes.bin b/data/tilesets/secondary/82D50DC/metatile_attributes.bin
new file mode 100644
index 000000000..2fa59412a
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50DC/metatiles.bin b/data/tilesets/secondary/82D50DC/metatiles.bin
new file mode 100644
index 000000000..6f4e8a22e
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/metatiles.bin
diff --git a/data/tilesets/secondary/82D50DC/palettes/0.pal b/data/tilesets/secondary/82D50DC/palettes/0.pal
new file mode 100644
index 000000000..8db07d418
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+172 148 65
+213 197 106
+246 238 148
+82 148 197
+172 205 246
+222 230 230
+106 197 106
+164 255 180
+205 82 65
+255 131 115
+148 148 139
diff --git a/data/tilesets/secondary/82D50DC/palettes/1.pal b/data/tilesets/secondary/82D50DC/palettes/1.pal
new file mode 100644
index 000000000..66561f6d3
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+197 197 148
+213 213 172
+189 230 255
+139 180 222
+131 115 16
+164 148 49
+197 180 74
+222 205 106
+246 238 148
+222 213 230
+90 131 180
diff --git a/data/tilesets/secondary/82D50DC/palettes/10.pal b/data/tilesets/secondary/82D50DC/palettes/10.pal
new file mode 100644
index 000000000..6ea570459
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 0 255
+238 230 156
+230 189 131
+131 189 172
+205 82 65
+255 148 0
+106 164 148
+82 139 123
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+156 213 197
+164 172 139
+90 0 255
+90 0 255
diff --git a/data/tilesets/secondary/82D50DC/palettes/11.pal b/data/tilesets/secondary/82D50DC/palettes/11.pal
new file mode 100644
index 000000000..008f150c7
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+148 148 164
+205 189 197
+255 255 255
+115 115 131
+255 0 255
+0 255 156
+106 164 148
+82 139 123
+255 0 255
+255 255 172
+255 213 115
+213 180 106
+164 131 74
+222 213 230
diff --git a/data/tilesets/secondary/82D50DC/palettes/12.pal b/data/tilesets/secondary/82D50DC/palettes/12.pal
new file mode 100644
index 000000000..c1e7c3d5c
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
+90 0 255
diff --git a/data/tilesets/secondary/82D50DC/palettes/13.pal b/data/tilesets/secondary/82D50DC/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50DC/palettes/14.pal b/data/tilesets/secondary/82D50DC/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50DC/palettes/15.pal b/data/tilesets/secondary/82D50DC/palettes/15.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50DC/palettes/2.pal b/data/tilesets/secondary/82D50DC/palettes/2.pal
new file mode 100644
index 000000000..87a022102
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+197 189 213
+255 255 255
+106 197 106
+230 213 123
+255 205 90
+255 238 197
+90 90 115
+230 238 246
+156 205 246
+98 156 238
+246 238 164
+230 139 98
+189 98 74
diff --git a/data/tilesets/secondary/82D50DC/palettes/3.pal b/data/tilesets/secondary/82D50DC/palettes/3.pal
new file mode 100644
index 000000000..783496dcd
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 180 74
+255 246 131
+65 98 156
+90 123 180
+115 156 197
+222 213 131
+164 164 172
+205 205 213
+238 238 246
+106 172 115
+156 205 139
diff --git a/data/tilesets/secondary/82D50DC/palettes/4.pal b/data/tilesets/secondary/82D50DC/palettes/4.pal
new file mode 100644
index 000000000..89eace605
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+230 238 246
+172 197 180
+197 222 205
+90 189 172
+246 238 156
+205 189 131
+189 164 123
+148 131 106
+106 106 106
+213 222 230
+238 180 115
diff --git a/data/tilesets/secondary/82D50DC/palettes/5.pal b/data/tilesets/secondary/82D50DC/palettes/5.pal
new file mode 100644
index 000000000..c7780e5c7
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+213 222 222
+164 180 189
+255 0 255
+131 115 74
+213 213 148
+197 189 139
+172 156 115
+148 131 90
+197 197 205
+205 82 65
+0 0 0
diff --git a/data/tilesets/secondary/82D50DC/palettes/6.pal b/data/tilesets/secondary/82D50DC/palettes/6.pal
new file mode 100644
index 000000000..1d08ce9a2
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/82D50DC/palettes/7.pal b/data/tilesets/secondary/82D50DC/palettes/7.pal
new file mode 100644
index 000000000..f0c97cf87
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+180 180 164
+255 255 255
+156 189 255
+82 123 197
+49 90 156
+106 164 148
+82 139 123
+106 164 222
+222 230 148
+189 197 115
+90 148 197
+222 164 32
+189 230 255
diff --git a/data/tilesets/secondary/82D50DC/palettes/8.pal b/data/tilesets/secondary/82D50DC/palettes/8.pal
new file mode 100644
index 000000000..33b52bbbd
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+131 131 139
+172 172 164
+255 255 255
+213 222 222
+180 197 213
+156 172 197
+230 106 90
+189 65 49
+255 131 115
+139 41 24
+197 255 205
+238 197 106
+255 255 213
+255 246 172
diff --git a/data/tilesets/secondary/82D50DC/palettes/9.pal b/data/tilesets/secondary/82D50DC/palettes/9.pal
new file mode 100644
index 000000000..3a2cf3b7a
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/palettes/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+82 82 106
+123 123 123
+172 172 164
+255 255 255
+139 222 148
+156 238 164
+197 255 205
+172 246 180
+238 238 197
+255 0 255
+255 0 255
+0 255 156
+189 65 49
+255 222 123
+246 197 0
diff --git a/data/tilesets/secondary/82D50DC/tiles.png b/data/tilesets/secondary/82D50DC/tiles.png
new file mode 100644
index 000000000..f5ab3a9cb
--- /dev/null
+++ b/data/tilesets/secondary/82D50DC/tiles.png
diff --git a/data/title_screen.s b/data/title_screen.s
new file mode 100644
index 000000000..93d0f2f83
--- /dev/null
+++ b/data/title_screen.s
@@ -0,0 +1,34 @@
+	.section .rodata
+	.align 2
+gUnknown_83BF58C:: @ 83BF58C
+	.incbin "baserom.gba", 0x3BF58C, 0x1C
+
+gUnknown_83BF5A8:: @ 83BF5A8
+	.incbin "baserom.gba", 0x3BF5A8, 0x55C
+
+gUnknown_83BFB04:: @ 83BFB04
+	.incbin "baserom.gba", 0x3BFB04, 0x18
+
+gUnknown_83BFB1C:: @ 83BFB1C
+	.incbin "baserom.gba", 0x3BFB1C, 0x20
+
+gUnknown_83BFB3C:: @ 83BFB3C
+	.incbin "baserom.gba", 0x3BFB3C, 0x20
+
+gUnknown_83BFB5C:: @ 83BFB5C
+	.incbin "baserom.gba", 0x3BFB5C, 0x18
+
+gUnknown_83BFB74:: @ 83BFB74
+	.incbin "baserom.gba", 0x3BFB74, 0x10
+
+gUnknown_83BFB84:: @ 83BFB84
+	.incbin "baserom.gba", 0x3BFB84, 0x18
+
+gUnknown_83BFB9C:: @ 83BFB9C
+	.incbin "baserom.gba", 0x3BFB9C, 0x20
+
+gUnknown_83BFBBC:: @ 83BFBBC
+	.incbin "baserom.gba", 0x3BFBBC, 0x18
+
+gUnknown_83BFBD4:: @ 83BFBD4
+	.incbin "baserom.gba", 0x3BFBD4, 0x2FE8
diff --git a/data/trainer_tower.s b/data/trainer_tower.s
deleted file mode 100644
index f90d1dd2b..000000000
--- a/data/trainer_tower.s
+++ /dev/null
@@ -1,616 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_8479D34::
-	.byte 0x03, 0x26
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x27
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x9a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x01, 0x1f
-	.align 2
-	.byte 0x4c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x01, 0x22
-	.align 2
-	.byte 0x53, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x41
-	.align 2
-	.byte 0x40, 0x41, 0x42, 0x43, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x01, 0x02
-	.align 2
-	.byte 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0xff, 0xff
-	.byte 0x54, 0x55, 0x56, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x01, 0x6d
-	.align 2
-	.byte 0x5b, 0x5d, 0x5e, 0x5f, 0x63, 0x64, 0x65, 0x66
-	.byte 0x5b, 0x5d, 0x5e, 0x5f, 0x63, 0x64, 0x65, 0xff
-	.byte 0x5a, 0x5c, 0x60, 0x61, 0x62, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x2e
-	.align 2
-	.byte 0x6b, 0x6c, 0x6d, 0x6e, 0xff, 0xff, 0xff, 0xff
-	.byte 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0xff, 0xff
-	.byte 0x6b, 0x6c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x30
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xa6, 0xa7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x0f
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xa8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xa9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x39
-	.align 2
-	.byte 0xaa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x36
-	.align 2
-	.byte 0xae, 0xb0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xaf, 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x3a
-	.align 2
-	.byte 0xb2, 0xb3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x3b
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xb4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x3e
-	.align 2
-	.byte 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xba, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-gUnknown_8479ED8:: @ 8479ED8
-    .align 2
-	.byte 0x1c, 0x03, 0x01
-	.align 2
-	.byte 0x38, 0x04, 0x00
-	.align 2
-	.byte 0x25, 0x06, 0x01
-	.align 2
-	.byte 0x26, 0x07, 0x00
-	.align 2
-	.byte 0x29, 0x08, 0x00
-	.align 2
-	.byte 0x2a, 0x09, 0x01
-	.align 2
-	.byte 0x34, 0x0a, 0x00
-	.align 2
-	.byte 0x1c, 0x0b, 0x01
-	.align 2
-	.byte 0x1d, 0x0c, 0x01
-	.align 2
-	.byte 0x13, 0x0d, 0x00
-	.align 2
-	.byte 0x34, 0x0e, 0x00
-	.align 2
-	.byte 0x2d, 0x0f, 0x00
-	.align 2
-	.byte 0x36, 0x10, 0x00
-	.align 2
-	.byte 0x1a, 0x11, 0x00
-	.align 2
-	.byte 0x1a, 0x12, 0x00
-	.align 2
-	.byte 0x27, 0x13, 0x00
-	.align 2
-	.byte 0x34, 0x14, 0x00
-	.align 2
-	.byte 0x13, 0x15, 0x00
-	.align 2
-	.byte 0x17, 0x16, 0x01
-	.align 2
-	.byte 0x3d, 0x17, 0x00
-	.align 2
-	.byte 0x13, 0x1d, 0x00
-	.align 2
-	.byte 0x17, 0x1e, 0x01
-	.align 2
-	.byte 0x1e, 0x20, 0x00
-	.align 2
-	.byte 0x1f, 0x21, 0x01
-	.align 2
-	.byte 0x20, 0x22, 0x00
-	.align 2
-	.byte 0x23, 0x23, 0x01
-	.align 2
-	.byte 0x12, 0x24, 0x00
-	.align 2
-	.byte 0x39, 0x26, 0x00
-	.align 2
-	.byte 0x29, 0x2d, 0x00
-	.align 2
-	.byte 0x1a, 0x2e, 0x00
-	.align 2
-	.byte 0x10, 0x2f, 0x00
-	.align 2
-	.byte 0x18, 0x30, 0x01
-	.align 2
-	.byte 0x1d, 0x31, 0x01
-	.align 2
-	.byte 0x2e, 0x32, 0x01
-	.align 2
-	.byte 0x28, 0x33, 0x01
-	.align 2
-	.byte 0x3e, 0x35, 0x00
-	.align 2
-	.byte 0x1b, 0x38, 0x00
-	.align 2
-	.byte 0x19, 0x40, 0x00
-	.align 2
-	.byte 0x1c, 0x41, 0x01
-	.align 2
-	.byte 0x27, 0x42, 0x00
-	.align 2
-	.byte 0x28, 0x43, 0x01
-	.align 2
-	.byte 0x16, 0x47, 0x01
-	.align 2
-	.byte 0x14, 0x48, 0x00
-	.align 2
-	.byte 0x38, 0x49, 0x00
-	.align 2
-	.byte 0x12, 0x58, 0x00
-	.align 2
-	.byte 0x14, 0x59, 0x00
-	.align 2
-	.byte 0x16, 0x5a, 0x01
-	.align 2
-	.byte 0x3e, 0x5b, 0x00
-	.align 2
-	.byte 0x27, 0x5c, 0x00
-	.align 2
-	.byte 0x28, 0x5d, 0x01
-	.align 2
-	.byte 0x34, 0x5e, 0x00
-	.align 2
-	.byte 0x34, 0x5f, 0x00
-	.align 2
-	.byte 0x38, 0x60, 0x00
-	.align 2
-	.byte 0x35, 0x61, 0x00
-	.align 2
-	.byte 0x34, 0x62, 0x00
-	.align 2
-	.byte 0x1e, 0x63, 0x00
-	.align 2
-	.byte 0x39, 0x64, 0x00
-	.align 2
-	.byte 0x2d, 0x65, 0x00
-	.align 2
-	.byte 0x35, 0x66, 0x00
-	.align 2
-	.byte 0x20, 0x67, 0x00
-	.align 2
-	.byte 0x1d, 0x68, 0x01
-	.align 2
-	.byte 0x2e, 0x69, 0x01
-	.align 2
-	.byte 0x13, 0x6a, 0x00
-	.align 2
-	.byte 0x1a, 0x6b, 0x00
-	.align 2
-	.byte 0x1a, 0x6c, 0x00
-	.align 2
-	.byte 0x19, 0x6d, 0x00
-	.align 2
-	.byte 0x1a, 0x6e, 0x00
-	.align 2
-	.byte 0x36, 0x6f, 0x00
-	.align 2
-	.byte 0x37, 0x71, 0x00
-	.align 2
-	.byte 0x29, 0x74, 0x00
-	.align 2
-	.byte 0x2a, 0x75, 0x01
-	.align 2
-	.byte 0x3d, 0x7a, 0x00
-	.align 2
-	.byte 0x3a, 0x7d, 0x01
-	.align 2
-	.byte 0x17, 0x89, 0x01
-	.align 2
-	.byte 0x18, 0x8a, 0x01
-	.align 2
-	.byte 0x25, 0x8b, 0x01
-	.align 2
-	.byte 0x1c, 0x8c, 0x01
-	.align 2
-	.byte 0x27, 0x8d, 0x00
-	.align 2
-	.byte 0x28, 0x8e, 0x01
-	.align 2
-	.byte 0x1c, 0x8f, 0x01
-	.align 2
-	.byte 0x38, 0x90, 0x00
-	.align 2
-	.byte 0x1c, 0x91, 0x01
-	.align 2
-	.byte 0x16, 0x92, 0x01
-	.align 2
-
-gUnknown_847A024:: @ 847A024
-	.byte 0x1d, 0x17, 0x1f, 0x01, 0x01
-	.align 2
-	.byte 0x11, 0x11, 0x34, 0x01, 0x01
-	.align 2
-	.byte 0x1d, 0x19, 0x4a, 0x01, 0x00
-	.align 2
-	.byte 0x20, 0x23, 0x4b, 0x00, 0x01
-	.align 2
-	.byte 0x26, 0x2e, 0x4c, 0x00, 0x01
-	.align 2
-	.byte 0x11, 0x11, 0x7e, 0x01, 0x01
-	.align 2
-	.byte 0x29, 0x2a, 0x7f, 0x00, 0x01
-	.align 2
-	.byte 0x1d, 0x19, 0x80, 0x01, 0x00
-	.align 2
-	.byte 0x18, 0x36, 0x81, 0x01, 0x00
-	.align 2
-	.byte 0x2e, 0x26, 0x82, 0x01, 0x00
-
-	.align 2
-gUnknown_847A074:: @ 847A074
-	.byte 0x03, 0x06
-	.align 2
-	.byte 0x37, 0x06
-	.align 2
-	.byte 0x02, 0x06
-	.align 2
-	.byte 0x67, 0x01
-	.align 2
-	.byte 0x04, 0x01
-	.align 2
-	.byte 0x24, 0x04
-	.align 2
-	.byte 0x4a, 0x01
-	.align 2
-	.byte 0x26, 0x01
-	.align 2
-	.byte 0x2a, 0x00
-	.align 2
-	.byte 0x42, 0x03
-	.align 2
-	.byte 0x1b, 0x09
-	.align 2
-	.byte 0x4c, 0x03
-	.align 2
-	.byte 0x44, 0x03
-	.align 2
-	.byte 0x21, 0x04
-	.align 2
-	.byte 0x43, 0x03
-	.align 2
-	.byte 0x6a, 0x01
-	.align 2
-	.byte 0x5d, 0x05
-	.align 2
-	.byte 0x56, 0x05
-	.align 2
-	.byte 0x09, 0x05
-	.align 2
-	.byte 0x11, 0x04
-	.align 2
-	.byte 0x48, 0x03
-	.align 2
-	.byte 0x3c, 0x00
-	.align 2
-	.byte 0x29, 0x00
-	.align 2
-	.byte 0x5c, 0x09
-	.align 2
-	.byte 0x28, 0x09
-	.align 2
-	.byte 0x06, 0x0c
-	.align 2
-	.byte 0x68, 0x0b
-	.align 2
-	.byte 0x05, 0x0b
-	.align 2
-	.byte 0x58, 0x0d
-	.align 2
-	.byte 0x16, 0x0d
-	.align 2
-	.byte 0x46, 0x08
-	.align 2
-	.byte 0x0f, 0x01
-	.align 2
-	.byte 0x3f, 0x03
-	.align 2
-	.byte 0x0e, 0x03
-	.align 2
-	.byte 0x5f, 0x04
-	.align 2
-	.byte 0x63, 0x04
-	.align 2
-	.byte 0x50, 0x04
-	.align 2
-	.byte 0x10, 0x04
-	.align 2
-	.byte 0x52, 0x03
-	.align 2
-	.byte 0x35, 0x04
-	.align 2
-	.byte 0x5b, 0x03
-	.align 2
-	.byte 0x14, 0x03
-	.align 2
-	.byte 0x3d, 0x00
-	.align 2
-	.byte 0x13, 0x00
-	.align 2
-	.byte 0x12, 0x0b
-	.align 2
-	.byte 0x30, 0x07
-	.align 2
-	.byte 0x38, 0x07
-	.align 2
-	.byte 0x2f, 0x07
-	.align 2
-	.byte 0x3b, 0x01
-	.align 2
-	.byte 0x31, 0x01
-	.align 2
-	.byte 0x4e, 0x0b
-	.align 2
-	.byte 0x3a, 0x00
-	.align 2
-	.byte 0x32, 0x00
-	.align 2
-	.byte 0x23, 0x03
-	.align 2
-	.byte 0x0d, 0x0d
-	.align 2
-	.byte 0x0a, 0x03
-	.align 2
-	.byte 0x49, 0x01
-	.align 2
-	.byte 0x0c, 0x01
-	.align 2
-	.byte 0x69, 0x01
-	.align 2
-	.byte 0x0b, 0x01
-	.align 2
-	.byte 0x25, 0x01
-	.align 2
-	.byte 0x3e, 0x02
-	.align 2
-	.byte 0x27, 0x02
-	.align 2
-	.byte 0x65, 0x01
-	.align 2
-	.byte 0x2d, 0x01
-	.align 2
-	.byte 0x61, 0x01
-	.align 2
-	.byte 0x2b, 0x03
-	.align 2
-	.byte 0x66, 0x05
-	.align 2
-	.byte 0x2e, 0x05
-	.align 2
-	.byte 0x2c, 0x00
-	.align 2
-	.byte 0x5e, 0x02
-	.align 2
-	.byte 0x34, 0x02
-	.align 2
-	.byte 0x51, 0x00
-	.align 2
-	.byte 0x59, 0x00
-	.align 2
-	.byte 0x40, 0x03
-	.align 2
-	.byte 0x55, 0x06
-	.align 2
-	.byte 0x53, 0x06
-	.align 2
-	.byte 0x4b, 0x04
-	.align 2
-	.byte 0x15, 0x04
-	.align 2
-	.byte 0x1a, 0x09
-	.align 2
-	.byte 0x57, 0x0a
-	.align 2
-	.byte 0x17, 0x01
-	.align 2
-	.byte 0x47, 0x03
-	.align 2
-	.byte 0x62, 0x01
-	.align 2
-	.byte 0x39, 0x00
-	.align 2
-	.byte 0x1d, 0x00
-	.align 2
-	.byte 0x1c, 0x04
-	.align 2
-	.byte 0x20, 0x00
-	.align 2
-	.byte 0x4f, 0x05
-	.align 2
-	.byte 0x22, 0x05
-	.align 2
-	.byte 0x45, 0x0b
-	.align 2
-	.byte 0x1f, 0x0b
-	.align 2
-	.byte 0x5a, 0x00
-	.align 2
-	.byte 0x1e, 0x00
-	.align 2
-	.byte 0x08, 0x00
-	.align 2
-	.byte 0x64, 0x02
-	.align 2
-	.byte 0x07, 0x02
-	.align 2
-	.byte 0x60, 0x08
-	.align 2
-	.byte 0x36, 0x08
-	.align 2
-	.byte 0x41, 0x0b
-	.align 2
-	.byte 0x33, 0x0b
-	.align 2
-	.byte 0x54, 0x00
-	.align 2
-	.byte 0x18, 0x01
-	.align 2
-	.byte 0x4d, 0x0b
-	.align 2
-	.byte 0x19, 0x00
-
-	.align 2
-gUnknown_847A218:: @ 847A218
-	@ window template
-	.byte 0x00, 0x03, 0x01, 0x1b, 0x12, 0x0f
-	.2byte 0x0001
-
-gUnknown_847A220:: @ 847A220
-	.byte 0xFF, 0, 0, 0, 0, 0
-	.2byte 0
-
-gUnknown_847A228::
-	.4byte 0x70
-
-gUnknown_847A22C:: @ 847A22C
-	.byte 0x00, 0x02, 0x03
-
-	.align 2
-gUnknown_847A230:: @ 847A230
-	.4byte sub_815DD44
-	.4byte sub_815DF54
-	.4byte sub_815E160
-	.4byte sub_815E1C0
-	.4byte sub_815E1F0
-	.4byte sub_815E218
-	.4byte sub_815E28C
-	.4byte sub_815E394
-	.4byte sub_815E408
-	.4byte sub_815E4B0
-	.4byte sub_815E56C
-	.4byte sub_815E5C4
-	.4byte sub_815E5F0
-	.4byte sub_815E658
-	.4byte sub_815E720
-	.4byte sub_815E88C
-	.4byte sub_815E8B4
-	.4byte sub_815E8CC
-	.4byte sub_815E908
-	.4byte sub_815E948
-	.4byte sub_815E9C8
-
-gUnknown_847A284:: @ 847A284
-	.2byte 0x012a, 0x016e, 0x0176
-	.2byte 0x012b, 0x016f, 0x0177
-	.2byte 0x012c, 0x0170, 0x0178
-	.2byte 0x012d, 0x0171, 0x0179
-	.2byte 0x012e, 0x0172, 0x017a
-	.2byte 0x012f, 0x0173, 0x017b
-	.2byte 0x0130, 0x0174, 0x017c
-	.2byte 0x0131, 0x0175, 0x017d
-
-gUnknown_847A2B4:: @ 847A2B4
-	.2byte 0x3f, 0x40, 0x41, 0x42, 0x43, 0x46, 0xb3, 0xb4, 0xb9, 0xba, 0xbb, 0xc6, 0xc7, 0xc9, 0xda
-
-gUnknown_847A2D2:: @ 847A2D2
-	.2byte 0x011d
-	.2byte 0x011c
-	.2byte 0x011c
-	.2byte 0x011b
-	.2byte 0x011d
-	.2byte 0x011d
-	.2byte 0x011b
-	.2byte 0x011b
-	.2byte 0x011d
-	.2byte 0x011c
-	.2byte 0x011d
-	.2byte 0x011d
-	.2byte 0x011d
-	.2byte 0x011d
-
-gUnknown_847A2EE:: @ 847A2EE
-	.byte 0x00, 0x02
-	.byte 0x01, 0x03
-	.byte 0x02, 0x04
-	.byte 0x03, 0x05
-	.byte 0x04, 0x01
-	.byte 0x05, 0x02
-	.byte 0x00, 0x03
-	.byte 0x01, 0x04
-
-gUnknown_847A2FE:: @ 847A2FE
-	.byte 0x00, 0x01
-	.byte 0x01, 0x03
-	.byte 0x02, 0x00
-	.byte 0x03, 0x04
-	.byte 0x04, 0x02
-	.byte 0x05, 0x02
-	.byte 0x00, 0x03
-	.byte 0x01, 0x05
-
-gUnknown_847A30E:: @ 847A30E
-	.byte 0x00, 0x02
-	.byte 0x04, 0x01
-	.byte 0x03, 0x05
-	.byte 0x02, 0x03
-	.byte 0x01, 0x03
-	.byte 0x04, 0x00
-	.byte 0x04, 0x01
-	.byte 0x02, 0x05
-	.byte 0x00, 0x03
-	.byte 0x00, 0x05
-	.byte 0x02, 0x01
-	.byte 0x04, 0x05
-	.byte 0x00, 0x00
diff --git a/data/trainer_tower/trainers.inc b/data/trainer_tower/trainers.inc
index e2f7dd121..5f9b0f49b 100644
--- a/data/trainer_tower/trainers.inc
+++ b/data/trainer_tower/trainers.inc
@@ -22,8 +22,8 @@
 
 	.macro dummy_tower_team
 	.string "$", 11
-	.byte FACILITY_CLASS_AQUA_LEADER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_AQUA_LEADER, 0x01
+	.align 1
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -41,8 +41,8 @@
 gUnknown_847ABAC::
 	.byte 0x01, 0x08, 0x00, 0x07
 	.string "COLE$", 11
-	.byte FACILITY_CLASS_YOUNGSTER_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_YOUNGSTER_2, 0x01
+	.align 1
 	.2byte EC_WORD_AHAHA, EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_ANYWHERE, EC_WORD_EXCL
 	.2byte EC_WORD_ALL_RIGHT, EC_WORD_EXCL, EC_WORD_BYE_BYE, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_HIYAH, EC_WORD_EXCL_EXCL, EC_WORD_DONE, EC_WORD_IN, EC_WORD_TOTALLY, EC_WORD_EXCL_EXCL
@@ -128,8 +128,8 @@ gUnknown_847ABAC::
 gUnknown_847AF8C::
 	.byte 0x02, 0x08, 0x00, 0x0d
 	.string "JAC$", 11
-	.byte FACILITY_CLASS_BURGLAR, 0x01, 0x00
-
+	.byte FACILITY_CLASS_BURGLAR, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_A, EC_MOVE2(THIEF), EC_WORD_EXCL, EC_WORD_GIVE_ME, EC_WORD_SOMETHING
 	.2byte EC_WORD_YOU_VE, EC_WORD_GOT, EC_WORD_NOTHING, EC_WORD_THAT, EC_WORD_I, EC_WORD_WANT
 	.2byte EC_WORD_EEK, EC_WORD_EXCL_EXCL, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_I, EC_WORD_SURRENDER
@@ -192,7 +192,7 @@ gUnknown_847AF8C::
 	trainerid 133, 0 @ OT ID
 	ivs 10, 10, 10, 10, 10, 10, 1 @ IVs, ability
 	.4byte 0x00000085 @ personality
-	.string "FARFETCH’D$", 11
+	.string "FARFETCH'D$", 11
 	.byte 255 @ friendship
 
 	.align 2
@@ -215,8 +215,8 @@ gUnknown_847AF8C::
 gUnknown_847B36C::
 	.byte 0x03, 0x08, 0x00, 0x02
 	.string "MILY$", 11
-	.byte FACILITY_CLASS_PSYCHIC_4, 0x01, 0x00
-
+	.byte FACILITY_CLASS_PSYCHIC_4, 0x01
+	.align 1
 	.2byte EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(SUPERPOWER), EC_WORD_EXCL
 	.2byte EC_WORD_ISN_T, EC_WORD_IT, EC_WORD_INCREDIBLE, EC_WORD_QUES, EC_WORD_POKEMON, EC_WORD_POWER
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWFUL, EC_MOVE(NIGHTMARE), EC_WORD_ELLIPSIS_EXCL
@@ -302,8 +302,8 @@ gUnknown_847B36C::
 gUnknown_847B74C::
 	.byte 0x04, 0x08, 0x01, 0x09
 	.string "JOS & ANNE$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_TO, EC_WORD_YOU, EC_WORD_HERE
 	.2byte EC_WORD_VERY, EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, EC_WORD_GOOD, EC_WORD_BATTLE
 	.2byte EC_WORD_UNBELIEVABLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -382,8 +382,8 @@ gUnknown_847B74C::
 	.byte 255 @ friendship
 
 	.string "JOS & ANNE$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
+	.align 1
 	.2byte EC_WORD_HERE_GOES, EC_WORD_EXCL_EXCL, EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_LOSE
 	.2byte EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_WE, EC_WORD_GET, EC_WORD_THE, EC_WORD_WIN
 	.2byte EC_WORD_LOST, EC_WORD_QUES_EXCL, EC_WORD_YOU, EC_WORD_MUST_BE, EC_WORD_JOKING, EC_WORD_EXCL
@@ -468,8 +468,8 @@ gUnknown_847B74C::
 gUnknown_847BB2C::
 	.byte 0x05, 0x08, 0x01, 0x04
 	.string "EMY & ALEK$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LOST, EC_WORD_IN, EC_WORD_LOVEY_DOVEY, EC_WORD_HAPPINESS
 	.2byte EC_WORD_OH, EC_WORD_OH, EC_WORD_HE, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_AWESOME
 	.2byte EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_SERIOUS, EC_WORD_QUES
@@ -548,8 +548,8 @@ gUnknown_847BB2C::
 	.byte 255 @ friendship
 
 	.string "EMY & ALEK$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GIDDY, EC_WORD_WITH, EC_WORD_LOVEY_DOVEY, EC_WORD_JOY, EC_WORD_EXCL_EXCL
 	.2byte EC_WORD_SIGH, EC_WORD_ELLIPSIS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_IS, EC_WORD_CUTE
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_SERIOUS
@@ -634,8 +634,8 @@ gUnknown_847BB2C::
 gUnknown_847BF0C::
 	.byte 0x06, 0x08, 0x01, 0x00
 	.string "JO & HALEY$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
+	.align 1
 	.2byte EC_WORD_WE_RE, EC_WORD_USING, EC_WORD_THAT, EC_WORD_STRATEGY, EC_WORD_OKAY, EC_WORD_QUES
 	.2byte EC_WORD_YAY, EC_WORD_WE, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_SORRY, EC_WORD_EXCL
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TERRIBLE, EC_WORD_EXCL
@@ -714,8 +714,8 @@ gUnknown_847BF0C::
 	.byte 255 @ friendship
 
 	.string "JO & HALEY$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
+	.align 1
 	.2byte EC_WORD_YOU, EC_WORD_YOU, EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_WORD_WIN
 	.2byte EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_JOKING, EC_WORD_QUES, EC_WORD_WE, EC_WORD_WON
 	.2byte EC_WORD_WIMPY, EC_WORD_ELLIPSIS, EC_WORD_WE, EC_WORD_WERE, EC_WORD_WEAK, EC_WORD_ELLIPSIS
@@ -800,8 +800,8 @@ gUnknown_847BF0C::
 gUnknown_847C2EC::
 	.byte 0x07, 0x08, 0x02, 0x0c
 	.string "JORDY$", 11
-	.byte FACILITY_CLASS_BIKER, 0x03, 0x00
-
+	.byte FACILITY_CLASS_BIKER, 0x03
+	.align 1
 	.2byte EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GIGGLE, EC_WORD_YOU, EC_WORD_PUSHOVER
 	.2byte EC_WORD_WHAT, EC_WORD_A_LITTLE, EC_WORD_PUSHOVER, EC_WORD_YOU, EC_WORD_ARE, EC_WORD_EXCL
 	.2byte EC_WORD_YOU, EC_WORD_WERE, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_EXCL
@@ -880,8 +880,8 @@ gUnknown_847C2EC::
 	.byte 0 @ friendship
 
 	.string "ERNEST$", 11
-	.byte FACILITY_CLASS_BIKER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_BIKER, 0x01
+	.align 1
 	.2byte EC_WORD_IT_S, EC_WORD_SLEEP, EC_WORD_TIME, EC_WORD_FOR, EC_WORD_CHILDREN, EC_WORD_EXCL
 	.2byte EC_WORD_NOT, EC_WORD_GUTSY, EC_WORD_ENOUGH, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WHY, EC_WORD_DID, EC_WORD_YOU, EC_WORD_CRUSH, EC_WORD_ME, EC_WORD_QUES
@@ -960,8 +960,8 @@ gUnknown_847C2EC::
 	.byte 0 @ friendship
 
 	.string "GABRIEL$", 11
-	.byte FACILITY_CLASS_CUE_BALL, 0x01, 0x00
-
+	.byte FACILITY_CLASS_CUE_BALL, 0x01
+	.align 1
 	.2byte EC_WORD_YAHOO, EC_WORD_EXCL, EC_WORD_HERE_I_COME, EC_WORD_TO, EC_WORD_SWARM, EC_WORD_YOU
 	.2byte EC_WORD_I_AM, EC_WORD_INVINCIBLE, EC_WORD_YOU, EC_WORD_GOT, EC_WORD_THAT, EC_WORD_QUES
 	.2byte EC_WORD_WHAT, EC_WORD_WAS, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF, 0xFFFF
@@ -1045,8 +1045,8 @@ gUnknown_847C2EC::
 gUnknown_847C6CC::
 	.byte 0x08, 0x08, 0x02, 0x0e
 	.string "MIKE$", 11
-	.byte FACILITY_CLASS_HIKER_2, 0x05, 0x00
-
+	.byte FACILITY_CLASS_HIKER_2, 0x05
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_FULL, EC_WORD_OF, EC_WORD_POWER
 	.2byte EC_WORD_WHAT_S_UP_QUES, EC_WORD_WHERE, EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_QUES
 	.2byte EC_WORD_YOU, EC_WORD_GOT, EC_WORD_ME, EC_WORD_WITH, EC_WORD_YOUR, EC_MOVE2(FAKE_OUT)
@@ -1125,8 +1125,8 @@ gUnknown_847C6CC::
 	.byte 255 @ friendship
 
 	.string "REBECCA$", 11
-	.byte FACILITY_CLASS_CRUSH_GIRL, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_GIRL, 0x05
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_OVERWHELMING
 	.2byte EC_WORD_ARRGH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1205,8 +1205,8 @@ gUnknown_847C6CC::
 	.byte 255 @ friendship
 
 	.string "NICOLAS$", 11
-	.byte FACILITY_CLASS_BLACK_BELT_2, 0x05, 0x00
-
+	.byte FACILITY_CLASS_BLACK_BELT_2, 0x05
+	.align 1
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_WHERE, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_EXCL
 	.2byte EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_EVER, EC_WORD_BEAT, EC_WORD_ME
 	.2byte EC_WORD_WHY, EC_WORD_COULDN_T, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_QUES
@@ -1290,8 +1290,8 @@ gUnknown_847C6CC::
 gUnknown_847CAAC::
 	.byte 0x09, 0x08, 0x00, 0x00
 	.string "JOEY$", 11
-	.byte FACILITY_CLASS_CAMPER_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_CAMPER_2, 0x01
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SCARY, EC_WORD_STRONG, EC_WORD_EXCL
 	.2byte EC_WORD_WERE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES
 	.2byte EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_WAY, EC_WORD_TOO_STRONG, EC_WORD_EXCL
@@ -1377,8 +1377,8 @@ gUnknown_847CAAC::
 gUnknown_847CE8C::
 	.byte 0x0a, 0x08, 0x00, 0x0c
 	.string "LILY$", 11
-	.byte FACILITY_CLASS_PKMN_BREEDER_3, 0x01, 0x00
-
+	.byte FACILITY_CLASS_PKMN_BREEDER_3, 0x01
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_WANT, EC_WORD_SOMETHING, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_NEED, EC_WORD_SOMETHING, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_ELLIPSIS
@@ -1464,8 +1464,8 @@ gUnknown_847CE8C::
 gUnknown_847D26C::
 	.byte 0x0b, 0x08, 0x00, 0x0e
 	.string "BRANDON$", 11
-	.byte FACILITY_CLASS_BUG_CATCHER_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_BUG_CATCHER_2, 0x01
+	.align 1
 	.2byte EC_WORD_POISON, EC_WORD_IS, EC_WORD_JUST, EC_WORD_SO, EC_WORD_AWFUL, EC_WORD_ISN_T_IT_QUES
 	.2byte EC_WORD_SEE, EC_WORD_QUES, EC_WORD_ISN_T, EC_WORD_POISON, EC_WORD_TERRIBLE, EC_WORD_QUES
 	.2byte EC_WORD_HUH_QUES, EC_WORD_OUR, EC_WORD_POISON, EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_QUES
@@ -1551,8 +1551,8 @@ gUnknown_847D26C::
 gUnknown_847D64C::
 	.byte 0x0c, 0x08, 0x01, 0x02
 	.string "RIC & RENE$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_AWESOME
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_IS, EC_WORD_TOO, EC_WORD_AWESOME
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_ISN_T, EC_WORD_AWESOME, EC_WORD_QUES
@@ -1631,8 +1631,8 @@ gUnknown_847D64C::
 	.byte 255 @ friendship
 
 	.string "RIC & RENE$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_AWESOME, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_AWESOME, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_HUH_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_NOT_VERY, EC_WORD_AWESOME, EC_WORD_QUES
@@ -1717,8 +1717,8 @@ gUnknown_847D64C::
 gUnknown_847DA2C::
 	.byte 0x0d, 0x08, 0x01, 0x0d
 	.string "JEN & KIRA$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x05, 0x00
-
+	.byte FACILITY_CLASS_TWINS_2, 0x05
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL
 	.2byte EC_WORD_EHEHE, EC_WORD_YAY, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1797,8 +1797,8 @@ gUnknown_847DA2C::
 	.byte 255 @ friendship
 
 	.string "JEN & KIRA$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x03, 0x00
-
+	.byte FACILITY_CLASS_TWINS_2, 0x03
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1883,8 +1883,8 @@ gUnknown_847DA2C::
 gUnknown_847DE0C::
 	.byte 0x0e, 0x08, 0x01, 0x08
 	.string "ISAC & MAG$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x01, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x01
+	.align 1
 	.2byte EC_WORD_OUR, EC_MOVE(EARTHQUAKE), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SHAKY
 	.2byte EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_I_AM, EC_WORD_ALL, EC_WORD_SHAKY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF
@@ -1963,8 +1963,8 @@ gUnknown_847DE0C::
 	.byte 255 @ friendship
 
 	.string "ISAC & MAG$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x01, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x01
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_DOESN_T, EC_WORD_GET, EC_WORD_ALL, EC_WORD_SHAKY
 	.2byte EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_LIE, EC_WORD_EXCL
 	.2byte EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_SHAKY
@@ -2049,8 +2049,8 @@ gUnknown_847DE0C::
 gUnknown_847E1EC::
 	.byte 0x0f, 0x08, 0x02, 0x06
 	.string "CHELSEA$", 11
-	.byte FACILITY_CLASS_PKMN_RANGER_4, 0x07, 0x00
-
+	.byte FACILITY_CLASS_PKMN_RANGER_4, 0x07
+	.align 1
 	.2byte EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_IMPORTANT, EC_WORD_ISN_T_IT_QUES
 	.2byte EC_WORD_YOU, EC_WORD_TAKE, EC_WORD_THE, EC_WORD_LOSS, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_BE, EC_WORD_KIND, EC_WORD_TO, EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD
@@ -2129,8 +2129,8 @@ gUnknown_847E1EC::
 	.byte 255 @ friendship
 
 	.string "TRENTON$", 11
-	.byte FACILITY_CLASS_PKMN_RANGER_3, 0x07, 0x00
-
+	.byte FACILITY_CLASS_PKMN_RANGER_3, 0x07
+	.align 1
 	.2byte EC_WORD_I, EC_MOVE2(PROTECT), EC_WORD_THE, EC_WORD_GREAT, EC_WORD_GREEN, EC_WORD_WORLD
 	.2byte EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_YOURS
 	.2byte EC_MOVE2(PROTECT), EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD, 0xFFFF, 0xFFFF
@@ -2209,8 +2209,8 @@ gUnknown_847E1EC::
 	.byte 255 @ friendship
 
 	.string "ALBERT$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_3, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOLTRAINER_3, 0x07
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_HERE
 	.2byte EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_THINGS, EC_WORD_EXCITING
 	.2byte EC_WORD_YOU_RE, EC_WORD_STRONG, EC_WORD_THAT_WAS, EC_WORD_WILD, EC_WORD_AND, EC_WORD_EXCITING
@@ -2294,8 +2294,8 @@ gUnknown_847E1EC::
 gUnknown_847E5CC::
 	.byte 0x10, 0x08, 0x02, 0x04
 	.string "CAMRYN$", 11
-	.byte FACILITY_CLASS_PICNICKER_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_PICNICKER_2, 0x01
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_I, EC_WORD_WON_T, EC_WORD_LOSE, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_I, EC_WORD_WOULD, EC_WORD_WIN
 	.2byte EC_WORD_OH_QUES, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_DID, EC_WORD_I, EC_WORD_LOSE, EC_WORD_QUES
@@ -2374,8 +2374,8 @@ gUnknown_847E5CC::
 	.byte 255 @ friendship
 
 	.string "NATALIA$", 11
-	.byte FACILITY_CLASS_AROMA_LADY_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_AROMA_LADY_2, 0x01
+	.align 1
 	.2byte EC_WORD_THIS, EC_MOVE(SWEET_SCENT), EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_IT, EC_WORD_QUES
 	.2byte EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_NICE, EC_WORD_QUES, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_THAT, EC_WORD_WASN_T, EC_WORD_GOOD, EC_WORD_QUES, 0xFFFF, 0xFFFF
@@ -2454,8 +2454,8 @@ gUnknown_847E5CC::
 	.byte 255 @ friendship
 
 	.string "KATHLEEN$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07
+	.align 1
 	.2byte EC_WORD_TOO, EC_WORD_BAD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU
 	.2byte EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_HARD, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_ELLIPSIS
@@ -2539,8 +2539,8 @@ gUnknown_847E5CC::
 gUnknown_847E9AC::
 	.byte 0x11, 0x08, 0x00, 0x03
 	.string "BRADEN$", 11
-	.byte FACILITY_CLASS_SWIMMER_MALE_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_SWIMMER_MALE_2, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_PRETTY, EC_WORD_HAPPY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_TOUGHNESS
 	.2byte EC_WORD_WROOOAAR_EXCL, 0xFFFF, EC_WORD_SERIOUSLY, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES
 	.2byte EC_WORD_YOU, EC_WORD_SHOCKED, EC_WORD_ME, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HAPPINESS
@@ -2626,8 +2626,8 @@ gUnknown_847E9AC::
 gUnknown_847ED8C::
 	.byte 0x12, 0x08, 0x00, 0x0a
 	.string "ALLYSON$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_ABOUT, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_TODAY
 	.2byte EC_WORD_YES, EC_WORD_EXCL_EXCL, EC_WORD_I, EC_WORD_ADORE, EC_WORD_MYSELF, EC_WORD_TODAY
 	.2byte EC_WORD_I_WAS, EC_WORD_CONFUSED, EC_WORD_ABOUT, EC_WORD_THINGS, EC_WORD_I, EC_WORD_THINK
@@ -2713,8 +2713,8 @@ gUnknown_847ED8C::
 gUnknown_847F16C::
 	.byte 0x13, 0x08, 0x00, 0x0e
 	.string "ALBERTO$", 11
-	.byte FACILITY_CLASS_SAILOR_2, 0x05, 0x00
-
+	.byte FACILITY_CLASS_SAILOR_2, 0x05
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_GET, EC_WORD_WITH, EC_WORD_IT, EC_WORD_RIGHT, EC_WORD_AWAY
 	.2byte EC_WORD_YO, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_NOW, EC_WORD_EH_QUES
 	.2byte EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_OVER, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SURRENDER
@@ -2800,8 +2800,8 @@ gUnknown_847F16C::
 gUnknown_847F54C::
 	.byte 0x14, 0x08, 0x01, 0x0c
 	.string "KAT & KIPP$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04, 0x00
-
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_MY, EC_WORD_BEST
 	.2byte EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO, EC_WORD_MY, EC_WORD_AWESOME, EC_WORD_BROTHER
 	.2byte EC_WORD_SIGH, EC_WORD_ELLIPSIS, EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_IT, EC_WORD_GOES
@@ -2880,8 +2880,8 @@ gUnknown_847F54C::
 	.byte 255 @ friendship
 
 	.string "KAT & KIPP$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04, 0x00
-
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04
+	.align 1
 	.2byte EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE, EC_WORD_NEVER, EC_WORD_LOSE, EC_WORD_EXCL
 	.2byte EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE_RE, EC_WORD_TOO_STRONG, EC_WORD_TO, EC_WORD_LOSE
 	.2byte EC_WORD_WHAT, EC_WORD_HUH_QUES, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_JOKING, EC_WORD_QUES
@@ -2966,8 +2966,8 @@ gUnknown_847F54C::
 gUnknown_847F92C::
 	.byte 0x15, 0x08, 0x01, 0x08
 	.string "GEB&MEGAN$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
+	.align 1
 	.2byte EC_WORD_YOU_RE, EC_WORD_OUR, EC_WORD_OPPONENT, EC_WORD_QUES, EC_WORD_PUSHOVER, EC_WORD_HAHAHA
 	.2byte EC_WORD_HAHAHA, EC_WORD_SORRY, EC_WORD_MY, EC_WORD_FRIEND, EC_WORD_TOUGH, EC_WORD_LOSS
 	.2byte EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_FRIEND, EC_WORD_QUES
@@ -3046,8 +3046,8 @@ gUnknown_847F92C::
 	.byte 255 @ friendship
 
 	.string "GEB&MEGAN$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
+	.align 1
 	.2byte EC_WORD_YOU_RE, EC_WORD_OUR, EC_WORD_FOE, EC_WORD_QUES, EC_WORD_GIGGLE, EC_WORD_ELLIPSIS
 	.2byte EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, 0xFFFF
 	.2byte EC_WORD_MY, EC_WORD_WORD, EC_WORD_THIS, EC_WORD_IS, EC_WORD_JUST, EC_WORD_INCREDIBLE
@@ -3132,8 +3132,8 @@ gUnknown_847F92C::
 gUnknown_847FD0C::
 	.byte 0x16, 0x08, 0x01, 0x05
 	.string "LISA&LEAH$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_TWINS_2, 0x01
+	.align 1
 	.2byte EC_WORD_ABSOLUTELY, EC_WORD_WE_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL
 	.2byte EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
@@ -3212,8 +3212,8 @@ gUnknown_847FD0C::
 	.byte 255 @ friendship
 
 	.string "LISA&LEAH$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_TWINS_2, 0x01
+	.align 1
 	.2byte EC_WORD_CAN, EC_WORD_WE, EC_WORD_WIN, EC_WORD_QUES, EC_WORD_IT_S, EC_WORD_EXCITING
 	.2byte EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
@@ -3292,8 +3292,8 @@ gUnknown_847FD0C::
 	.byte 255 @ friendship
 
 	.string "$", 11
-	.byte FACILITY_CLASS_AQUA_LEADER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_AQUA_LEADER, 0x01
+	.align 1
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -3377,8 +3377,8 @@ gUnknown_847FD0C::
 gUnknown_84800EC::
 	.byte 0x17, 0x08, 0x02, 0x01
 	.string "PRISCILLA$", 11
-	.byte FACILITY_CLASS_TUBER_3, 0x01, 0x00
-
+	.byte FACILITY_CLASS_TUBER_3, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_A_LITTLE, EC_WORD_POKEMON, EC_WORD_GIRL, EC_WORD_HERE_I_COME, EC_WORD_EXCL
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DID, EC_WORD_I, EC_WORD_WIN, EC_WORD_QUES
 	.2byte EC_WORD_OH_DEAR, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_COULDN_T, EC_WORD_WIN, EC_WORD_ELLIPSIS
@@ -3457,8 +3457,8 @@ gUnknown_84800EC::
 	.byte 0 @ friendship
 
 	.string "CHARLOTTE$", 11
-	.byte FACILITY_CLASS_LADY_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_LADY_2, 0x01
+	.align 1
 	.2byte EC_WORD_HELLO, EC_WORD_THERE, EC_WORD_I_AM, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_LADY
 	.2byte EC_WORD_OH, EC_WORD_MY, EC_WORD_MY, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_SORRY
 	.2byte EC_WORD_YOU_RE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_LADY
@@ -3537,8 +3537,8 @@ gUnknown_84800EC::
 	.byte 255 @ friendship
 
 	.string "SHANIA$", 11
-	.byte FACILITY_CLASS_SWIMMER_FEMALE_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_SWIMMER_FEMALE_2, 0x01
+	.align 1
 	.2byte EC_WORD_A, EC_WORD_POKEMON, EC_WORD_HEROINE, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM
 	.2byte EC_WORD_AHAHA, EC_WORD_NO, EC_WORD_WAY, EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_SERIOUSLY
 	.2byte EC_WORD_WHY, EC_WORD_QUES_EXCL, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_LIE
@@ -3622,8 +3622,8 @@ gUnknown_84800EC::
 gUnknown_84804CC::
 	.byte 0x18, 0x08, 0x02, 0x0d
 	.string "BRENNAN$", 11
-	.byte FACILITY_CLASS_SAILOR_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_SAILOR_2, 0x01
+	.align 1
 	.2byte EC_WORD_TAKE, EC_WORD_THINGS, EC_WORD_EASY, EC_WORD_ELLIPSIS, EC_WORD_THAT_S, EC_WORD_IMPORTANT
 	.2byte EC_WORD_YOU, EC_WORD_LOSE, EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_EXCL
 	.2byte EC_WORD_OOPS, EC_WORD_YOU, EC_WORD_GOT, EC_WORD_AN, EC_WORD_EASY, EC_WORD_WIN
@@ -3702,8 +3702,8 @@ gUnknown_84804CC::
 	.byte 255 @ friendship
 
 	.string "KADEN$", 11
-	.byte FACILITY_CLASS_FISHERMAN_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_FISHERMAN_2, 0x01
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_FISHING, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_IS, EC_WORD_FANTASTIC
 	.2byte EC_WORD_MY, EC_WORD_FANTASTIC, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_WINS, EC_WORD_OUT
 	.2byte EC_WORD_UH_OH, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SEE, EC_WORD_I, EC_WORD_LOST
@@ -3782,8 +3782,8 @@ gUnknown_84804CC::
 	.byte 255 @ friendship
 
 	.string "EMANUEL$", 11
-	.byte FACILITY_CLASS_GENTLEMAN_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_GENTLEMAN_2, 0x01
+	.align 1
 	.2byte EC_WORD_HMM, EC_WORD_QUES, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SKILLED, EC_WORD_QUES
 	.2byte EC_WORD_I, EC_WORD_SEE, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_RIGHT, EC_WORD_ELLIPSIS
 	.2byte EC_WORD_YOU, EC_WORD_TRULY, EC_WORD_ARE, EC_WORD_A, EC_WORD_MASTER, EC_WORD_TRAINER
@@ -3867,8 +3867,8 @@ gUnknown_84804CC::
 gUnknown_84808AC::
 	.byte 0x19, 0x08, 0x00, 0x0c
 	.string "JARRETT$", 11
-	.byte FACILITY_CLASS_JUGGLER, 0x02, 0x00
-
+	.byte FACILITY_CLASS_JUGGLER, 0x02
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_AN, EC_MOVE2(EXPLOSION), EC_WORD_PARTY, EC_WORD_EXCL
 	.2byte EC_WORD_CONGRATS, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS, EC_WORD_PARTY, EC_WORD_KID
 	.2byte EC_WORD_NICE, EC_MOVE(SELF_DESTRUCT), EC_WORD_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_PERFECT
@@ -3954,8 +3954,8 @@ gUnknown_84808AC::
 gUnknown_8480C8C::
 	.byte 0x1a, 0x08, 0x00, 0x0d
 	.string "OWEN$", 11
-	.byte FACILITY_CLASS_SUPER_NERD, 0x02, 0x00
-
+	.byte FACILITY_CLASS_SUPER_NERD, 0x02
+	.align 1
 	.2byte EC_WORD_HERE_IT_IS, EC_MOVE2(THUNDER_WAVE), EC_WORD_DON_T, EC_MOVE2(WRAP), EC_WORD_ME, EC_WORD_EXCL
 	.2byte EC_WORD_ACCEPT, EC_WORD_MY, EC_MOVE2(PRESENT), EC_WORD_OF, EC_MOVE2(THUNDER_WAVE), EC_WORD_EXCL
 	.2byte EC_MOVE2(WRAP), EC_MOVE(BIND), EC_WORD_ELECTRIC, EC_MOVE2(WHIRLWIND), EC_WORD_SPIRALING, EC_WORD_AROUND
@@ -4041,8 +4041,8 @@ gUnknown_8480C8C::
 gUnknown_848106C::
 	.byte 0x1b, 0x08, 0x00, 0x01
 	.string "LORENZO$", 11
-	.byte FACILITY_CLASS_PSYCHIC_3, 0x01, 0x00
-
+	.byte FACILITY_CLASS_PSYCHIC_3, 0x01
+	.align 1
 	.2byte EC_WORD_THIS, EC_WORD_POWER, EC_WORD_IS, EC_WORD_NOW, EC_WORD_COMPLETE, EC_WORD_EXCL
 	.2byte EC_WORD_NO, EC_WORD_KEEN_EYE, EC_WORD_CAN, EC_WORD_STOP, EC_WORD_MY, EC_WORD_POWER
 	.2byte EC_WORD_HERE_IT_IS, EC_WORD_EXCL, EC_MOVE(KINESIS), EC_WORD_EXCL, EC_WORD_ELLIPSIS, EC_WORD_WHAT
@@ -4128,8 +4128,8 @@ gUnknown_848106C::
 gUnknown_848144C::
 	.byte 0x1c, 0x08, 0x01, 0x0b
 	.string "NIA & CARL$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x04, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x04
+	.align 1
 	.2byte EC_WORD_HERE_GOES, EC_WORD_MY, EC_WORD_DIGITAL, EC_WORD_ROMANTIC, EC_WORD_HERO, EC_WORD_STRATEGY
 	.2byte EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_DIGITAL, EC_WORD_HYPER, EC_WORD_MODE, EC_WORD_POWER
 	.2byte EC_WORD_MY, EC_WORD_PERFECT, EC_WORD_STRATEGY, EC_WORD_WAS, EC_MOVE2(BEAT_UP), EC_WORD_QUES
@@ -4208,8 +4208,8 @@ gUnknown_848144C::
 	.byte 255 @ friendship
 
 	.string "NIA & CARL$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x04, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x04
+	.align 1
 	.2byte EC_WORD_MASTER, EC_WORD_COMPLETE, EC_WORD_FASHION, EC_WORD_SYSTEM, EC_WORD_START, EC_WORD_EXCL
 	.2byte EC_WORD_THAT_S_IT_EXCL, EC_WORD_THE, EC_WORD_POWER, EC_WORD_OF, EC_WORD_OUR, EC_WORD_SYSTEM
 	.2byte EC_WORD_OKAY, EC_WORD_EXCL, EC_MOVE(THUNDERBOLT), EC_WORD_RUN_AWAY, EC_WORD_SYSTEM, EC_WORD_START
@@ -4294,8 +4294,8 @@ gUnknown_848144C::
 gUnknown_848182C::
 	.byte 0x1d, 0x08, 0x01, 0x03
 	.string "AXE & REN$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02
+	.align 1
 	.2byte EC_WORD_IT_S, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_WORD_AWFULLY, EC_WORD_COLD
 	.2byte EC_WORD_THAT_S, EC_WORD_THAT, EC_WORD_MAN, EC_WORD_I_AM, EC_WORD_COLD, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_IN, EC_WORD_THIS, EC_MOVE(SHEER_COLD), EC_WORD_ELLIPSIS
@@ -4374,8 +4374,8 @@ gUnknown_848182C::
 	.byte 255 @ friendship
 
 	.string "AXE & REN$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02
+	.align 1
 	.2byte EC_WORD_OUR, EC_WORD_SWIFT_SWIM, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_COLD
 	.2byte EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_HOT
 	.2byte EC_WORD_I_AM, EC_WORD_HUNGRY, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_HOT, EC_WORD_EATS
@@ -4460,8 +4460,8 @@ gUnknown_848182C::
 gUnknown_8481C0C::
 	.byte 0x1e, 0x08, 0x01, 0x05
 	.string "KATI & GEB$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02
+	.align 1
 	.2byte EC_WORD_WELCOME, EC_WORD_TO, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_MOVE2(THUNDER_WAVE), EC_MOVE(SANDSTORM)
 	.2byte EC_WORD_LALALA, EC_WORD_LALALA, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LALALA, EC_WORD_LIFE
 	.2byte EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_MY, EC_MOVE2(FRUSTRATION)
@@ -4540,8 +4540,8 @@ gUnknown_8481C0C::
 	.byte 255 @ friendship
 
 	.string "KATI & GEB$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_PLUS, EC_WORD_YOU_RE, EC_WORD_MINUS, EC_WORD_LOVEY_DOVEY, EC_WORD_MAGNET_PULL
 	.2byte EC_WORD_DON_T, EC_WORD_STOP, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LOCOMOTIVE, EC_WORD_EXCL
 	.2byte EC_WORD_HIS, EC_WORD_CRY, EC_WORD_HAS, EC_WORD_CUTE_CHARM, EC_WORD_TOO, EC_WORD_EXCL
@@ -4626,8 +4626,8 @@ gUnknown_8481C0C::
 gUnknown_8481FEC::
 	.byte 0x1f, 0x08, 0x02, 0x07
 	.string "BEN$", 11
-	.byte FACILITY_CLASS_ROCKER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_ROCKER, 0x01
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_WORD_STATIC, EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_YES, EC_WORD_IT, EC_WORD_IS
 	.2byte EC_WORD_ELECTRIC, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_DIGITAL, EC_WORD_TELEVISION, EC_WORD_I_AM
@@ -4706,8 +4706,8 @@ gUnknown_8481FEC::
 	.byte 255 @ friendship
 
 	.string "CAMDEN$", 11
-	.byte FACILITY_CLASS_ENGINEER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_ENGINEER, 0x01
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_WORD_A, EC_MOVE(THUNDERBOLT), EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_TOO, EC_WORD_EXCL
 	.2byte EC_WORD_ELECTRIC, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_WIRELESS, EC_WORD_LINK
@@ -4786,8 +4786,8 @@ gUnknown_8481FEC::
 	.byte 255 @ friendship
 
 	.string "ZACKERY$", 11
-	.byte FACILITY_CLASS_SCIENTIST, 0x01, 0x00
-
+	.byte FACILITY_CLASS_SCIENTIST, 0x01
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_MOVE2(THUNDER_SHOCK), EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_QUES
 	.2byte EC_WORD_ELECTRIC, EC_WORD_EXCL, EC_MOVE2(FLASH), EC_MOVE2(FLASH), EC_MOVE2(FLASH), EC_WORD_EXCL_EXCL
@@ -4871,8 +4871,8 @@ gUnknown_8481FEC::
 gUnknown_84823CC::
 	.byte 0x20, 0x08, 0x02, 0x0e
 	.string "MAURA$", 11
-	.byte FACILITY_CLASS_BEAUTY_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_BEAUTY_2, 0x02
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_THE, EC_WORD_GROUP, EC_WORD_LEADER, EC_WORD_EXCL, 0xFFFF
 	.2byte EC_WORD_WHAT, EC_WORD_AM, EC_WORD_I, EC_WORD_LEADER, EC_WORD_OF, EC_WORD_QUES
 	.2byte EC_WORD_I_AM, EC_WORD_NO, EC_WORD_LEADER, EC_WORD_IT_S, EC_WORD_A_LITTLE, EC_WORD_LIE
@@ -4951,8 +4951,8 @@ gUnknown_84823CC::
 	.byte 255 @ friendship
 
 	.string "MIKAELA$", 11
-	.byte FACILITY_CLASS_LASS_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_LASS_2, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_THE, EC_WORD_NO_1, EC_WORD_TRAINER, EC_WORD_HERE
 	.2byte EC_WORD_NEVER, EC_WORD_SAID, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_AT
 	.2byte EC_WORD_NEXT, EC_WORD_TIME, EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_OVERWHELMING
@@ -5031,8 +5031,8 @@ gUnknown_84823CC::
 	.byte 255 @ friendship
 
 	.string "FLINT$", 11
-	.byte FACILITY_CLASS_ENGINEER, 0x04, 0x00
-
+	.byte FACILITY_CLASS_ENGINEER, 0x04
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(MILK_DRINK), EC_WORD_WORLD, EC_WORD_LEADER, EC_WORD_EXCL
 	.2byte EC_WORD_I_VE, EC_WORD_WON, EC_WORD_THIS, EC_MOVE2(MILK_DRINK), EC_WORD_MATCH, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_CAN_T, EC_WORD_DRINK, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_DRINKS
diff --git a/data/unk_text_util.s b/data/unk_text_util.s
new file mode 100644
index 000000000..5e5ce1a5d
--- /dev/null
+++ b/data/unk_text_util.s
@@ -0,0 +1,5 @@
+	.section .rodata
+	.align 2
+
+gUnknown_8464300:: @ 8464300
+	.incbin "baserom.gba", 0x464300, 0x4C
diff --git a/data/wild_pokemon_area.s b/data/wild_pokemon_area.s
new file mode 100644
index 000000000..26913b7c6
--- /dev/null
+++ b/data/wild_pokemon_area.s
@@ -0,0 +1,14 @@
+	.section .rodata
+	.align 2
+
+gUnknown_8464148:: @ 8464148
+	.incbin "baserom.gba", 0x464148, 0x174
+
+gUnknown_84642BC:: @ 84642BC
+	.incbin "baserom.gba", 0x4642BC, 0x4
+
+gUnknown_84642C0:: @ 84642C0
+	.incbin "baserom.gba", 0x4642C0, 0x34
+
+gUnknown_84642F4:: @ 84642F4
+	.incbin "baserom.gba", 0x4642F4, 0xC